diff --git a/.env b/.env
index 7baf65d6511f..6ac42ba97b46 100644
--- a/.env
+++ b/.env
@@ -1,4 +1,3 @@
-VITE_TITLE=PokéRogue
VITE_BYPASS_LOGIN=0
VITE_BYPASS_TUTORIAL=0
VITE_SERVER_URL=http://localhost:8001
\ No newline at end of file
diff --git a/.env.beta b/.env.beta
index 181abb016827..8d1e93b32772 100644
--- a/.env.beta
+++ b/.env.beta
@@ -1,4 +1,3 @@
-VITE_TITLE=PokéRogue Beta
VITE_BYPASS_LOGIN=0
VITE_BYPASS_TUTORIAL=0
-VITE_SERVER_URL=https://api.beta.pokerogue.net
+VITE_SERVER_URL=https://api.beta.pokerogue.net
\ No newline at end of file
diff --git a/.env.development b/.env.development
index a9b53e2bfb15..e9180f0875d0 100644
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,3 @@
-VITE_TITLE=PokéRogue Dev
VITE_BYPASS_LOGIN=1
VITE_BYPASS_TUTORIAL=0
-VITE_SERVER_URL=http://localhost:8001
+VITE_SERVER_URL=http://localhost:8001
\ No newline at end of file
diff --git a/.env.production b/.env.production
index a3d9d686e1ed..74818d41a12a 100644
--- a/.env.production
+++ b/.env.production
@@ -1,4 +1,3 @@
-VITE_TITLE=PokéRogue
VITE_BYPASS_LOGIN=0
VITE_BYPASS_TUTORIAL=0
VITE_SERVER_URL=https://api.pokerogue.net
\ No newline at end of file
diff --git a/.github/workflows/deploy-beta.yml b/.github/workflows/deploy-beta.yml
index d55a34b95f1b..d954d9bb8657 100644
--- a/.github/workflows/deploy-beta.yml
+++ b/.github/workflows/deploy-beta.yml
@@ -20,7 +20,7 @@ jobs:
env:
NODE_ENV: production
- name: Set up SSH
- if: github.event_name == 'push' && (github.ref_name == github.event.repository.default_branch || github.ref_name == 'beta')
+ if: github.event_name == 'push' && github.ref_name == github.event.repository.default_branch
run: |
mkdir ~/.ssh
echo "${{ secrets.BETA_SSH_PUBLIC_KEY }}" > ~/.ssh/id_ed25519.pub
@@ -28,6 +28,6 @@ jobs:
chmod 600 ~/.ssh/*
ssh-keyscan -H ${{ secrets.BETA_SSH_HOST }} >> ~/.ssh/known_hosts
- name: Deploy build on server
- if: github.event_name == 'push' && (github.ref_name == github.event.repository.default_branch || github.ref_name == 'beta')
+ if: github.event_name == 'push' && github.ref_name == github.event.repository.default_branch
run: |
rsync --del --no-times --checksum -vrm dist/* ${{ secrets.BETA_SSH_USER }}@${{ secrets.BETA_SSH_HOST }}:${{ secrets.BETA_DESTINATION_DIR }}
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index c22d0b2ce4c1..0ae49fe9e1c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,5 +39,4 @@ coverage
# Local Documentation
/typedoc
-/dependency-graph.svg
-/.vs
+/dependency-graph.svg
\ No newline at end of file
diff --git a/MEs-Roadmap-Documentation.md b/MEs-Roadmap-Documentation.md
deleted file mode 100644
index 7e5aa1b069ec..000000000000
--- a/MEs-Roadmap-Documentation.md
+++ /dev/null
@@ -1,198 +0,0 @@
-# 📝 Most immediate things to-do list
-
-- ### High priority
- - 🐛 Intimidate and other ETB abilities proc twice at the start of wild MEs (fight or flight, dark deal)
- - ⚙️ Add a tag system so MEs don't show where they shouldn't and bricking Challenge runs:
- - noChallenge (cant be spawned in challenge runs)
- - allChallenge (can spawn in all challenge modes)
- - (typespecific)Challenge:
- - Example: fireOnly (can only spawn in fire related challenges)
-
-- ### Medium priority
-
-- ### Low priority
- - 🐛 Mysterious Challengers can spawn two trainers (or three) of the same type [Dev comment: not a bug]
- - 🐛 Fight or Flight intro visuals may show different gender from the actual spawned pokemon
-
-# 📝 Things to be done before Mystery Encounters ("MEs/Events") MVP is finished:
- All the things on this list should be done before an MVP (Minimum Viable Product) can be playtested.
-
-- ## Bugless implementation of the MVP MEs
- - Establish placeholder waves for MEs to happen ✔️
- - ⚪ Bug-free implementation of Common ME 1 ('Mysterious Chest')✔️
- - ⚪ Bug-free implementation of Common ME 2 ('Fight or Flight')✔️
- - 🔵 Bug-free implementation of Rare ME 1 ('Mysterious Challenger')✔️
- - 🔵 Bug-free implementation of Rare ME 2 ('Sleeping Snorlax') 🛠️
- - 🟣 Bug-free implementation of Epic ME 1 ('Training Session') 🛠️
- - 🟡 Bug-free implementation of Legendary ME 1 ('Dark Deal') ✔️
-
-- ## First round of playtesting (Alpha)
- - First round of feedback on bugs for more slippery bugs 🛠️
- - First round of balance feedback on odds and power-level 🛠️
- - Tweak difficulty/rewards balance in MEs 🛠️
-
- ## Translation of MEs after playtest/balance
- - First round of translators feedback to avoid potential issues 🛠️
- - EN localisation 🛠️
- - ES localisation 🛠️
-
-# 📝 Things to be done before Mystery Encounters ("MEs/Events") goes __live__:
- All the things on this list should be done before the merge to main.
-
-- ## Bugless implementation of the MVP MEs
- - Bugless implementation of about 55-60 MEs
- - 20 non-biome-dependant:
- - ⚪ 9 Common Events
- - 🔵 5 Rare Events
- - 🟣 4 Epic Events
- - 🟡 2 Legendary Events
- - 35-40 biome-dependant Events, at least one for each biome
-
-- ## Second round of playtesting (Beta)
- - Second round of feedback for bugs ❌
- - Second round of balance feedback ❌
- - Final decisions on balance, powerlevel, odds and design choices before live feedback ❌
-
- ## Translation of MEs after playtest/balance
- - de localisation 🛠️
- - en localisation 🛠️
- - es-ES localisation 🛠️
- - es-MX localisation 🛠️
- - fr localisation 🛠️
- - it localisation 🛠️
- - ko localisation 🛠️
- - pt-BR localisation 🛠️
- - zh-CN localisation 🛠️
- - zh-TW localisation 🛠️
-
-
-# 🧬 Deep dive into Events and what has been done so far
-
-Events (referred to as 'Mysterious Encounters, MEs' in the code) aim to be an addition to PokeRogue that will fundamentally shift the way PokéRogue feels. It looks to improve the bet of the game into the RogueLike genre without touching the core gameplay loop of Pokémon battles/collection that we know and love already in this game. Below there are some specifications that clarify what's being worked on for ease of access for the devs, balance team, artists and others who may be interested. Beware of spoilers!
-
-## An Event __**always has**__:
- ### #️⃣ A wave index where they're happening -- each ME takes up a whole wave (means you miss a combat!).
-
- ### 💬 Dialogue:
- - Dialogue/Message content populated in relevant locales files (namely locales/mystery-encounter.ts)
- - An associated EncounterTypeDialogue object populated in allMysteryEncounterDialogue (see data/mystery-ecounter-dialogue.ts)
- - This will require certain content, such as encounter description window text and option button labels, while some other fields will be optional
- - Key content to be aware of when writing encounter dialogue:
- - Intro dialogue or messages (shown before anything appears on screen)
- - A title (shown in description box)
- - A description (shown in description box)
- - A prompt/query to the player, to choose the options (shown in description box)
- - An option panel at the bottom, taking the space of what usually is the game dialogs + controls
- - Containing at least two options, and up to four.
- - ❗❗ To view what dialogue content is __**mandatory**__ for encounters, check the schema in data/mystery-ecounter-dialogue.ts
-
- ### 🕺 Intro Visuals:
- - One or multiple sprites may be used. They will slide onto the field when the encounter starts
- - 📚 This could be anything from a group of trainers, to a Pokemon, to a static sprite of an inanimate object
- - ❗❗ To populate an encounter with intro visuals, see "Encounter Class Extending MysteryEncounterWrapper" section
- - 📚 Technically, the encounter will still work if Intro Visuals are not provided, but your encounter will look very strange when an empty field slides onto the screen
-
- ### 📋 Encounter Class Implementing MysteryEncounterWrapper
- - ❗❗ All encounters should have their own class files organized in the src/data/mystery-encounters folder
- - ❗❗ Encounter classes can be named anything, but **must implement MysteryEncounterWrapper**
- - Refer to existing MEs for examples
- - ❗❗ As part of MysteryEncounterWrapper, they should implement their own get() function
- - 📚 The get() function should return an object that is some concrete extension of class MysteryEncounter
- - Example: can return a new OptionSelectMysteryEncounter()
- - ❗❗ **This MysteryEncounter type class will be where all encounter functional/business logic will reside**
- - 📚 That includes things like, what intro visuals to display, what each option does (is it a battle, getting items, skipping the encounter, etc.)
- - 📚 It will also serve as the way to pull data from the encounter class when starting the game
- - ❗❗ A new instance of this encounter class should be added to the initMysteryEncounters() function inside data/mystery-encounter.ts
-
- ### 🌟 **Rarity** tier of the ME, common by default.
- - ⚪ Common pool
- - 🔵 Rare pool
- - 🟣 Epic pool
- - 🟡 Legendary pool
-
- ### **Optional Requirements** for Mystery Encounters.
- - 🛠️ They give granular control over whether encounters will spawn in certain situations
- - Requirements might include:
- - Being within a wave range
- - Being a range of wave X-Y
- - Having X amount of $$$
- - Having X-Y party members (similar to catching logic?) ✔️/❌ (PARTIALLY COMPLETE)
-
- ### **MysteryEncounterOptions**
- When selected, execute the custom logic passed in the **onSelect** function. Some **MysteryEncounterOptions** could be as simple as giving the player a pokéball, and others could be a few functions chained together, like "fight a battle, and get an item if you win"
-
- ### **Functions/ Helper functions** defined in __/utils/mystery-encounter-utils.ts__ for ME to happen, if applicable. They can be:
- - Giving the player X item ✔️
- - Giving the player X item from a certain tier ✔️
- - Letting the player choose from items ✔️
- - Letting the player choose from X items from a certain tier ✔️
- - Start a combat encounter with a trainer ✔️
- - Start a combat encounter with a wild pokémon (from biome) ✔️
- - Start a combat encounter with a boss wild pokémon ✔️
- - XP to the whole party ✔️
- - Remove a PKMN from the player's party ✔️
- - Steal from player ❌
-
-# 📝 Known bugs (squash 'em all!):
- - ## 🔴 __**Really bad ones**__
- - 🐛 Picking up certain items in Fight or Flight is still broken. Workaround is leave encounter.
- - 🐛 Modifiers that are applied to pokemon get skipped in Fight or Flight.
-
- - ## 🟡 __**Bad ones under certain circumstances**__
- - 🐛 Needs further replication : At wave 51, wild PKMN encounter caused a freezed after pressing "ESC" key upon being asked to switch PKMNs
- - 🐛 Wave seed generates different encounter data if you roll to a new wave, see the spawned stuff, and refresh the app
- - 🐛 Type-buffing items (like Silk Scarf) get swapped around when offered as a reward in Fight or Flight
-
- - ## 🟢 __**Non-game breaking**__
- - Both of these bugs seem to have in common that they don't "forget" their last passed string:
- - 🐛 Scientist will remember the first PKMN it "did the thing on" and never ever forget it, even in future runs. Only affects dialogue.
- - 🐛 Tooltip bug in Events. When showing the tooltip of the 2nd or later Event you've found, the tooltip for the first option will match whatever option you selected in the previous Event. This wrong tooltip gets overriden once you move the cursor.
-
-# 🗿 Other cool things/functionalities that won't make it in the MVP but are planned to accomodate future MEs:
-
-### QoL improvements
-- Dialogue references to __**good**__ outcomes will be colored 🟢, __**bad**__ ones in 🔴 and __**ambiguous**__ or __**mixed**__, in 🟡
- - Helps with quick glances when 5x speed
-
-#### More requirements (with helper functions)
-- Having X item
-- Having Y amount of X item
-- Being in a specific Biome
-- A Pokémon X in player's party can learn Y move
-- A Pokémon X in player's party knows Y move
-- A Pokémon X in player's party has Y ability
-- A Pokémon X in player's party belongs to a pre-defined pool (ie. "Ultrabeasts")
-
-#### More outcomes (with helper functions)
-- Status one or many Pokémon if your party -- if they can be statused
-- Damage one or many Pokémon in your party
-- Set a hazard (ally or foe side)
-- Set a weather
-- Give the player a Pokémon from a pool (useful for reg. professors/traders)
-- XP to a Pokémon (similar to rare candy?)
-- Add logic for choosing a Pokémon from party for some effect (trades, sacrifices, etc)
-- Add logic for awarding exp to the party (outside of a normal combat)
-- Encounter/pull a PKMN from a pre-defined pool (ie. "Ultrabeasts")
-
-
-# Log Documentation
-
-## 12th-13th June
-- The 🐛 "Opening the chest simply moves you to a wild battle against nothingness, which you can escape after you get bored of it." is fixed.
-- The 🐛 "PKMN Sprites and their HP/lvl bar doesn't get properly recalled when finding an ME or when meeting Rival." is fixed.
-- The 🐛 "Weaker trainers from Mysterious Challenger crashes the game when the reward screen should come out" is fixed.
-- The 🐛 "If a ME spawns on the first floor of a new biome (NewBiomeEncounterPhase), intro visuals do not spawn properly" is fixed.
-- The 🐛 "Any ME that procs at wave (?)(?)(1) has its sprite removed. Only the sprite is affected." is fixed.
-- The 🐛 "Picking a double battle trainer (ie Twins) as your challenge results in a game over, including loss of save." should be fixed.
-- Allowed catch in "Fight or Flight" -- it was counterintuitive to not allow it as it __is__ a wild PKMN fight.
-- More minor 🐛 squashed.
-- Pushed Dark Deal ME to a higher wave requirement (+30) as it seems to be functioning (mostly) bugless.
-
-## 27-29th June
-- The 🐛 "Picking up certain items in Fight or Flight works poorly" has been squashed.
-- The 🐛 "Modifiers that are applied to pokemon get skipped in Fight or Flight" has been squashed.
-- ⚙️ Added "Omniboost" functionality (Fight or Flight ME)
-- The 🐛 "Wave seed generates different encounter data if you roll to a new wave, see the spawned stuff, and refresh the app" has been squashed.
-- The 🐛 "Type-buffing items (like Silk Scarf) get swapped around when offered as a reward in Fight or Flight" has been squashed.
-- ⚖️ Adjusted Dark Deal odds to show 6-7 cost PKMNs at a much higher rate (70%) than 8-cost (20%) or 9-cost (10%), to avoid box legendaries being overly present.
-- The 🐛 about "Tooltips being remembered from the previous ME choice until you hovered a different option" is squashed.
diff --git a/index.html b/index.html
index 8d078d3603b5..3722bdd34224 100644
--- a/index.html
+++ b/index.html
@@ -3,7 +3,7 @@
- %VITE_TITLE%
+ PokéRogue
diff --git a/public/images/items.json b/public/images/items.json
index 5642eecded28..33dcf8f5e9ad 100644
--- a/public/images/items.json
+++ b/public/images/items.json
@@ -4,8 +4,8 @@
"image": "items.png",
"format": "RGBA8888",
"size": {
- "w": 416,
- "h": 416
+ "w": 415,
+ "h": 415
},
"scale": 1,
"frames": [
@@ -744,6 +744,27 @@
"h": 24
}
},
+ {
+ "filename": "relic_gold",
+ "rotated": false,
+ "trimmed": true,
+ "sourceSize": {
+ "w": 32,
+ "h": 32
+ },
+ "spriteSourceSize": {
+ "x": 9,
+ "y": 11,
+ "w": 15,
+ "h": 11
+ },
+ "frame": {
+ "x": 0,
+ "y": 404,
+ "w": 15,
+ "h": 11
+ }
+ },
{
"filename": "calcium",
"rotated": false,
@@ -1144,7 +1165,7 @@
}
},
{
- "filename": "mind_plate",
+ "filename": "clefairy_doll",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -1153,15 +1174,15 @@
},
"spriteSourceSize": {
"x": 4,
- "y": 4,
+ "y": 5,
"w": 24,
- "h": 24
+ "h": 23
},
"frame": {
"x": 24,
"y": 392,
"w": 24,
- "h": 24
+ "h": 23
}
},
{
@@ -1228,7 +1249,7 @@
}
},
{
- "filename": "muscle_band",
+ "filename": "mind_plate",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -1249,7 +1270,7 @@
}
},
{
- "filename": "pixie_plate",
+ "filename": "muscle_band",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -1270,7 +1291,7 @@
}
},
{
- "filename": "salac_berry",
+ "filename": "pixie_plate",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -1291,7 +1312,7 @@
}
},
{
- "filename": "scanner",
+ "filename": "salac_berry",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -1312,7 +1333,7 @@
}
},
{
- "filename": "silk_scarf",
+ "filename": "scanner",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -1333,7 +1354,7 @@
}
},
{
- "filename": "sky_plate",
+ "filename": "coin_case",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -1342,15 +1363,15 @@
},
"spriteSourceSize": {
"x": 4,
- "y": 4,
+ "y": 5,
"w": 24,
- "h": 24
+ "h": 23
},
"frame": {
"x": 48,
"y": 392,
"w": 24,
- "h": 24
+ "h": 23
}
},
{
@@ -1396,7 +1417,7 @@
}
},
{
- "filename": "splash_plate",
+ "filename": "silk_scarf",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -1417,7 +1438,7 @@
}
},
{
- "filename": "spooky_plate",
+ "filename": "sky_plate",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -1438,7 +1459,7 @@
}
},
{
- "filename": "stone_plate",
+ "filename": "splash_plate",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -1459,7 +1480,7 @@
}
},
{
- "filename": "sun_stone",
+ "filename": "spooky_plate",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -1480,7 +1501,7 @@
}
},
{
- "filename": "toxic_plate",
+ "filename": "stone_plate",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -1501,7 +1522,7 @@
}
},
{
- "filename": "zap_plate",
+ "filename": "sun_stone",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -1543,7 +1564,7 @@
}
},
{
- "filename": "clefairy_doll",
+ "filename": "toxic_plate",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -1552,19 +1573,19 @@
},
"spriteSourceSize": {
"x": 4,
- "y": 5,
+ "y": 4,
"w": 24,
- "h": 23
+ "h": 24
},
"frame": {
"x": 339,
"y": 20,
"w": 24,
- "h": 23
+ "h": 24
}
},
{
- "filename": "coin_case",
+ "filename": "zap_plate",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -1573,19 +1594,19 @@
},
"spriteSourceSize": {
"x": 4,
- "y": 5,
+ "y": 4,
"w": 24,
- "h": 23
+ "h": 24
},
"frame": {
"x": 363,
"y": 20,
"w": 24,
- "h": 23
+ "h": 24
}
},
{
- "filename": "berry_pouch",
+ "filename": "max_revive",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -1593,16 +1614,16 @@
"h": 32
},
"spriteSourceSize": {
- "x": 4,
- "y": 5,
- "w": 23,
- "h": 23
+ "x": 5,
+ "y": 4,
+ "w": 22,
+ "h": 24
},
"frame": {
"x": 387,
"y": 20,
- "w": 23,
- "h": 23
+ "w": 22,
+ "h": 24
}
},
{
@@ -1753,7 +1774,7 @@
}
},
{
- "filename": "black_belt",
+ "filename": "berry_pouch",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -1761,15 +1782,15 @@
"h": 32
},
"spriteSourceSize": {
- "x": 5,
- "y": 4,
- "w": 22,
+ "x": 4,
+ "y": 5,
+ "w": 23,
"h": 23
},
"frame": {
"x": 327,
"y": 45,
- "w": 22,
+ "w": 23,
"h": 23
}
},
@@ -1788,8 +1809,8 @@
"h": 24
},
"frame": {
- "x": 349,
- "y": 43,
+ "x": 350,
+ "y": 44,
"w": 23,
"h": 24
}
@@ -1809,14 +1830,14 @@
"h": 23
},
"frame": {
- "x": 372,
- "y": 43,
+ "x": 373,
+ "y": 44,
"w": 24,
"h": 23
}
},
{
- "filename": "red_orb",
+ "filename": "max_ether",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -1824,15 +1845,15 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
+ "x": 7,
"y": 4,
- "w": 20,
+ "w": 18,
"h": 24
},
"frame": {
- "x": 396,
- "y": 43,
- "w": 20,
+ "x": 397,
+ "y": 44,
+ "w": 18,
"h": 24
}
},
@@ -1851,35 +1872,14 @@
"h": 18
},
"frame": {
- "x": 372,
- "y": 66,
+ "x": 373,
+ "y": 67,
"w": 24,
"h": 18
}
},
{
- "filename": "mystic_water",
- "rotated": false,
- "trimmed": true,
- "sourceSize": {
- "w": 32,
- "h": 32
- },
- "spriteSourceSize": {
- "x": 6,
- "y": 5,
- "w": 20,
- "h": 23
- },
- "frame": {
- "x": 396,
- "y": 67,
- "w": 20,
- "h": 23
- }
- },
- {
- "filename": "amulet_coin",
+ "filename": "max_potion",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -1887,16 +1887,16 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
- "y": 5,
- "w": 23,
- "h": 21
+ "x": 7,
+ "y": 4,
+ "w": 18,
+ "h": 24
},
"frame": {
- "x": 349,
- "y": 67,
- "w": 23,
- "h": 21
+ "x": 397,
+ "y": 68,
+ "w": 18,
+ "h": 24
}
},
{
@@ -1914,54 +1914,12 @@
"h": 18
},
"frame": {
- "x": 372,
- "y": 84,
+ "x": 67,
+ "y": 50,
"w": 24,
"h": 18
}
},
- {
- "filename": "hard_meteorite",
- "rotated": false,
- "trimmed": true,
- "sourceSize": {
- "w": 32,
- "h": 32
- },
- "spriteSourceSize": {
- "x": 7,
- "y": 5,
- "w": 20,
- "h": 22
- },
- "frame": {
- "x": 396,
- "y": 90,
- "w": 20,
- "h": 22
- }
- },
- {
- "filename": "relic_gold",
- "rotated": false,
- "trimmed": true,
- "sourceSize": {
- "w": 32,
- "h": 32
- },
- "spriteSourceSize": {
- "x": 9,
- "y": 11,
- "w": 15,
- "h": 11
- },
- "frame": {
- "x": 0,
- "y": 404,
- "w": 15,
- "h": 11
- }
- },
{
"filename": "icy_reins_of_unity",
"rotated": false,
@@ -1976,27 +1934,6 @@
"w": 24,
"h": 20
},
- "frame": {
- "x": 67,
- "y": 50,
- "w": 24,
- "h": 20
- }
- },
- {
- "filename": "metal_powder",
- "rotated": false,
- "trimmed": true,
- "sourceSize": {
- "w": 32,
- "h": 32
- },
- "spriteSourceSize": {
- "x": 4,
- "y": 6,
- "w": 24,
- "h": 20
- },
"frame": {
"x": 91,
"y": 50,
@@ -2026,7 +1963,7 @@
}
},
{
- "filename": "peat_block",
+ "filename": "metal_powder",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2035,19 +1972,19 @@
},
"spriteSourceSize": {
"x": 4,
- "y": 5,
+ "y": 6,
"w": 24,
- "h": 22
+ "h": 20
},
"frame": {
"x": 136,
"y": 60,
"w": 24,
- "h": 22
+ "h": 20
}
},
{
- "filename": "quick_powder",
+ "filename": "peat_block",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2056,19 +1993,19 @@
},
"spriteSourceSize": {
"x": 4,
- "y": 6,
+ "y": 5,
"w": 24,
- "h": 20
+ "h": 22
},
"frame": {
"x": 160,
"y": 67,
"w": 24,
- "h": 20
+ "h": 22
}
},
{
- "filename": "rusted_shield",
+ "filename": "dynamax_band",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2077,19 +2014,19 @@
},
"spriteSourceSize": {
"x": 4,
- "y": 6,
- "w": 24,
- "h": 20
+ "y": 4,
+ "w": 23,
+ "h": 23
},
"frame": {
"x": 184,
"y": 67,
- "w": 24,
- "h": 20
+ "w": 23,
+ "h": 23
}
},
{
- "filename": "auspicious_armor",
+ "filename": "griseous_core",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2097,20 +2034,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 4,
+ "x": 5,
"y": 5,
"w": 23,
- "h": 21
+ "h": 23
},
"frame": {
- "x": 208,
+ "x": 207,
"y": 67,
"w": 23,
- "h": 21
+ "h": 23
}
},
{
- "filename": "sacred_ash",
+ "filename": "healing_charm",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2118,20 +2055,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 4,
- "y": 7,
- "w": 24,
- "h": 20
+ "x": 5,
+ "y": 5,
+ "w": 23,
+ "h": 22
},
"frame": {
- "x": 231,
+ "x": 230,
"y": 68,
- "w": 24,
- "h": 20
+ "w": 23,
+ "h": 22
}
},
{
- "filename": "shadow_reins_of_unity",
+ "filename": "rare_candy",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2140,19 +2077,19 @@
},
"spriteSourceSize": {
"x": 4,
- "y": 7,
- "w": 24,
- "h": 20
+ "y": 5,
+ "w": 23,
+ "h": 23
},
"frame": {
- "x": 255,
+ "x": 253,
"y": 68,
- "w": 24,
- "h": 20
+ "w": 23,
+ "h": 23
}
},
{
- "filename": "soft_sand",
+ "filename": "rarer_candy",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2161,19 +2098,19 @@
},
"spriteSourceSize": {
"x": 4,
- "y": 7,
- "w": 24,
- "h": 20
+ "y": 5,
+ "w": 23,
+ "h": 23
},
"frame": {
- "x": 279,
+ "x": 276,
"y": 68,
- "w": 24,
- "h": 20
+ "w": 23,
+ "h": 23
}
},
{
- "filename": "binding_band",
+ "filename": "stick",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2181,20 +2118,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 5,
- "y": 6,
+ "x": 4,
+ "y": 5,
"w": 23,
- "h": 20
+ "h": 23
},
"frame": {
- "x": 303,
+ "x": 299,
"y": 68,
"w": 23,
- "h": 20
+ "h": 23
}
},
{
- "filename": "dynamax_band",
+ "filename": "black_belt",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2202,20 +2139,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 4,
+ "x": 5,
"y": 4,
- "w": 23,
+ "w": 22,
"h": 23
},
"frame": {
- "x": 326,
+ "x": 322,
"y": 68,
- "w": 23,
+ "w": 22,
"h": 23
}
},
{
- "filename": "black_glasses",
+ "filename": "bug_tera_shard",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2223,20 +2160,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 4,
- "y": 8,
- "w": 23,
- "h": 17
+ "x": 6,
+ "y": 4,
+ "w": 22,
+ "h": 23
},
"frame": {
- "x": 349,
- "y": 88,
- "w": 23,
- "h": 17
+ "x": 344,
+ "y": 68,
+ "w": 22,
+ "h": 23
}
},
{
- "filename": "burn_drive",
+ "filename": "quick_powder",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2245,19 +2182,19 @@
},
"spriteSourceSize": {
"x": 4,
- "y": 8,
- "w": 23,
- "h": 17
+ "y": 6,
+ "w": 24,
+ "h": 20
},
"frame": {
"x": 60,
- "y": 70,
- "w": 23,
- "h": 17
+ "y": 68,
+ "w": 24,
+ "h": 20
}
},
{
- "filename": "griseous_core",
+ "filename": "dark_tera_shard",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2265,20 +2202,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 5,
- "y": 5,
- "w": 23,
+ "x": 6,
+ "y": 4,
+ "w": 22,
"h": 23
},
"frame": {
"x": 57,
- "y": 87,
- "w": 23,
+ "y": 88,
+ "w": 22,
"h": 23
}
},
{
- "filename": "max_revive",
+ "filename": "dragon_tera_shard",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2286,20 +2223,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 5,
+ "x": 6,
"y": 4,
"w": 22,
- "h": 24
+ "h": 23
},
"frame": {
"x": 57,
- "y": 110,
+ "y": 111,
"w": 22,
- "h": 24
+ "h": 23
}
},
{
- "filename": "bug_tera_shard",
+ "filename": "electric_tera_shard",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2320,7 +2257,7 @@
}
},
{
- "filename": "chill_drive",
+ "filename": "rusted_shield",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2329,19 +2266,19 @@
},
"spriteSourceSize": {
"x": 4,
- "y": 8,
- "w": 23,
- "h": 17
+ "y": 6,
+ "w": 24,
+ "h": 20
},
"frame": {
- "x": 83,
+ "x": 84,
"y": 70,
- "w": 23,
- "h": 17
+ "w": 24,
+ "h": 20
}
},
{
- "filename": "rare_candy",
+ "filename": "fairy_tera_shard",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2349,20 +2286,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 4,
- "y": 5,
- "w": 23,
+ "x": 6,
+ "y": 4,
+ "w": 22,
"h": 23
},
"frame": {
- "x": 80,
- "y": 87,
- "w": 23,
+ "x": 79,
+ "y": 90,
+ "w": 22,
"h": 23
}
},
{
- "filename": "rarer_candy",
+ "filename": "fighting_tera_shard",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2370,20 +2307,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 4,
- "y": 5,
- "w": 23,
+ "x": 6,
+ "y": 4,
+ "w": 22,
"h": 23
},
"frame": {
"x": 79,
- "y": 110,
- "w": 23,
+ "y": 113,
+ "w": 22,
"h": 23
}
},
{
- "filename": "stick",
+ "filename": "amulet_coin",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2391,20 +2328,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 4,
+ "x": 6,
"y": 5,
"w": 23,
- "h": 23
+ "h": 21
},
"frame": {
"x": 79,
- "y": 133,
+ "y": 136,
"w": 23,
- "h": 23
+ "h": 21
}
},
{
- "filename": "big_mushroom",
+ "filename": "coupon",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2412,20 +2349,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
- "y": 6,
- "w": 19,
+ "x": 4,
+ "y": 7,
+ "w": 23,
"h": 19
},
"frame": {
"x": 63,
"y": 157,
- "w": 19,
+ "w": 23,
"h": 19
}
},
{
- "filename": "max_ether",
+ "filename": "fire_stone",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2433,20 +2370,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 7,
- "y": 4,
- "w": 18,
- "h": 24
+ "x": 5,
+ "y": 5,
+ "w": 22,
+ "h": 23
},
"frame": {
"x": 64,
"y": 176,
- "w": 18,
- "h": 24
+ "w": 22,
+ "h": 23
}
},
{
- "filename": "oval_charm",
+ "filename": "fire_tera_shard",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2456,18 +2393,18 @@
"spriteSourceSize": {
"x": 6,
"y": 4,
- "w": 21,
- "h": 24
+ "w": 22,
+ "h": 23
},
"frame": {
- "x": 82,
- "y": 156,
- "w": 21,
- "h": 24
+ "x": 64,
+ "y": 199,
+ "w": 22,
+ "h": 23
}
},
{
- "filename": "max_potion",
+ "filename": "flying_tera_shard",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2475,20 +2412,41 @@
"h": 32
},
"spriteSourceSize": {
- "x": 7,
+ "x": 6,
"y": 4,
- "w": 18,
- "h": 24
+ "w": 22,
+ "h": 23
},
"frame": {
"x": 64,
- "y": 200,
- "w": 18,
+ "y": 222,
+ "w": 22,
+ "h": 23
+ }
+ },
+ {
+ "filename": "max_lure",
+ "rotated": false,
+ "trimmed": true,
+ "sourceSize": {
+ "w": 32,
+ "h": 32
+ },
+ "spriteSourceSize": {
+ "x": 8,
+ "y": 4,
+ "w": 17,
+ "h": 24
+ },
+ "frame": {
+ "x": 86,
+ "y": 157,
+ "w": 17,
"h": 24
}
},
{
- "filename": "shiny_charm",
+ "filename": "oval_charm",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2502,14 +2460,14 @@
"h": 24
},
"frame": {
- "x": 64,
- "y": 224,
+ "x": 86,
+ "y": 181,
"w": 21,
"h": 24
}
},
{
- "filename": "dark_tera_shard",
+ "filename": "shiny_charm",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2519,18 +2477,18 @@
"spriteSourceSize": {
"x": 6,
"y": 4,
- "w": 22,
- "h": 23
+ "w": 21,
+ "h": 24
},
"frame": {
- "x": 82,
- "y": 180,
- "w": 22,
- "h": 23
+ "x": 86,
+ "y": 205,
+ "w": 21,
+ "h": 24
}
},
{
- "filename": "deep_sea_tooth",
+ "filename": "auspicious_armor",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2538,20 +2496,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 5,
- "y": 6,
- "w": 22,
+ "x": 4,
+ "y": 5,
+ "w": 23,
"h": 21
},
"frame": {
- "x": 82,
- "y": 203,
- "w": 22,
+ "x": 86,
+ "y": 229,
+ "w": 23,
"h": 21
}
},
{
- "filename": "dragon_tera_shard",
+ "filename": "full_heal",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2559,41 +2517,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
+ "x": 9,
"y": 4,
- "w": 22,
+ "w": 15,
"h": 23
},
- "frame": {
- "x": 85,
- "y": 224,
- "w": 22,
- "h": 23
- }
- },
- {
- "filename": "max_lure",
- "rotated": false,
- "trimmed": true,
- "sourceSize": {
- "w": 32,
- "h": 32
- },
- "spriteSourceSize": {
- "x": 8,
- "y": 4,
- "w": 17,
- "h": 24
- },
"frame": {
"x": 71,
- "y": 248,
- "w": 17,
- "h": 24
+ "y": 245,
+ "w": 15,
+ "h": 23
}
},
{
- "filename": "electric_tera_shard",
+ "filename": "binding_band",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2601,20 +2538,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
- "y": 4,
- "w": 22,
- "h": 23
+ "x": 5,
+ "y": 6,
+ "w": 23,
+ "h": 20
},
"frame": {
- "x": 88,
- "y": 247,
- "w": 22,
- "h": 23
+ "x": 86,
+ "y": 250,
+ "w": 23,
+ "h": 20
}
},
{
- "filename": "max_repel",
+ "filename": "sacred_ash",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2622,20 +2559,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 8,
- "y": 4,
- "w": 16,
- "h": 24
+ "x": 4,
+ "y": 7,
+ "w": 24,
+ "h": 20
},
"frame": {
- "x": 72,
- "y": 272,
- "w": 16,
- "h": 24
+ "x": 108,
+ "y": 73,
+ "w": 24,
+ "h": 20
}
},
{
- "filename": "fairy_tera_shard",
+ "filename": "focus_sash",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2643,20 +2580,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
+ "x": 5,
"y": 4,
"w": 22,
"h": 23
},
"frame": {
- "x": 88,
- "y": 270,
+ "x": 101,
+ "y": 93,
"w": 22,
"h": 23
}
},
{
- "filename": "pp_max",
+ "filename": "deep_sea_scale",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2664,20 +2601,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 8,
- "y": 4,
- "w": 16,
- "h": 24
+ "x": 5,
+ "y": 6,
+ "w": 22,
+ "h": 20
},
"frame": {
- "x": 72,
- "y": 296,
- "w": 16,
- "h": 24
+ "x": 101,
+ "y": 116,
+ "w": 22,
+ "h": 20
}
},
{
- "filename": "fighting_tera_shard",
+ "filename": "deep_sea_tooth",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2685,20 +2622,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
- "y": 4,
+ "x": 5,
+ "y": 6,
"w": 22,
- "h": 23
+ "h": 21
},
"frame": {
- "x": 88,
- "y": 293,
+ "x": 102,
+ "y": 136,
"w": 22,
- "h": 23
+ "h": 21
}
},
{
- "filename": "pp_up",
+ "filename": "red_orb",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2706,41 +2643,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 8,
+ "x": 6,
"y": 4,
- "w": 16,
+ "w": 20,
"h": 24
},
"frame": {
- "x": 72,
- "y": 320,
- "w": 16,
+ "x": 103,
+ "y": 157,
+ "w": 20,
"h": 24
}
},
{
- "filename": "fire_stone",
- "rotated": false,
- "trimmed": true,
- "sourceSize": {
- "w": 32,
- "h": 32
- },
- "spriteSourceSize": {
- "x": 5,
- "y": 5,
- "w": 22,
- "h": 23
- },
- "frame": {
- "x": 88,
- "y": 316,
- "w": 22,
- "h": 23
- }
- },
- {
- "filename": "protein",
+ "filename": "max_repel",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2754,14 +2670,14 @@
"h": 24
},
"frame": {
- "x": 72,
- "y": 344,
+ "x": 107,
+ "y": 181,
"w": 16,
"h": 24
}
},
{
- "filename": "fire_tera_shard",
+ "filename": "pp_max",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2769,20 +2685,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
+ "x": 8,
"y": 4,
- "w": 22,
- "h": 23
+ "w": 16,
+ "h": 24
},
"frame": {
- "x": 88,
- "y": 339,
- "w": 22,
- "h": 23
+ "x": 107,
+ "y": 205,
+ "w": 16,
+ "h": 24
}
},
{
- "filename": "repel",
+ "filename": "pp_up",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2796,14 +2712,14 @@
"h": 24
},
"frame": {
- "x": 72,
- "y": 368,
+ "x": 109,
+ "y": 229,
"w": 16,
"h": 24
}
},
{
- "filename": "super_lure",
+ "filename": "apicot_berry",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2811,20 +2727,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 8,
- "y": 4,
- "w": 17,
- "h": 24
+ "x": 6,
+ "y": 6,
+ "w": 19,
+ "h": 20
},
"frame": {
- "x": 72,
- "y": 392,
- "w": 17,
- "h": 24
+ "x": 109,
+ "y": 253,
+ "w": 19,
+ "h": 20
}
},
{
- "filename": "flying_tera_shard",
+ "filename": "protein",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2832,20 +2748,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
+ "x": 8,
"y": 4,
- "w": 22,
- "h": 23
+ "w": 16,
+ "h": 24
},
"frame": {
- "x": 88,
- "y": 362,
- "w": 22,
- "h": 23
+ "x": 123,
+ "y": 93,
+ "w": 16,
+ "h": 24
}
},
{
- "filename": "focus_sash",
+ "filename": "lansat_berry",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2855,18 +2771,18 @@
"spriteSourceSize": {
"x": 5,
"y": 4,
- "w": 22,
+ "w": 21,
"h": 23
},
"frame": {
- "x": 89,
- "y": 385,
- "w": 22,
+ "x": 139,
+ "y": 80,
+ "w": 21,
"h": 23
}
},
{
- "filename": "coupon",
+ "filename": "shadow_reins_of_unity",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2876,18 +2792,18 @@
"spriteSourceSize": {
"x": 4,
"y": 7,
- "w": 23,
- "h": 19
+ "w": 24,
+ "h": 20
},
"frame": {
- "x": 106,
- "y": 73,
- "w": 23,
- "h": 19
+ "x": 160,
+ "y": 89,
+ "w": 24,
+ "h": 20
}
},
{
- "filename": "golden_mystic_ticket",
+ "filename": "soft_sand",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2897,18 +2813,18 @@
"spriteSourceSize": {
"x": 4,
"y": 7,
- "w": 23,
- "h": 19
+ "w": 24,
+ "h": 20
},
"frame": {
- "x": 103,
- "y": 92,
- "w": 23,
- "h": 19
+ "x": 184,
+ "y": 90,
+ "w": 24,
+ "h": 20
}
},
{
- "filename": "ghost_tera_shard",
+ "filename": "moon_stone",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2916,16 +2832,16 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
- "y": 4,
- "w": 22,
- "h": 23
+ "x": 4,
+ "y": 6,
+ "w": 23,
+ "h": 21
},
"frame": {
- "x": 102,
- "y": 111,
- "w": 22,
- "h": 23
+ "x": 208,
+ "y": 90,
+ "w": 23,
+ "h": 21
}
},
{
@@ -2943,14 +2859,14 @@
"h": 22
},
"frame": {
- "x": 102,
- "y": 134,
+ "x": 231,
+ "y": 90,
"w": 22,
"h": 22
}
},
{
- "filename": "grass_tera_shard",
+ "filename": "n_lunarizer",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2958,20 +2874,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
- "y": 4,
- "w": 22,
- "h": 23
+ "x": 4,
+ "y": 6,
+ "w": 23,
+ "h": 21
},
"frame": {
- "x": 103,
- "y": 156,
- "w": 22,
- "h": 23
+ "x": 253,
+ "y": 91,
+ "w": 23,
+ "h": 21
}
},
{
- "filename": "ground_tera_shard",
+ "filename": "n_solarizer",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -2979,20 +2895,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
- "y": 4,
- "w": 22,
- "h": 23
+ "x": 4,
+ "y": 6,
+ "w": 23,
+ "h": 21
},
"frame": {
- "x": 104,
- "y": 179,
- "w": 22,
- "h": 23
+ "x": 276,
+ "y": 91,
+ "w": 23,
+ "h": 21
}
},
{
- "filename": "bug_memory",
+ "filename": "rusted_sword",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3000,20 +2916,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 5,
+ "x": 4,
"y": 5,
- "w": 22,
+ "w": 23,
"h": 22
},
"frame": {
- "x": 104,
- "y": 202,
- "w": 22,
+ "x": 299,
+ "y": 91,
+ "w": 23,
"h": 22
}
},
{
- "filename": "ice_tera_shard",
+ "filename": "bug_memory",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3021,20 +2937,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
- "y": 4,
+ "x": 5,
+ "y": 5,
"w": 22,
- "h": 23
+ "h": 22
},
"frame": {
- "x": 107,
- "y": 224,
+ "x": 322,
+ "y": 91,
"w": 22,
- "h": 23
+ "h": 22
}
},
{
- "filename": "lansat_berry",
+ "filename": "charcoal",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3043,19 +2959,19 @@
},
"spriteSourceSize": {
"x": 5,
- "y": 4,
- "w": 21,
- "h": 23
+ "y": 5,
+ "w": 22,
+ "h": 22
},
"frame": {
- "x": 110,
- "y": 247,
- "w": 21,
- "h": 23
+ "x": 344,
+ "y": 91,
+ "w": 22,
+ "h": 22
}
},
{
- "filename": "leaf_stone",
+ "filename": "dusk_stone",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3063,41 +2979,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 5,
- "y": 5,
+ "x": 6,
+ "y": 6,
"w": 21,
- "h": 23
+ "h": 21
},
"frame": {
- "x": 110,
- "y": 270,
+ "x": 139,
+ "y": 103,
"w": 21,
- "h": 23
- }
- },
- {
- "filename": "never_melt_ice",
- "rotated": false,
- "trimmed": true,
- "sourceSize": {
- "w": 32,
- "h": 32
- },
- "spriteSourceSize": {
- "x": 5,
- "y": 5,
- "w": 22,
- "h": 23
- },
- "frame": {
- "x": 110,
- "y": 293,
- "w": 22,
- "h": 23
+ "h": 21
}
},
{
- "filename": "normal_tera_shard",
+ "filename": "mystery_egg",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3105,20 +3000,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
- "y": 4,
- "w": 22,
- "h": 23
+ "x": 8,
+ "y": 8,
+ "w": 16,
+ "h": 18
},
"frame": {
- "x": 110,
- "y": 316,
- "w": 22,
- "h": 23
+ "x": 123,
+ "y": 117,
+ "w": 16,
+ "h": 18
}
},
{
- "filename": "petaya_berry",
+ "filename": "black_glasses",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3126,20 +3021,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 5,
- "y": 5,
- "w": 22,
- "h": 23
+ "x": 4,
+ "y": 8,
+ "w": 23,
+ "h": 17
},
"frame": {
- "x": 110,
- "y": 339,
- "w": 22,
- "h": 23
+ "x": 160,
+ "y": 109,
+ "w": 23,
+ "h": 17
}
},
{
- "filename": "poison_tera_shard",
+ "filename": "burn_drive",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3147,20 +3042,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
- "y": 4,
- "w": 22,
- "h": 23
+ "x": 4,
+ "y": 8,
+ "w": 23,
+ "h": 17
},
"frame": {
- "x": 110,
- "y": 362,
- "w": 22,
- "h": 23
+ "x": 183,
+ "y": 110,
+ "w": 23,
+ "h": 17
}
},
{
- "filename": "psychic_tera_shard",
+ "filename": "ghost_tera_shard",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3174,14 +3069,14 @@
"h": 23
},
"frame": {
- "x": 111,
- "y": 385,
+ "x": 366,
+ "y": 85,
"w": 22,
"h": 23
}
},
{
- "filename": "douse_drive",
+ "filename": "chill_drive",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3195,14 +3090,14 @@
"h": 17
},
"frame": {
- "x": 372,
- "y": 102,
+ "x": 206,
+ "y": 111,
"w": 23,
"h": 17
}
},
{
- "filename": "sharp_beak",
+ "filename": "douse_drive",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3210,20 +3105,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 5,
- "y": 5,
- "w": 21,
- "h": 23
+ "x": 4,
+ "y": 8,
+ "w": 23,
+ "h": 17
},
"frame": {
- "x": 395,
+ "x": 229,
"y": 112,
- "w": 21,
- "h": 23
+ "w": 23,
+ "h": 17
}
},
{
- "filename": "healing_charm",
+ "filename": "golden_mystic_ticket",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3231,20 +3126,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 5,
- "y": 5,
+ "x": 4,
+ "y": 7,
"w": 23,
- "h": 22
+ "h": 19
},
"frame": {
- "x": 129,
- "y": 82,
+ "x": 252,
+ "y": 112,
"w": 23,
- "h": 22
+ "h": 19
}
},
{
- "filename": "moon_stone",
+ "filename": "mystic_ticket",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3253,19 +3148,19 @@
},
"spriteSourceSize": {
"x": 4,
- "y": 6,
+ "y": 7,
"w": 23,
- "h": 21
+ "h": 19
},
"frame": {
- "x": 152,
- "y": 87,
+ "x": 275,
+ "y": 112,
"w": 23,
- "h": 21
+ "h": 19
}
},
{
- "filename": "n_lunarizer",
+ "filename": "pair_of_tickets",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3274,19 +3169,19 @@
},
"spriteSourceSize": {
"x": 4,
- "y": 6,
+ "y": 7,
"w": 23,
- "h": 21
+ "h": 19
},
"frame": {
- "x": 175,
- "y": 87,
+ "x": 298,
+ "y": 113,
"w": 23,
- "h": 21
+ "h": 19
}
},
{
- "filename": "n_solarizer",
+ "filename": "reviver_seed",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3294,20 +3189,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 4,
- "y": 6,
+ "x": 5,
+ "y": 8,
"w": 23,
- "h": 21
+ "h": 20
},
"frame": {
- "x": 198,
- "y": 88,
+ "x": 321,
+ "y": 113,
"w": 23,
- "h": 21
+ "h": 20
}
},
{
- "filename": "rusted_sword",
+ "filename": "dark_memory",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3315,20 +3210,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 4,
+ "x": 5,
"y": 5,
- "w": 23,
+ "w": 22,
"h": 22
},
"frame": {
- "x": 221,
- "y": 88,
- "w": 23,
+ "x": 344,
+ "y": 113,
+ "w": 22,
"h": 22
}
},
{
- "filename": "charcoal",
+ "filename": "grass_tera_shard",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3336,20 +3231,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 5,
- "y": 5,
+ "x": 6,
+ "y": 4,
"w": 22,
- "h": 22
+ "h": 23
},
"frame": {
- "x": 244,
- "y": 88,
+ "x": 366,
+ "y": 108,
"w": 22,
- "h": 22
+ "h": 23
}
},
{
- "filename": "dark_memory",
+ "filename": "berry_pot",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3357,20 +3252,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 5,
+ "x": 7,
"y": 5,
- "w": 22,
+ "w": 18,
"h": 22
},
"frame": {
- "x": 266,
- "y": 88,
- "w": 22,
+ "x": 124,
+ "y": 135,
+ "w": 18,
"h": 22
}
},
{
- "filename": "dire_hit",
+ "filename": "ground_tera_shard",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3378,20 +3273,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 5,
- "y": 5,
+ "x": 6,
+ "y": 4,
"w": 22,
- "h": 22
+ "h": 23
},
"frame": {
- "x": 288,
- "y": 88,
+ "x": 123,
+ "y": 157,
"w": 22,
- "h": 22
+ "h": 23
}
},
{
- "filename": "super_repel",
+ "filename": "ice_tera_shard",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3399,20 +3294,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 8,
+ "x": 6,
"y": 4,
- "w": 16,
- "h": 24
+ "w": 22,
+ "h": 23
},
"frame": {
- "x": 310,
- "y": 88,
- "w": 16,
- "h": 24
+ "x": 123,
+ "y": 180,
+ "w": 22,
+ "h": 23
}
},
{
- "filename": "wellspring_mask",
+ "filename": "never_melt_ice",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3420,20 +3315,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 4,
+ "x": 5,
"y": 5,
- "w": 23,
- "h": 21
+ "w": 22,
+ "h": 23
},
"frame": {
- "x": 326,
- "y": 91,
- "w": 23,
- "h": 21
+ "x": 123,
+ "y": 203,
+ "w": 22,
+ "h": 23
}
},
{
- "filename": "mystic_ticket",
+ "filename": "leaf_stone",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3441,20 +3336,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 4,
- "y": 7,
- "w": 23,
- "h": 19
+ "x": 5,
+ "y": 5,
+ "w": 21,
+ "h": 23
},
"frame": {
- "x": 349,
- "y": 105,
- "w": 23,
- "h": 19
+ "x": 125,
+ "y": 226,
+ "w": 21,
+ "h": 23
}
},
{
- "filename": "pair_of_tickets",
+ "filename": "mystic_water",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3462,20 +3357,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 4,
- "y": 7,
- "w": 23,
- "h": 19
+ "x": 6,
+ "y": 5,
+ "w": 20,
+ "h": 23
},
"frame": {
- "x": 372,
- "y": 119,
- "w": 23,
- "h": 19
+ "x": 128,
+ "y": 249,
+ "w": 20,
+ "h": 23
}
},
{
- "filename": "whipped_dream",
+ "filename": "normal_tera_shard",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3483,20 +3378,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 5,
+ "x": 6,
"y": 4,
- "w": 21,
+ "w": 22,
"h": 23
},
"frame": {
- "x": 395,
- "y": 135,
- "w": 21,
+ "x": 388,
+ "y": 92,
+ "w": 22,
"h": 23
}
},
{
- "filename": "relic_crown",
+ "filename": "blunder_policy",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3504,20 +3399,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 4,
- "y": 7,
- "w": 23,
- "h": 18
+ "x": 5,
+ "y": 6,
+ "w": 22,
+ "h": 19
},
"frame": {
- "x": 126,
- "y": 104,
- "w": 23,
- "h": 18
+ "x": 388,
+ "y": 115,
+ "w": 22,
+ "h": 19
}
},
{
- "filename": "reaper_cloth",
+ "filename": "sachet",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3525,20 +3420,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 5,
- "y": 5,
- "w": 22,
+ "x": 6,
+ "y": 4,
+ "w": 18,
"h": 23
},
"frame": {
- "x": 124,
- "y": 122,
- "w": 22,
+ "x": 142,
+ "y": 124,
+ "w": 18,
"h": 23
}
},
{
- "filename": "reviver_seed",
+ "filename": "wellspring_mask",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3546,16 +3441,16 @@
"h": 32
},
"spriteSourceSize": {
- "x": 5,
- "y": 8,
+ "x": 4,
+ "y": 5,
"w": 23,
- "h": 20
+ "h": 21
},
"frame": {
- "x": 149,
- "y": 108,
+ "x": 160,
+ "y": 126,
"w": 23,
- "h": 20
+ "h": 21
}
},
{
@@ -3573,14 +3468,14 @@
"h": 20
},
"frame": {
- "x": 172,
- "y": 108,
+ "x": 183,
+ "y": 127,
"w": 23,
"h": 20
}
},
{
- "filename": "blunder_policy",
+ "filename": "relic_crown",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3588,16 +3483,16 @@
"h": 32
},
"spriteSourceSize": {
- "x": 5,
- "y": 6,
- "w": 22,
- "h": 19
+ "x": 4,
+ "y": 7,
+ "w": 23,
+ "h": 18
},
"frame": {
- "x": 195,
- "y": 109,
- "w": 22,
- "h": 19
+ "x": 206,
+ "y": 128,
+ "w": 23,
+ "h": 18
}
},
{
@@ -3615,8 +3510,8 @@
"h": 17
},
"frame": {
- "x": 146,
- "y": 128,
+ "x": 229,
+ "y": 129,
"w": 23,
"h": 17
}
@@ -3636,14 +3531,56 @@
"h": 17
},
"frame": {
- "x": 169,
- "y": 128,
+ "x": 252,
+ "y": 131,
"w": 23,
"h": 17
}
},
{
- "filename": "deep_sea_scale",
+ "filename": "dire_hit",
+ "rotated": false,
+ "trimmed": true,
+ "sourceSize": {
+ "w": 32,
+ "h": 32
+ },
+ "spriteSourceSize": {
+ "x": 5,
+ "y": 5,
+ "w": 22,
+ "h": 22
+ },
+ "frame": {
+ "x": 275,
+ "y": 131,
+ "w": 22,
+ "h": 22
+ }
+ },
+ {
+ "filename": "dna_splicers",
+ "rotated": false,
+ "trimmed": true,
+ "sourceSize": {
+ "w": 32,
+ "h": 32
+ },
+ "spriteSourceSize": {
+ "x": 5,
+ "y": 5,
+ "w": 22,
+ "h": 22
+ },
+ "frame": {
+ "x": 297,
+ "y": 132,
+ "w": 22,
+ "h": 22
+ }
+ },
+ {
+ "filename": "dragon_memory",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3652,19 +3589,19 @@
},
"spriteSourceSize": {
"x": 5,
- "y": 6,
+ "y": 5,
"w": 22,
- "h": 20
+ "h": 22
},
"frame": {
- "x": 192,
- "y": 128,
+ "x": 319,
+ "y": 133,
"w": 22,
- "h": 20
+ "h": 22
}
},
{
- "filename": "dna_splicers",
+ "filename": "electirizer",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3678,14 +3615,14 @@
"h": 22
},
"frame": {
- "x": 217,
- "y": 110,
+ "x": 341,
+ "y": 135,
"w": 22,
"h": 22
}
},
{
- "filename": "dragon_memory",
+ "filename": "petaya_berry",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3696,17 +3633,17 @@
"x": 5,
"y": 5,
"w": 22,
- "h": 22
+ "h": 23
},
"frame": {
- "x": 239,
- "y": 110,
+ "x": 145,
+ "y": 147,
"w": 22,
- "h": 22
+ "h": 23
}
},
{
- "filename": "electirizer",
+ "filename": "poison_tera_shard",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3714,20 +3651,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 5,
- "y": 5,
+ "x": 6,
+ "y": 4,
"w": 22,
- "h": 22
+ "h": 23
},
"frame": {
- "x": 261,
- "y": 110,
+ "x": 167,
+ "y": 147,
"w": 22,
- "h": 22
+ "h": 23
}
},
{
- "filename": "electric_memory",
+ "filename": "psychic_tera_shard",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3735,20 +3672,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 5,
- "y": 5,
+ "x": 6,
+ "y": 4,
"w": 22,
- "h": 22
+ "h": 23
},
"frame": {
- "x": 283,
- "y": 110,
+ "x": 145,
+ "y": 170,
"w": 22,
- "h": 22
+ "h": 23
}
},
{
- "filename": "enigma_berry",
+ "filename": "reaper_cloth",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3759,17 +3696,17 @@
"x": 5,
"y": 5,
"w": 22,
- "h": 22
+ "h": 23
},
"frame": {
- "x": 305,
- "y": 112,
+ "x": 145,
+ "y": 193,
"w": 22,
- "h": 22
+ "h": 23
}
},
{
- "filename": "fairy_memory",
+ "filename": "rock_tera_shard",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3777,20 +3714,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 5,
- "y": 5,
+ "x": 6,
+ "y": 4,
"w": 22,
- "h": 22
+ "h": 23
},
"frame": {
- "x": 327,
- "y": 112,
+ "x": 167,
+ "y": 170,
"w": 22,
- "h": 22
+ "h": 23
}
},
{
- "filename": "dubious_disc",
+ "filename": "steel_tera_shard",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3798,20 +3735,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 5,
- "y": 7,
+ "x": 6,
+ "y": 4,
"w": 22,
- "h": 19
+ "h": 23
},
"frame": {
- "x": 214,
- "y": 132,
+ "x": 167,
+ "y": 193,
"w": 22,
- "h": 19
+ "h": 23
}
},
{
- "filename": "fairy_feather",
+ "filename": "super_lure",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3819,20 +3756,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 5,
- "y": 7,
- "w": 22,
- "h": 20
+ "x": 8,
+ "y": 4,
+ "w": 17,
+ "h": 24
},
"frame": {
- "x": 236,
- "y": 132,
- "w": 22,
- "h": 20
+ "x": 189,
+ "y": 147,
+ "w": 17,
+ "h": 24
}
},
{
- "filename": "fighting_memory",
+ "filename": "stellar_tera_shard",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3840,20 +3777,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 5,
- "y": 5,
+ "x": 6,
+ "y": 4,
"w": 22,
- "h": 22
+ "h": 23
},
"frame": {
- "x": 258,
- "y": 132,
+ "x": 206,
+ "y": 146,
"w": 22,
- "h": 22
+ "h": 23
}
},
{
- "filename": "fire_memory",
+ "filename": "water_tera_shard",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3861,20 +3798,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 5,
- "y": 5,
+ "x": 6,
+ "y": 4,
"w": 22,
- "h": 22
+ "h": 23
},
"frame": {
- "x": 280,
- "y": 132,
+ "x": 228,
+ "y": 146,
"w": 22,
- "h": 22
+ "h": 23
}
},
{
- "filename": "flying_memory",
+ "filename": "electric_memory",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3888,14 +3825,14 @@
"h": 22
},
"frame": {
- "x": 302,
- "y": 134,
+ "x": 250,
+ "y": 148,
"w": 22,
"h": 22
}
},
{
- "filename": "ganlon_berry",
+ "filename": "hyper_potion",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3903,20 +3840,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 5,
+ "x": 8,
"y": 5,
- "w": 22,
- "h": 22
+ "w": 17,
+ "h": 23
},
"frame": {
- "x": 324,
- "y": 134,
- "w": 22,
- "h": 22
+ "x": 189,
+ "y": 171,
+ "w": 17,
+ "h": 23
}
},
{
- "filename": "rock_tera_shard",
+ "filename": "wide_lens",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3924,20 +3861,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
+ "x": 5,
"y": 4,
"w": 22,
"h": 23
},
"frame": {
- "x": 125,
- "y": 145,
+ "x": 206,
+ "y": 169,
"w": 22,
"h": 23
}
},
{
- "filename": "steel_tera_shard",
+ "filename": "enigma_berry",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3945,20 +3882,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
- "y": 4,
+ "x": 5,
+ "y": 5,
"w": 22,
- "h": 23
+ "h": 22
},
"frame": {
- "x": 147,
- "y": 145,
+ "x": 228,
+ "y": 169,
"w": 22,
- "h": 23
+ "h": 22
}
},
{
- "filename": "stellar_tera_shard",
+ "filename": "fairy_memory",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3966,20 +3903,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
- "y": 4,
+ "x": 5,
+ "y": 5,
"w": 22,
- "h": 23
+ "h": 22
},
"frame": {
- "x": 169,
- "y": 145,
+ "x": 250,
+ "y": 170,
"w": 22,
- "h": 23
+ "h": 22
}
},
{
- "filename": "ghost_memory",
+ "filename": "fighting_memory",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -3993,14 +3930,14 @@
"h": 22
},
"frame": {
- "x": 191,
- "y": 148,
+ "x": 272,
+ "y": 153,
"w": 22,
"h": 22
}
},
{
- "filename": "grass_memory",
+ "filename": "fire_memory",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4014,14 +3951,14 @@
"h": 22
},
"frame": {
- "x": 213,
- "y": 151,
+ "x": 294,
+ "y": 154,
"w": 22,
"h": 22
}
},
{
- "filename": "ground_memory",
+ "filename": "dubious_disc",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4030,19 +3967,40 @@
},
"spriteSourceSize": {
"x": 5,
- "y": 5,
+ "y": 7,
"w": 22,
- "h": 22
+ "h": 19
},
"frame": {
- "x": 235,
- "y": 152,
+ "x": 272,
+ "y": 175,
"w": 22,
- "h": 22
+ "h": 19
}
},
{
- "filename": "guard_spec",
+ "filename": "fairy_feather",
+ "rotated": false,
+ "trimmed": true,
+ "sourceSize": {
+ "w": 32,
+ "h": 32
+ },
+ "spriteSourceSize": {
+ "x": 5,
+ "y": 7,
+ "w": 22,
+ "h": 20
+ },
+ "frame": {
+ "x": 294,
+ "y": 176,
+ "w": 22,
+ "h": 20
+ }
+ },
+ {
+ "filename": "flying_memory",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4056,14 +4014,14 @@
"h": 22
},
"frame": {
- "x": 257,
- "y": 154,
+ "x": 316,
+ "y": 155,
"w": 22,
"h": 22
}
},
{
- "filename": "ice_memory",
+ "filename": "ganlon_berry",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4077,14 +4035,14 @@
"h": 22
},
"frame": {
- "x": 279,
- "y": 154,
+ "x": 316,
+ "y": 177,
"w": 22,
"h": 22
}
},
{
- "filename": "ice_stone",
+ "filename": "ghost_memory",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4098,14 +4056,14 @@
"h": 22
},
"frame": {
- "x": 301,
- "y": 156,
+ "x": 338,
+ "y": 157,
"w": 22,
"h": 22
}
},
{
- "filename": "magmarizer",
+ "filename": "grass_memory",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4119,14 +4077,14 @@
"h": 22
},
"frame": {
- "x": 323,
- "y": 156,
+ "x": 338,
+ "y": 179,
"w": 22,
"h": 22
}
},
{
- "filename": "water_tera_shard",
+ "filename": "ground_memory",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4134,20 +4092,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
- "y": 4,
+ "x": 5,
+ "y": 5,
"w": 22,
- "h": 23
+ "h": 22
},
"frame": {
- "x": 126,
- "y": 168,
+ "x": 189,
+ "y": 194,
"w": 22,
- "h": 23
+ "h": 22
}
},
{
- "filename": "wide_lens",
+ "filename": "potion",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4155,20 +4113,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 5,
- "y": 4,
- "w": 22,
+ "x": 8,
+ "y": 5,
+ "w": 17,
"h": 23
},
"frame": {
- "x": 148,
- "y": 168,
- "w": 22,
+ "x": 211,
+ "y": 192,
+ "w": 17,
"h": 23
}
},
{
- "filename": "dusk_stone",
+ "filename": "guard_spec",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4176,20 +4134,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
- "y": 6,
- "w": 21,
- "h": 21
+ "x": 5,
+ "y": 5,
+ "w": 22,
+ "h": 22
},
"frame": {
- "x": 170,
- "y": 168,
- "w": 21,
- "h": 21
+ "x": 228,
+ "y": 191,
+ "w": 22,
+ "h": 22
}
},
{
- "filename": "liechi_berry",
+ "filename": "ice_memory",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4198,19 +4156,19 @@
},
"spriteSourceSize": {
"x": 5,
- "y": 6,
+ "y": 5,
"w": 22,
- "h": 21
+ "h": 22
},
"frame": {
- "x": 191,
- "y": 170,
+ "x": 250,
+ "y": 192,
"w": 22,
- "h": 21
+ "h": 22
}
},
{
- "filename": "mini_black_hole",
+ "filename": "ice_stone",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4224,14 +4182,14 @@
"h": 22
},
"frame": {
- "x": 126,
- "y": 191,
+ "x": 272,
+ "y": 194,
"w": 22,
"h": 22
}
},
{
- "filename": "poison_memory",
+ "filename": "liechi_berry",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4240,19 +4198,19 @@
},
"spriteSourceSize": {
"x": 5,
- "y": 5,
+ "y": 6,
"w": 22,
- "h": 22
+ "h": 21
},
"frame": {
- "x": 148,
- "y": 191,
+ "x": 294,
+ "y": 196,
"w": 22,
- "h": 22
+ "h": 21
}
},
{
- "filename": "poison_barb",
+ "filename": "magmarizer",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4261,15 +4219,15 @@
},
"spriteSourceSize": {
"x": 5,
- "y": 6,
- "w": 21,
- "h": 21
+ "y": 5,
+ "w": 22,
+ "h": 22
},
"frame": {
- "x": 170,
- "y": 189,
- "w": 21,
- "h": 21
+ "x": 316,
+ "y": 199,
+ "w": 22,
+ "h": 22
}
},
{
@@ -4287,14 +4245,14 @@
"h": 20
},
"frame": {
- "x": 213,
- "y": 173,
+ "x": 338,
+ "y": 201,
"w": 22,
"h": 20
}
},
{
- "filename": "protector",
+ "filename": "mini_black_hole",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4308,14 +4266,14 @@
"h": 22
},
"frame": {
- "x": 235,
- "y": 174,
+ "x": 146,
+ "y": 216,
"w": 22,
"h": 22
}
},
{
- "filename": "psychic_memory",
+ "filename": "poison_memory",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4329,14 +4287,14 @@
"h": 22
},
"frame": {
- "x": 191,
- "y": 191,
+ "x": 168,
+ "y": 216,
"w": 22,
"h": 22
}
},
{
- "filename": "rock_memory",
+ "filename": "protector",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4350,14 +4308,14 @@
"h": 22
},
"frame": {
- "x": 213,
- "y": 193,
+ "x": 190,
+ "y": 216,
"w": 22,
"h": 22
}
},
{
- "filename": "scroll_of_darkness",
+ "filename": "repel",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4365,20 +4323,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 5,
- "y": 5,
- "w": 22,
- "h": 22
+ "x": 8,
+ "y": 4,
+ "w": 16,
+ "h": 24
},
"frame": {
- "x": 257,
- "y": 176,
- "w": 22,
- "h": 22
+ "x": 212,
+ "y": 215,
+ "w": 16,
+ "h": 24
}
},
{
- "filename": "scroll_of_waters",
+ "filename": "psychic_memory",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4392,14 +4350,14 @@
"h": 22
},
"frame": {
- "x": 279,
- "y": 176,
+ "x": 228,
+ "y": 213,
"w": 22,
"h": 22
}
},
{
- "filename": "shed_shell",
+ "filename": "rock_memory",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4413,14 +4371,14 @@
"h": 22
},
"frame": {
- "x": 235,
- "y": 196,
+ "x": 250,
+ "y": 214,
"w": 22,
"h": 22
}
},
{
- "filename": "starf_berry",
+ "filename": "scroll_of_darkness",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4434,14 +4392,14 @@
"h": 22
},
"frame": {
- "x": 301,
- "y": 178,
+ "x": 272,
+ "y": 216,
"w": 22,
"h": 22
}
},
{
- "filename": "steel_memory",
+ "filename": "scroll_of_waters",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4455,14 +4413,14 @@
"h": 22
},
"frame": {
- "x": 323,
- "y": 178,
+ "x": 294,
+ "y": 217,
"w": 22,
"h": 22
}
},
{
- "filename": "sweet_apple",
+ "filename": "shed_shell",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4471,19 +4429,19 @@
},
"spriteSourceSize": {
"x": 5,
- "y": 6,
+ "y": 5,
"w": 22,
- "h": 21
+ "h": 22
},
"frame": {
- "x": 257,
- "y": 198,
+ "x": 316,
+ "y": 221,
"w": 22,
- "h": 21
+ "h": 22
}
},
{
- "filename": "syrupy_apple",
+ "filename": "starf_berry",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4492,19 +4450,19 @@
},
"spriteSourceSize": {
"x": 5,
- "y": 6,
+ "y": 5,
"w": 22,
- "h": 21
+ "h": 22
},
"frame": {
- "x": 279,
- "y": 198,
+ "x": 338,
+ "y": 221,
"w": 22,
- "h": 21
+ "h": 22
}
},
{
- "filename": "tart_apple",
+ "filename": "sharp_beak",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4513,19 +4471,19 @@
},
"spriteSourceSize": {
"x": 5,
- "y": 6,
- "w": 22,
- "h": 21
+ "y": 5,
+ "w": 21,
+ "h": 23
},
"frame": {
- "x": 301,
- "y": 200,
- "w": 22,
- "h": 21
+ "x": 148,
+ "y": 238,
+ "w": 21,
+ "h": 23
}
},
{
- "filename": "thick_club",
+ "filename": "steel_memory",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4539,14 +4497,14 @@
"h": 22
},
"frame": {
- "x": 323,
- "y": 200,
+ "x": 169,
+ "y": 238,
"w": 22,
"h": 22
}
},
{
- "filename": "thunder_stone",
+ "filename": "whipped_dream",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4555,19 +4513,19 @@
},
"spriteSourceSize": {
"x": 5,
- "y": 5,
- "w": 22,
- "h": 22
+ "y": 4,
+ "w": 21,
+ "h": 23
},
"frame": {
- "x": 129,
- "y": 213,
- "w": 22,
- "h": 22
+ "x": 191,
+ "y": 238,
+ "w": 21,
+ "h": 23
}
},
{
- "filename": "lock_capsule",
+ "filename": "hard_meteorite",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4577,18 +4535,18 @@
"spriteSourceSize": {
"x": 7,
"y": 5,
- "w": 19,
+ "w": 20,
"h": 22
},
"frame": {
- "x": 151,
- "y": 213,
- "w": 19,
+ "x": 212,
+ "y": 239,
+ "w": 20,
"h": 22
}
},
{
- "filename": "shiny_stone",
+ "filename": "super_potion",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4596,20 +4554,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 5,
- "y": 6,
- "w": 21,
- "h": 21
+ "x": 8,
+ "y": 5,
+ "w": 17,
+ "h": 23
},
"frame": {
- "x": 170,
- "y": 210,
- "w": 21,
- "h": 21
+ "x": 232,
+ "y": 235,
+ "w": 17,
+ "h": 23
}
},
{
- "filename": "tera_orb",
+ "filename": "thick_club",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4618,19 +4576,19 @@
},
"spriteSourceSize": {
"x": 5,
- "y": 6,
+ "y": 5,
"w": 22,
- "h": 20
+ "h": 22
},
"frame": {
- "x": 191,
- "y": 213,
+ "x": 249,
+ "y": 236,
"w": 22,
- "h": 20
+ "h": 22
}
},
{
- "filename": "tm_bug",
+ "filename": "sweet_apple",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4639,19 +4597,19 @@
},
"spriteSourceSize": {
"x": 5,
- "y": 5,
+ "y": 6,
"w": 22,
- "h": 22
+ "h": 21
},
"frame": {
- "x": 213,
- "y": 215,
+ "x": 271,
+ "y": 238,
"w": 22,
- "h": 22
+ "h": 21
}
},
{
- "filename": "tm_dark",
+ "filename": "syrupy_apple",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4660,19 +4618,19 @@
},
"spriteSourceSize": {
"x": 5,
- "y": 5,
+ "y": 6,
"w": 22,
- "h": 22
+ "h": 21
},
"frame": {
- "x": 235,
- "y": 218,
+ "x": 293,
+ "y": 239,
"w": 22,
- "h": 22
+ "h": 21
}
},
{
- "filename": "tm_dragon",
+ "filename": "tart_apple",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4681,19 +4639,19 @@
},
"spriteSourceSize": {
"x": 5,
- "y": 5,
+ "y": 6,
"w": 22,
- "h": 22
+ "h": 21
},
"frame": {
- "x": 257,
- "y": 219,
+ "x": 315,
+ "y": 243,
"w": 22,
- "h": 22
+ "h": 21
}
},
{
- "filename": "tm_electric",
+ "filename": "thunder_stone",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4707,14 +4665,14 @@
"h": 22
},
"frame": {
- "x": 279,
- "y": 219,
+ "x": 337,
+ "y": 243,
"w": 22,
"h": 22
}
},
{
- "filename": "tm_fairy",
+ "filename": "masterpiece_teacup",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4723,19 +4681,19 @@
},
"spriteSourceSize": {
"x": 5,
- "y": 5,
- "w": 22,
- "h": 22
+ "y": 7,
+ "w": 21,
+ "h": 18
},
"frame": {
- "x": 301,
- "y": 221,
- "w": 22,
- "h": 22
+ "x": 148,
+ "y": 261,
+ "w": 21,
+ "h": 18
}
},
{
- "filename": "tm_fighting",
+ "filename": "tera_orb",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4744,19 +4702,19 @@
},
"spriteSourceSize": {
"x": 5,
- "y": 5,
+ "y": 6,
"w": 22,
- "h": 22
+ "h": 20
},
"frame": {
- "x": 323,
- "y": 222,
+ "x": 169,
+ "y": 260,
"w": 22,
- "h": 22
+ "h": 20
}
},
{
- "filename": "tm_fire",
+ "filename": "tm_bug",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4770,14 +4728,14 @@
"h": 22
},
"frame": {
- "x": 349,
- "y": 124,
+ "x": 191,
+ "y": 261,
"w": 22,
"h": 22
}
},
{
- "filename": "tm_flying",
+ "filename": "lock_capsule",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4785,20 +4743,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 5,
+ "x": 7,
"y": 5,
- "w": 22,
+ "w": 19,
"h": 22
},
"frame": {
- "x": 131,
- "y": 235,
- "w": 22,
+ "x": 213,
+ "y": 261,
+ "w": 19,
"h": 22
}
},
{
- "filename": "tm_ghost",
+ "filename": "tm_dark",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4812,14 +4770,14 @@
"h": 22
},
"frame": {
- "x": 131,
- "y": 257,
+ "x": 232,
+ "y": 258,
"w": 22,
"h": 22
}
},
{
- "filename": "hyper_potion",
+ "filename": "metronome",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4827,20 +4785,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 8,
+ "x": 7,
"y": 5,
"w": 17,
- "h": 23
+ "h": 22
},
"frame": {
- "x": 153,
- "y": 235,
+ "x": 254,
+ "y": 258,
"w": 17,
- "h": 23
+ "h": 22
}
},
{
- "filename": "zoom_lens",
+ "filename": "tm_dragon",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4849,19 +4807,19 @@
},
"spriteSourceSize": {
"x": 5,
- "y": 6,
- "w": 21,
- "h": 21
+ "y": 5,
+ "w": 22,
+ "h": 22
},
"frame": {
- "x": 170,
- "y": 231,
- "w": 21,
- "h": 21
+ "x": 271,
+ "y": 259,
+ "w": 22,
+ "h": 22
}
},
{
- "filename": "tm_grass",
+ "filename": "tm_electric",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4875,14 +4833,14 @@
"h": 22
},
"frame": {
- "x": 191,
- "y": 233,
+ "x": 293,
+ "y": 260,
"w": 22,
"h": 22
}
},
{
- "filename": "tm_ground",
+ "filename": "tm_fairy",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4896,14 +4854,14 @@
"h": 22
},
"frame": {
- "x": 213,
- "y": 237,
+ "x": 315,
+ "y": 264,
"w": 22,
"h": 22
}
},
{
- "filename": "tm_ice",
+ "filename": "tm_fighting",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4917,14 +4875,14 @@
"h": 22
},
"frame": {
- "x": 235,
- "y": 240,
+ "x": 337,
+ "y": 265,
"w": 22,
"h": 22
}
},
{
- "filename": "tm_normal",
+ "filename": "tm_fire",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4938,14 +4896,14 @@
"h": 22
},
"frame": {
- "x": 257,
- "y": 241,
+ "x": 366,
+ "y": 131,
"w": 22,
"h": 22
}
},
{
- "filename": "tm_poison",
+ "filename": "tm_flying",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4959,14 +4917,14 @@
"h": 22
},
"frame": {
- "x": 279,
- "y": 241,
+ "x": 388,
+ "y": 134,
"w": 22,
"h": 22
}
},
{
- "filename": "tm_psychic",
+ "filename": "big_nugget",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -4974,20 +4932,41 @@
"h": 32
},
"spriteSourceSize": {
- "x": 5,
- "y": 5,
- "w": 22,
- "h": 22
+ "x": 6,
+ "y": 6,
+ "w": 20,
+ "h": 20
},
"frame": {
- "x": 301,
- "y": 243,
- "w": 22,
- "h": 22
+ "x": 128,
+ "y": 272,
+ "w": 20,
+ "h": 20
}
},
{
- "filename": "tm_rock",
+ "filename": "metal_alloy",
+ "rotated": false,
+ "trimmed": true,
+ "sourceSize": {
+ "w": 32,
+ "h": 32
+ },
+ "spriteSourceSize": {
+ "x": 6,
+ "y": 7,
+ "w": 21,
+ "h": 19
+ },
+ "frame": {
+ "x": 148,
+ "y": 279,
+ "w": 21,
+ "h": 19
+ }
+ },
+ {
+ "filename": "tm_ghost",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5001,14 +4980,14 @@
"h": 22
},
"frame": {
- "x": 323,
- "y": 244,
+ "x": 169,
+ "y": 280,
"w": 22,
"h": 22
}
},
{
- "filename": "berry_pot",
+ "filename": "tm_grass",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5016,20 +4995,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 7,
+ "x": 5,
"y": 5,
- "w": 18,
+ "w": 22,
"h": 22
},
"frame": {
- "x": 153,
- "y": 258,
- "w": 18,
+ "x": 191,
+ "y": 283,
+ "w": 22,
"h": 22
}
},
{
- "filename": "sitrus_berry",
+ "filename": "metal_coat",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5039,18 +5018,18 @@
"spriteSourceSize": {
"x": 6,
"y": 5,
- "w": 20,
+ "w": 19,
"h": 22
},
"frame": {
- "x": 171,
- "y": 252,
- "w": 20,
+ "x": 213,
+ "y": 283,
+ "w": 19,
"h": 22
}
},
{
- "filename": "tm_steel",
+ "filename": "tm_ground",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5064,14 +5043,14 @@
"h": 22
},
"frame": {
- "x": 191,
- "y": 255,
+ "x": 232,
+ "y": 280,
"w": 22,
"h": 22
}
},
{
- "filename": "tm_water",
+ "filename": "soothe_bell",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5079,20 +5058,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 5,
+ "x": 8,
"y": 5,
- "w": 22,
+ "w": 17,
"h": 22
},
"frame": {
- "x": 213,
- "y": 259,
- "w": 22,
+ "x": 254,
+ "y": 280,
+ "w": 17,
"h": 22
}
},
{
- "filename": "upgrade",
+ "filename": "tm_ice",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5101,19 +5080,19 @@
},
"spriteSourceSize": {
"x": 5,
- "y": 7,
+ "y": 5,
"w": 22,
- "h": 19
+ "h": 22
},
"frame": {
- "x": 235,
- "y": 262,
+ "x": 271,
+ "y": 281,
"w": 22,
- "h": 19
+ "h": 22
}
},
{
- "filename": "water_memory",
+ "filename": "tm_normal",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5127,14 +5106,14 @@
"h": 22
},
"frame": {
- "x": 257,
- "y": 263,
+ "x": 293,
+ "y": 282,
"w": 22,
"h": 22
}
},
{
- "filename": "water_stone",
+ "filename": "tm_poison",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5148,14 +5127,14 @@
"h": 22
},
"frame": {
- "x": 279,
- "y": 263,
+ "x": 315,
+ "y": 286,
"w": 22,
"h": 22
}
},
{
- "filename": "x_accuracy",
+ "filename": "tm_psychic",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5169,14 +5148,14 @@
"h": 22
},
"frame": {
- "x": 301,
- "y": 265,
+ "x": 337,
+ "y": 287,
"w": 22,
"h": 22
}
},
{
- "filename": "x_attack",
+ "filename": "tm_rock",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5190,14 +5169,14 @@
"h": 22
},
"frame": {
- "x": 323,
- "y": 266,
+ "x": 72,
+ "y": 270,
"w": 22,
"h": 22
}
},
{
- "filename": "big_nugget",
+ "filename": "tm_steel",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5205,20 +5184,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
- "y": 6,
- "w": 20,
- "h": 20
+ "x": 5,
+ "y": 5,
+ "w": 22,
+ "h": 22
},
"frame": {
- "x": 171,
- "y": 274,
- "w": 20,
- "h": 20
+ "x": 72,
+ "y": 292,
+ "w": 22,
+ "h": 22
}
},
{
- "filename": "x_defense",
+ "filename": "tm_water",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5232,14 +5211,14 @@
"h": 22
},
"frame": {
- "x": 191,
- "y": 277,
+ "x": 72,
+ "y": 314,
"w": 22,
"h": 22
}
},
{
- "filename": "x_sp_atk",
+ "filename": "water_memory",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5253,14 +5232,14 @@
"h": 22
},
"frame": {
- "x": 213,
- "y": 281,
+ "x": 72,
+ "y": 336,
"w": 22,
"h": 22
}
},
{
- "filename": "x_sp_def",
+ "filename": "water_stone",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5274,14 +5253,14 @@
"h": 22
},
"frame": {
- "x": 235,
- "y": 281,
+ "x": 72,
+ "y": 358,
"w": 22,
"h": 22
}
},
{
- "filename": "x_speed",
+ "filename": "x_accuracy",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5295,14 +5274,14 @@
"h": 22
},
"frame": {
- "x": 257,
- "y": 285,
+ "x": 72,
+ "y": 380,
"w": 22,
"h": 22
}
},
{
- "filename": "dawn_stone",
+ "filename": "leftovers",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5310,20 +5289,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
- "y": 6,
- "w": 20,
- "h": 21
+ "x": 8,
+ "y": 5,
+ "w": 15,
+ "h": 22
},
"frame": {
- "x": 279,
- "y": 285,
- "w": 20,
- "h": 21
+ "x": 94,
+ "y": 270,
+ "w": 15,
+ "h": 22
}
},
{
- "filename": "metal_alloy",
+ "filename": "big_mushroom",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5332,19 +5311,19 @@
},
"spriteSourceSize": {
"x": 6,
- "y": 7,
- "w": 21,
+ "y": 6,
+ "w": 19,
"h": 19
},
"frame": {
- "x": 299,
- "y": 287,
- "w": 21,
+ "x": 109,
+ "y": 273,
+ "w": 19,
"h": 19
}
},
{
- "filename": "masterpiece_teacup",
+ "filename": "x_attack",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5353,40 +5332,19 @@
},
"spriteSourceSize": {
"x": 5,
- "y": 7,
- "w": 21,
- "h": 18
- },
- "frame": {
- "x": 320,
- "y": 288,
- "w": 21,
- "h": 18
- }
- },
- {
- "filename": "sharp_meteorite",
- "rotated": false,
- "trimmed": true,
- "sourceSize": {
- "w": 32,
- "h": 32
- },
- "spriteSourceSize": {
- "x": 6,
- "y": 8,
- "w": 21,
- "h": 18
+ "y": 5,
+ "w": 22,
+ "h": 22
},
"frame": {
- "x": 346,
- "y": 146,
- "w": 21,
- "h": 18
+ "x": 94,
+ "y": 292,
+ "w": 22,
+ "h": 22
}
},
{
- "filename": "metal_coat",
+ "filename": "x_defense",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5394,20 +5352,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
+ "x": 5,
"y": 5,
- "w": 19,
+ "w": 22,
"h": 22
},
"frame": {
- "x": 345,
- "y": 164,
- "w": 19,
+ "x": 116,
+ "y": 292,
+ "w": 22,
"h": 22
}
},
{
- "filename": "sachet",
+ "filename": "x_sp_atk",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5415,20 +5373,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
- "y": 4,
- "w": 18,
- "h": 23
+ "x": 5,
+ "y": 5,
+ "w": 22,
+ "h": 22
},
"frame": {
- "x": 345,
- "y": 186,
- "w": 18,
- "h": 23
+ "x": 94,
+ "y": 314,
+ "w": 22,
+ "h": 22
}
},
{
- "filename": "potion",
+ "filename": "x_sp_def",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5436,20 +5394,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 8,
+ "x": 5,
"y": 5,
- "w": 17,
- "h": 23
+ "w": 22,
+ "h": 22
},
"frame": {
- "x": 345,
- "y": 209,
- "w": 17,
- "h": 23
+ "x": 94,
+ "y": 336,
+ "w": 22,
+ "h": 22
}
},
{
- "filename": "super_potion",
+ "filename": "x_speed",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5457,20 +5415,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 8,
+ "x": 5,
"y": 5,
- "w": 17,
- "h": 23
+ "w": 22,
+ "h": 22
},
"frame": {
- "x": 345,
- "y": 232,
- "w": 17,
- "h": 23
+ "x": 116,
+ "y": 314,
+ "w": 22,
+ "h": 22
}
},
{
- "filename": "unknown",
+ "filename": "poison_barb",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5478,20 +5436,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 8,
- "y": 4,
- "w": 16,
- "h": 24
+ "x": 5,
+ "y": 6,
+ "w": 21,
+ "h": 21
},
"frame": {
- "x": 345,
- "y": 255,
- "w": 16,
- "h": 24
+ "x": 94,
+ "y": 358,
+ "w": 21,
+ "h": 21
}
},
{
- "filename": "unremarkable_teacup",
+ "filename": "shiny_stone",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5500,19 +5458,19 @@
},
"spriteSourceSize": {
"x": 5,
- "y": 7,
+ "y": 6,
"w": 21,
- "h": 18
+ "h": 21
},
"frame": {
- "x": 371,
- "y": 138,
+ "x": 116,
+ "y": 336,
"w": 21,
- "h": 18
+ "h": 21
}
},
{
- "filename": "blue_orb",
+ "filename": "sitrus_berry",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5521,19 +5479,19 @@
},
"spriteSourceSize": {
"x": 6,
- "y": 6,
+ "y": 5,
"w": 20,
- "h": 20
+ "h": 22
},
"frame": {
- "x": 132,
- "y": 279,
+ "x": 94,
+ "y": 379,
"w": 20,
- "h": 20
+ "h": 22
}
},
{
- "filename": "apicot_berry",
+ "filename": "zoom_lens",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5541,20 +5499,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
+ "x": 5,
"y": 6,
- "w": 19,
- "h": 20
+ "w": 21,
+ "h": 21
},
"frame": {
- "x": 152,
- "y": 280,
- "w": 19,
- "h": 20
+ "x": 138,
+ "y": 298,
+ "w": 21,
+ "h": 21
}
},
{
- "filename": "gb",
+ "filename": "sharp_meteorite",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5563,19 +5521,19 @@
},
"spriteSourceSize": {
"x": 6,
- "y": 6,
- "w": 20,
- "h": 20
+ "y": 8,
+ "w": 21,
+ "h": 18
},
"frame": {
- "x": 132,
- "y": 299,
- "w": 20,
- "h": 20
+ "x": 138,
+ "y": 319,
+ "w": 21,
+ "h": 18
}
},
{
- "filename": "magnet",
+ "filename": "upgrade",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5583,20 +5541,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
- "y": 6,
- "w": 20,
- "h": 20
+ "x": 5,
+ "y": 7,
+ "w": 22,
+ "h": 19
},
"frame": {
- "x": 132,
- "y": 319,
- "w": 20,
- "h": 20
+ "x": 137,
+ "y": 337,
+ "w": 22,
+ "h": 19
}
},
{
- "filename": "mb",
+ "filename": "dawn_stone",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5607,17 +5565,17 @@
"x": 6,
"y": 6,
"w": 20,
- "h": 20
+ "h": 21
},
"frame": {
- "x": 132,
- "y": 339,
+ "x": 159,
+ "y": 302,
"w": 20,
- "h": 20
+ "h": 21
}
},
{
- "filename": "pb",
+ "filename": "blue_orb",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5631,14 +5589,14 @@
"h": 20
},
"frame": {
- "x": 132,
- "y": 359,
+ "x": 159,
+ "y": 323,
"w": 20,
"h": 20
}
},
{
- "filename": "quick_claw",
+ "filename": "everstone",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5647,19 +5605,19 @@
},
"spriteSourceSize": {
"x": 6,
- "y": 6,
- "w": 19,
- "h": 21
+ "y": 8,
+ "w": 20,
+ "h": 17
},
"frame": {
- "x": 152,
- "y": 300,
- "w": 19,
- "h": 21
+ "x": 159,
+ "y": 343,
+ "w": 20,
+ "h": 17
}
},
{
- "filename": "pb_gold",
+ "filename": "revive",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5667,20 +5625,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
- "y": 6,
- "w": 20,
- "h": 20
+ "x": 10,
+ "y": 8,
+ "w": 12,
+ "h": 17
},
"frame": {
- "x": 171,
- "y": 294,
- "w": 20,
- "h": 20
+ "x": 179,
+ "y": 302,
+ "w": 12,
+ "h": 17
}
},
{
- "filename": "spell_tag",
+ "filename": "super_repel",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5688,20 +5646,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 7,
- "y": 6,
- "w": 19,
- "h": 21
+ "x": 8,
+ "y": 4,
+ "w": 16,
+ "h": 24
},
"frame": {
- "x": 152,
- "y": 321,
- "w": 19,
- "h": 21
+ "x": 179,
+ "y": 319,
+ "w": 16,
+ "h": 24
}
},
{
- "filename": "rb",
+ "filename": "candy",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5709,20 +5667,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
- "y": 6,
- "w": 20,
- "h": 20
+ "x": 7,
+ "y": 11,
+ "w": 18,
+ "h": 18
},
"frame": {
- "x": 171,
- "y": 314,
- "w": 20,
- "h": 20
+ "x": 179,
+ "y": 343,
+ "w": 18,
+ "h": 18
}
},
{
- "filename": "smooth_meteorite",
+ "filename": "unknown",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5730,16 +5688,16 @@
"h": 32
},
"spriteSourceSize": {
- "x": 7,
- "y": 6,
- "w": 20,
- "h": 20
+ "x": 8,
+ "y": 4,
+ "w": 16,
+ "h": 24
},
"frame": {
- "x": 191,
- "y": 299,
- "w": 20,
- "h": 20
+ "x": 360,
+ "y": 157,
+ "w": 16,
+ "h": 24
}
},
{
@@ -5757,14 +5715,14 @@
"h": 24
},
"frame": {
- "x": 152,
- "y": 342,
+ "x": 360,
+ "y": 181,
"w": 16,
"h": 24
}
},
{
- "filename": "everstone",
+ "filename": "quick_claw",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5773,19 +5731,19 @@
},
"spriteSourceSize": {
"x": 6,
- "y": 8,
- "w": 20,
- "h": 17
+ "y": 6,
+ "w": 19,
+ "h": 21
},
"frame": {
- "x": 191,
- "y": 319,
- "w": 20,
- "h": 17
+ "x": 360,
+ "y": 205,
+ "w": 19,
+ "h": 21
}
},
{
- "filename": "strange_ball",
+ "filename": "candy_jar",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5795,18 +5753,18 @@
"spriteSourceSize": {
"x": 6,
"y": 6,
- "w": 20,
+ "w": 19,
"h": 20
},
"frame": {
- "x": 211,
- "y": 303,
- "w": 20,
+ "x": 360,
+ "y": 226,
+ "w": 19,
"h": 20
}
},
{
- "filename": "ub",
+ "filename": "gb",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5820,14 +5778,14 @@
"h": 20
},
"frame": {
- "x": 231,
- "y": 303,
+ "x": 359,
+ "y": 246,
"w": 20,
"h": 20
}
},
{
- "filename": "candy_jar",
+ "filename": "magnet",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5837,39 +5795,18 @@
"spriteSourceSize": {
"x": 6,
"y": 6,
- "w": 19,
+ "w": 20,
"h": 20
},
"frame": {
- "x": 133,
- "y": 379,
- "w": 19,
+ "x": 359,
+ "y": 266,
+ "w": 20,
"h": 20
}
},
{
- "filename": "full_heal",
- "rotated": false,
- "trimmed": true,
- "sourceSize": {
- "w": 32,
- "h": 32
- },
- "spriteSourceSize": {
- "x": 9,
- "y": 4,
- "w": 15,
- "h": 23
- },
- "frame": {
- "x": 152,
- "y": 366,
- "w": 15,
- "h": 23
- }
- },
- {
- "filename": "lum_berry",
+ "filename": "mb",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5878,19 +5815,19 @@
},
"spriteSourceSize": {
"x": 6,
- "y": 7,
+ "y": 6,
"w": 20,
- "h": 19
+ "h": 20
},
"frame": {
- "x": 211,
- "y": 323,
+ "x": 359,
+ "y": 286,
"w": 20,
- "h": 19
+ "h": 20
}
},
{
- "filename": "razor_claw",
+ "filename": "pb",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5899,19 +5836,19 @@
},
"spriteSourceSize": {
"x": 6,
- "y": 7,
+ "y": 6,
"w": 20,
- "h": 19
+ "h": 20
},
"frame": {
- "x": 231,
- "y": 323,
+ "x": 376,
+ "y": 156,
"w": 20,
- "h": 19
+ "h": 20
}
},
{
- "filename": "hard_stone",
+ "filename": "spell_tag",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5919,20 +5856,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
+ "x": 7,
"y": 6,
"w": 19,
- "h": 20
+ "h": 21
},
"frame": {
- "x": 251,
- "y": 307,
+ "x": 396,
+ "y": 156,
"w": 19,
- "h": 20
+ "h": 21
}
},
{
- "filename": "mega_bracelet",
+ "filename": "pb_gold",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5941,19 +5878,19 @@
},
"spriteSourceSize": {
"x": 6,
- "y": 8,
+ "y": 6,
"w": 20,
- "h": 16
+ "h": 20
},
"frame": {
- "x": 251,
- "y": 327,
+ "x": 376,
+ "y": 176,
"w": 20,
- "h": 16
+ "h": 20
}
},
{
- "filename": "revive",
+ "filename": "hard_stone",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -5961,16 +5898,16 @@
"h": 32
},
"spriteSourceSize": {
- "x": 10,
- "y": 8,
- "w": 12,
- "h": 17
+ "x": 6,
+ "y": 6,
+ "w": 19,
+ "h": 20
},
"frame": {
- "x": 133,
- "y": 399,
- "w": 12,
- "h": 17
+ "x": 396,
+ "y": 177,
+ "w": 19,
+ "h": 20
}
},
{
@@ -5988,35 +5925,35 @@
"h": 20
},
"frame": {
- "x": 270,
- "y": 307,
+ "x": 379,
+ "y": 196,
"w": 17,
"h": 20
}
},
{
- "filename": "white_herb",
+ "filename": "miracle_seed",
"rotated": false,
"trimmed": true,
"sourceSize": {
- "w": 24,
- "h": 24
+ "w": 32,
+ "h": 32
},
"spriteSourceSize": {
- "x": 2,
- "y": 3,
- "w": 20,
+ "x": 6,
+ "y": 7,
+ "w": 19,
"h": 19
},
"frame": {
- "x": 287,
- "y": 306,
- "w": 20,
+ "x": 396,
+ "y": 197,
+ "w": 19,
"h": 19
}
},
{
- "filename": "miracle_seed",
+ "filename": "rb",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6025,19 +5962,19 @@
},
"spriteSourceSize": {
"x": 6,
- "y": 7,
- "w": 19,
- "h": 19
+ "y": 6,
+ "w": 20,
+ "h": 20
},
"frame": {
- "x": 307,
- "y": 306,
- "w": 19,
- "h": 19
+ "x": 379,
+ "y": 216,
+ "w": 20,
+ "h": 20
}
},
{
- "filename": "leftovers",
+ "filename": "abomasite",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6046,19 +5983,40 @@
},
"spriteSourceSize": {
"x": 8,
- "y": 5,
- "w": 15,
- "h": 22
+ "y": 8,
+ "w": 16,
+ "h": 16
},
"frame": {
- "x": 326,
- "y": 306,
- "w": 15,
- "h": 22
+ "x": 399,
+ "y": 216,
+ "w": 16,
+ "h": 16
}
},
{
- "filename": "abomasite",
+ "filename": "smooth_meteorite",
+ "rotated": false,
+ "trimmed": true,
+ "sourceSize": {
+ "w": 32,
+ "h": 32
+ },
+ "spriteSourceSize": {
+ "x": 7,
+ "y": 6,
+ "w": 20,
+ "h": 20
+ },
+ "frame": {
+ "x": 379,
+ "y": 236,
+ "w": 20,
+ "h": 20
+ }
+ },
+ {
+ "filename": "absolite",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6072,14 +6030,14 @@
"h": 16
},
"frame": {
- "x": 271,
- "y": 327,
+ "x": 399,
+ "y": 232,
"w": 16,
"h": 16
}
},
{
- "filename": "wl_ability_urge",
+ "filename": "aerodactylite",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6087,20 +6045,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
+ "x": 8,
"y": 8,
- "w": 20,
- "h": 18
+ "w": 16,
+ "h": 16
},
"frame": {
- "x": 287,
- "y": 325,
- "w": 20,
- "h": 18
+ "x": 399,
+ "y": 248,
+ "w": 16,
+ "h": 16
}
},
{
- "filename": "candy",
+ "filename": "strange_ball",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6108,20 +6066,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 7,
- "y": 11,
- "w": 18,
- "h": 18
+ "x": 6,
+ "y": 6,
+ "w": 20,
+ "h": 20
},
"frame": {
- "x": 307,
- "y": 325,
- "w": 18,
- "h": 18
+ "x": 379,
+ "y": 256,
+ "w": 20,
+ "h": 20
}
},
{
- "filename": "absolite",
+ "filename": "aggronite",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6135,14 +6093,14 @@
"h": 16
},
"frame": {
- "x": 325,
- "y": 328,
+ "x": 399,
+ "y": 264,
"w": 16,
"h": 16
}
},
{
- "filename": "wl_antidote",
+ "filename": "ub",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6151,19 +6109,19 @@
},
"spriteSourceSize": {
"x": 6,
- "y": 8,
+ "y": 6,
"w": 20,
- "h": 18
+ "h": 20
},
"frame": {
- "x": 171,
- "y": 334,
+ "x": 379,
+ "y": 276,
"w": 20,
- "h": 18
+ "h": 20
}
},
{
- "filename": "wl_awakening",
+ "filename": "alakazite",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6171,20 +6129,41 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
+ "x": 8,
"y": 8,
- "w": 20,
+ "w": 16,
+ "h": 16
+ },
+ "frame": {
+ "x": 399,
+ "y": 280,
+ "w": 16,
+ "h": 16
+ }
+ },
+ {
+ "filename": "unremarkable_teacup",
+ "rotated": false,
+ "trimmed": true,
+ "sourceSize": {
+ "w": 32,
+ "h": 32
+ },
+ "spriteSourceSize": {
+ "x": 5,
+ "y": 7,
+ "w": 21,
"h": 18
},
"frame": {
- "x": 191,
- "y": 336,
- "w": 20,
+ "x": 379,
+ "y": 296,
+ "w": 21,
"h": 18
}
},
{
- "filename": "wl_burn_heal",
+ "filename": "eviolite",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6192,20 +6171,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
+ "x": 8,
"y": 8,
- "w": 20,
- "h": 18
+ "w": 15,
+ "h": 15
},
"frame": {
- "x": 211,
- "y": 342,
- "w": 20,
- "h": 18
+ "x": 400,
+ "y": 296,
+ "w": 15,
+ "h": 15
}
},
{
- "filename": "wl_custom_spliced",
+ "filename": "prism_scale",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6213,20 +6192,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
+ "x": 9,
"y": 8,
- "w": 20,
- "h": 18
+ "w": 15,
+ "h": 15
},
"frame": {
- "x": 231,
- "y": 342,
- "w": 20,
- "h": 18
+ "x": 400,
+ "y": 311,
+ "w": 15,
+ "h": 15
}
},
{
- "filename": "wl_custom_thief",
+ "filename": "lum_berry",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6235,19 +6214,19 @@
},
"spriteSourceSize": {
"x": 6,
- "y": 8,
+ "y": 7,
"w": 20,
- "h": 18
+ "h": 19
},
"frame": {
- "x": 251,
- "y": 343,
+ "x": 359,
+ "y": 306,
"w": 20,
- "h": 18
+ "h": 19
}
},
{
- "filename": "wl_elixir",
+ "filename": "mega_bracelet",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6258,17 +6237,17 @@
"x": 6,
"y": 8,
"w": 20,
- "h": 18
+ "h": 16
},
"frame": {
- "x": 271,
- "y": 343,
+ "x": 379,
+ "y": 314,
"w": 20,
- "h": 18
+ "h": 16
}
},
{
- "filename": "wl_ether",
+ "filename": "altarianite",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6276,20 +6255,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
+ "x": 8,
"y": 8,
- "w": 20,
- "h": 18
+ "w": 16,
+ "h": 16
},
"frame": {
- "x": 291,
- "y": 343,
- "w": 20,
- "h": 18
+ "x": 399,
+ "y": 326,
+ "w": 16,
+ "h": 16
}
},
{
- "filename": "wl_full_heal",
+ "filename": "razor_claw",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6298,19 +6277,19 @@
},
"spriteSourceSize": {
"x": 6,
- "y": 8,
+ "y": 7,
"w": 20,
- "h": 18
+ "h": 19
},
"frame": {
- "x": 168,
- "y": 352,
+ "x": 195,
+ "y": 305,
"w": 20,
- "h": 18
+ "h": 19
}
},
{
- "filename": "wl_full_restore",
+ "filename": "oval_stone",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6318,20 +6297,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
- "y": 8,
- "w": 20,
- "h": 18
+ "x": 7,
+ "y": 7,
+ "w": 18,
+ "h": 19
},
"frame": {
- "x": 167,
- "y": 370,
- "w": 20,
- "h": 18
+ "x": 195,
+ "y": 324,
+ "w": 18,
+ "h": 19
}
},
{
- "filename": "wl_guard_spec",
+ "filename": "lucky_egg",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6339,20 +6318,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
- "y": 8,
- "w": 20,
- "h": 18
+ "x": 7,
+ "y": 6,
+ "w": 17,
+ "h": 20
},
"frame": {
- "x": 188,
- "y": 354,
- "w": 20,
- "h": 18
+ "x": 215,
+ "y": 305,
+ "w": 17,
+ "h": 20
}
},
{
- "filename": "wl_hyper_potion",
+ "filename": "razor_fang",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6360,20 +6339,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
- "y": 8,
- "w": 20,
- "h": 18
+ "x": 7,
+ "y": 6,
+ "w": 18,
+ "h": 20
},
"frame": {
- "x": 187,
- "y": 372,
- "w": 20,
- "h": 18
+ "x": 232,
+ "y": 302,
+ "w": 18,
+ "h": 20
}
},
{
- "filename": "wl_ice_heal",
+ "filename": "wl_ability_urge",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6387,14 +6366,14 @@
"h": 18
},
"frame": {
- "x": 208,
- "y": 360,
+ "x": 250,
+ "y": 302,
"w": 20,
"h": 18
}
},
{
- "filename": "wl_item_drop",
+ "filename": "wl_antidote",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6408,14 +6387,14 @@
"h": 18
},
"frame": {
- "x": 228,
- "y": 360,
+ "x": 270,
+ "y": 303,
"w": 20,
"h": 18
}
},
{
- "filename": "wl_item_urge",
+ "filename": "wl_awakening",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6429,14 +6408,14 @@
"h": 18
},
"frame": {
- "x": 248,
- "y": 361,
+ "x": 213,
+ "y": 325,
"w": 20,
"h": 18
}
},
{
- "filename": "wl_max_elixir",
+ "filename": "wl_burn_heal",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6450,14 +6429,14 @@
"h": 18
},
"frame": {
- "x": 268,
- "y": 361,
+ "x": 197,
+ "y": 343,
"w": 20,
"h": 18
}
},
{
- "filename": "wl_max_ether",
+ "filename": "dark_stone",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6465,20 +6444,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
- "y": 8,
- "w": 20,
+ "x": 7,
+ "y": 7,
+ "w": 18,
"h": 18
},
"frame": {
- "x": 288,
- "y": 361,
- "w": 20,
+ "x": 217,
+ "y": 343,
+ "w": 18,
"h": 18
}
},
{
- "filename": "wl_max_potion",
+ "filename": "wl_custom_spliced",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6492,14 +6471,14 @@
"h": 18
},
"frame": {
- "x": 207,
- "y": 378,
+ "x": 290,
+ "y": 304,
"w": 20,
"h": 18
}
},
{
- "filename": "wl_max_revive",
+ "filename": "flame_orb",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6507,20 +6486,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
- "y": 8,
- "w": 20,
+ "x": 7,
+ "y": 7,
+ "w": 18,
"h": 18
},
"frame": {
- "x": 227,
- "y": 378,
- "w": 20,
+ "x": 233,
+ "y": 322,
+ "w": 18,
"h": 18
}
},
{
- "filename": "wl_paralyze_heal",
+ "filename": "light_ball",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6528,20 +6507,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 6,
- "y": 8,
- "w": 20,
+ "x": 7,
+ "y": 7,
+ "w": 18,
"h": 18
},
"frame": {
- "x": 247,
- "y": 379,
- "w": 20,
+ "x": 251,
+ "y": 320,
+ "w": 18,
"h": 18
}
},
{
- "filename": "wl_potion",
+ "filename": "wl_custom_thief",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6555,14 +6534,14 @@
"h": 18
},
"frame": {
- "x": 267,
- "y": 379,
+ "x": 269,
+ "y": 321,
"w": 20,
"h": 18
}
},
{
- "filename": "wl_reset_urge",
+ "filename": "wl_elixir",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6576,14 +6555,14 @@
"h": 18
},
"frame": {
- "x": 287,
- "y": 379,
+ "x": 289,
+ "y": 322,
"w": 20,
"h": 18
}
},
{
- "filename": "metronome",
+ "filename": "light_stone",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6592,19 +6571,19 @@
},
"spriteSourceSize": {
"x": 7,
- "y": 5,
- "w": 17,
- "h": 22
+ "y": 7,
+ "w": 18,
+ "h": 18
},
"frame": {
- "x": 341,
- "y": 288,
- "w": 17,
- "h": 22
+ "x": 235,
+ "y": 340,
+ "w": 18,
+ "h": 18
}
},
{
- "filename": "soothe_bell",
+ "filename": "ampharosite",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6613,19 +6592,19 @@
},
"spriteSourceSize": {
"x": 8,
- "y": 5,
- "w": 17,
- "h": 22
+ "y": 8,
+ "w": 16,
+ "h": 16
},
"frame": {
- "x": 341,
- "y": 310,
- "w": 17,
- "h": 22
+ "x": 253,
+ "y": 338,
+ "w": 16,
+ "h": 16
}
},
{
- "filename": "dark_stone",
+ "filename": "wl_ether",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6633,20 +6612,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 7,
- "y": 7,
- "w": 18,
+ "x": 6,
+ "y": 8,
+ "w": 20,
"h": 18
},
"frame": {
- "x": 341,
- "y": 332,
- "w": 18,
+ "x": 269,
+ "y": 339,
+ "w": 20,
"h": 18
}
},
{
- "filename": "aerodactylite",
+ "filename": "wl_full_heal",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6654,20 +6633,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 8,
+ "x": 6,
"y": 8,
- "w": 16,
- "h": 16
+ "w": 20,
+ "h": 18
},
"frame": {
- "x": 152,
- "y": 389,
- "w": 16,
- "h": 16
+ "x": 289,
+ "y": 340,
+ "w": 20,
+ "h": 18
}
},
{
- "filename": "flame_orb",
+ "filename": "wl_full_restore",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6675,20 +6654,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 7,
- "y": 7,
- "w": 18,
+ "x": 6,
+ "y": 8,
+ "w": 20,
"h": 18
},
"frame": {
- "x": 168,
- "y": 388,
- "w": 18,
+ "x": 310,
+ "y": 308,
+ "w": 20,
"h": 18
}
},
{
- "filename": "wl_revive",
+ "filename": "wl_guard_spec",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6702,14 +6681,14 @@
"h": 18
},
"frame": {
- "x": 186,
- "y": 390,
+ "x": 309,
+ "y": 326,
"w": 20,
"h": 18
}
},
{
- "filename": "razor_fang",
+ "filename": "wl_hyper_potion",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6717,20 +6696,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 7,
- "y": 6,
- "w": 18,
- "h": 20
+ "x": 6,
+ "y": 8,
+ "w": 20,
+ "h": 18
},
"frame": {
- "x": 206,
- "y": 396,
- "w": 18,
- "h": 20
+ "x": 309,
+ "y": 344,
+ "w": 20,
+ "h": 18
}
},
{
- "filename": "lucky_egg",
+ "filename": "wl_ice_heal",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6738,20 +6717,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 7,
- "y": 6,
- "w": 17,
- "h": 20
+ "x": 6,
+ "y": 8,
+ "w": 20,
+ "h": 18
},
"frame": {
- "x": 224,
- "y": 396,
- "w": 17,
- "h": 20
+ "x": 330,
+ "y": 309,
+ "w": 20,
+ "h": 18
}
},
{
- "filename": "oval_stone",
+ "filename": "wl_item_drop",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6759,20 +6738,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 7,
- "y": 7,
- "w": 18,
- "h": 19
+ "x": 6,
+ "y": 8,
+ "w": 20,
+ "h": 18
},
"frame": {
- "x": 241,
- "y": 397,
- "w": 18,
- "h": 19
+ "x": 329,
+ "y": 327,
+ "w": 20,
+ "h": 18
}
},
{
- "filename": "wl_super_potion",
+ "filename": "wl_item_urge",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6786,14 +6765,14 @@
"h": 18
},
"frame": {
- "x": 259,
- "y": 397,
+ "x": 329,
+ "y": 345,
"w": 20,
"h": 18
}
},
{
- "filename": "light_ball",
+ "filename": "audinite",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6801,20 +6780,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 7,
- "y": 7,
- "w": 18,
- "h": 18
+ "x": 8,
+ "y": 8,
+ "w": 16,
+ "h": 16
},
"frame": {
- "x": 279,
- "y": 397,
- "w": 18,
- "h": 18
+ "x": 253,
+ "y": 354,
+ "w": 16,
+ "h": 16
}
},
{
- "filename": "light_stone",
+ "filename": "wl_max_elixir",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6822,20 +6801,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 7,
- "y": 7,
- "w": 18,
+ "x": 6,
+ "y": 8,
+ "w": 20,
"h": 18
},
"frame": {
- "x": 297,
- "y": 397,
- "w": 18,
+ "x": 269,
+ "y": 357,
+ "w": 20,
"h": 18
}
},
{
- "filename": "mystery_egg",
+ "filename": "wl_max_ether",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6843,20 +6822,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 8,
+ "x": 6,
"y": 8,
- "w": 16,
+ "w": 20,
"h": 18
},
"frame": {
- "x": 307,
- "y": 379,
- "w": 16,
+ "x": 289,
+ "y": 358,
+ "w": 20,
"h": 18
}
},
{
- "filename": "toxic_orb",
+ "filename": "wl_max_potion",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6864,20 +6843,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 7,
- "y": 7,
- "w": 18,
+ "x": 6,
+ "y": 8,
+ "w": 20,
"h": 18
},
"frame": {
- "x": 308,
- "y": 361,
- "w": 18,
+ "x": 309,
+ "y": 362,
+ "w": 20,
"h": 18
}
},
{
- "filename": "aggronite",
+ "filename": "wl_max_revive",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6885,20 +6864,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 8,
+ "x": 6,
"y": 8,
- "w": 16,
- "h": 16
+ "w": 20,
+ "h": 18
},
"frame": {
- "x": 315,
- "y": 397,
- "w": 16,
- "h": 16
+ "x": 329,
+ "y": 363,
+ "w": 20,
+ "h": 18
}
},
{
- "filename": "eviolite",
+ "filename": "toxic_orb",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6906,20 +6885,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 8,
- "y": 8,
- "w": 15,
- "h": 15
+ "x": 7,
+ "y": 7,
+ "w": 18,
+ "h": 18
},
"frame": {
- "x": 326,
- "y": 344,
- "w": 15,
- "h": 15
+ "x": 235,
+ "y": 358,
+ "w": 18,
+ "h": 18
}
},
{
- "filename": "prism_scale",
+ "filename": "banettite",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6927,20 +6906,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 9,
+ "x": 8,
"y": 8,
- "w": 15,
- "h": 15
+ "w": 16,
+ "h": 16
},
"frame": {
- "x": 311,
- "y": 344,
- "w": 15,
- "h": 15
+ "x": 253,
+ "y": 370,
+ "w": 16,
+ "h": 16
}
},
{
- "filename": "alakazite",
+ "filename": "wl_paralyze_heal",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6948,20 +6927,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 8,
+ "x": 6,
"y": 8,
- "w": 16,
- "h": 16
+ "w": 20,
+ "h": 18
},
"frame": {
- "x": 326,
- "y": 359,
- "w": 16,
- "h": 16
+ "x": 269,
+ "y": 375,
+ "w": 20,
+ "h": 18
}
},
{
- "filename": "relic_band",
+ "filename": "wl_potion",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6969,20 +6948,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 7,
- "y": 9,
- "w": 17,
- "h": 16
+ "x": 6,
+ "y": 8,
+ "w": 20,
+ "h": 18
},
"frame": {
- "x": 342,
- "y": 350,
- "w": 17,
- "h": 16
+ "x": 289,
+ "y": 376,
+ "w": 20,
+ "h": 18
}
},
{
- "filename": "altarianite",
+ "filename": "wl_reset_urge",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -6990,20 +6969,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 8,
+ "x": 6,
"y": 8,
- "w": 16,
- "h": 16
+ "w": 20,
+ "h": 18
},
"frame": {
- "x": 342,
- "y": 366,
- "w": 16,
- "h": 16
+ "x": 309,
+ "y": 380,
+ "w": 20,
+ "h": 18
}
},
{
- "filename": "ampharosite",
+ "filename": "wl_revive",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -7011,20 +6990,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 8,
+ "x": 6,
"y": 8,
- "w": 16,
- "h": 16
+ "w": 20,
+ "h": 18
},
"frame": {
- "x": 326,
- "y": 375,
- "w": 16,
- "h": 16
+ "x": 329,
+ "y": 381,
+ "w": 20,
+ "h": 18
}
},
{
- "filename": "audinite",
+ "filename": "wl_super_potion",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -7032,20 +7011,20 @@
"h": 32
},
"spriteSourceSize": {
- "x": 8,
+ "x": 6,
"y": 8,
- "w": 16,
- "h": 16
+ "w": 20,
+ "h": 18
},
"frame": {
- "x": 342,
- "y": 382,
- "w": 16,
- "h": 16
+ "x": 116,
+ "y": 357,
+ "w": 20,
+ "h": 18
}
},
{
- "filename": "banettite",
+ "filename": "relic_band",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -7053,15 +7032,15 @@
"h": 32
},
"spriteSourceSize": {
- "x": 8,
- "y": 8,
- "w": 16,
+ "x": 7,
+ "y": 9,
+ "w": 17,
"h": 16
},
"frame": {
- "x": 367,
- "y": 156,
- "w": 16,
+ "x": 115,
+ "y": 375,
+ "w": 17,
"h": 16
}
},
@@ -7080,8 +7059,8 @@
"h": 16
},
"frame": {
- "x": 364,
- "y": 172,
+ "x": 114,
+ "y": 391,
"w": 16,
"h": 16
}
@@ -7101,8 +7080,8 @@
"h": 16
},
"frame": {
- "x": 363,
- "y": 188,
+ "x": 130,
+ "y": 399,
"w": 16,
"h": 16
}
@@ -7122,8 +7101,8 @@
"h": 16
},
"frame": {
- "x": 363,
- "y": 204,
+ "x": 146,
+ "y": 399,
"w": 16,
"h": 16
}
@@ -7143,8 +7122,8 @@
"h": 16
},
"frame": {
- "x": 362,
- "y": 220,
+ "x": 162,
+ "y": 399,
"w": 16,
"h": 16
}
@@ -7164,14 +7143,14 @@
"h": 16
},
"frame": {
- "x": 362,
- "y": 236,
+ "x": 178,
+ "y": 399,
"w": 16,
"h": 16
}
},
{
- "filename": "candy_overlay",
+ "filename": "charizardite_y",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -7180,19 +7159,19 @@
},
"spriteSourceSize": {
"x": 8,
- "y": 12,
+ "y": 8,
"w": 16,
- "h": 15
+ "h": 16
},
"frame": {
- "x": 331,
- "y": 398,
+ "x": 194,
+ "y": 399,
"w": 16,
- "h": 15
+ "h": 16
}
},
{
- "filename": "charizardite_y",
+ "filename": "diancite",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -7206,14 +7185,14 @@
"h": 16
},
"frame": {
- "x": 347,
- "y": 398,
+ "x": 210,
+ "y": 399,
"w": 16,
"h": 16
}
},
{
- "filename": "diancite",
+ "filename": "galladite",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -7227,14 +7206,14 @@
"h": 16
},
"frame": {
- "x": 380,
- "y": 172,
+ "x": 226,
+ "y": 399,
"w": 16,
"h": 16
}
},
{
- "filename": "galladite",
+ "filename": "garchompite",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -7248,14 +7227,14 @@
"h": 16
},
"frame": {
- "x": 379,
- "y": 188,
+ "x": 242,
+ "y": 399,
"w": 16,
"h": 16
}
},
{
- "filename": "garchompite",
+ "filename": "gardevoirite",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -7269,14 +7248,14 @@
"h": 16
},
"frame": {
- "x": 379,
- "y": 204,
+ "x": 258,
+ "y": 399,
"w": 16,
"h": 16
}
},
{
- "filename": "gardevoirite",
+ "filename": "gengarite",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -7290,14 +7269,14 @@
"h": 16
},
"frame": {
- "x": 378,
- "y": 220,
+ "x": 274,
+ "y": 399,
"w": 16,
"h": 16
}
},
{
- "filename": "gengarite",
+ "filename": "glalitite",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -7311,14 +7290,14 @@
"h": 16
},
"frame": {
- "x": 378,
- "y": 236,
+ "x": 290,
+ "y": 399,
"w": 16,
"h": 16
}
},
{
- "filename": "glalitite",
+ "filename": "gyaradosite",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -7332,14 +7311,14 @@
"h": 16
},
"frame": {
- "x": 362,
- "y": 252,
+ "x": 306,
+ "y": 399,
"w": 16,
"h": 16
}
},
{
- "filename": "gyaradosite",
+ "filename": "heracronite",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -7353,14 +7332,14 @@
"h": 16
},
"frame": {
- "x": 378,
- "y": 252,
+ "x": 322,
+ "y": 399,
"w": 16,
"h": 16
}
},
{
- "filename": "heracronite",
+ "filename": "houndoominite",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -7374,14 +7353,14 @@
"h": 16
},
"frame": {
- "x": 361,
- "y": 268,
+ "x": 338,
+ "y": 399,
"w": 16,
"h": 16
}
},
{
- "filename": "houndoominite",
+ "filename": "kangaskhanite",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -7395,14 +7374,14 @@
"h": 16
},
"frame": {
- "x": 377,
- "y": 268,
+ "x": 132,
+ "y": 375,
"w": 16,
"h": 16
}
},
{
- "filename": "kangaskhanite",
+ "filename": "candy_overlay",
"rotated": false,
"trimmed": true,
"sourceSize": {
@@ -7411,15 +7390,15 @@
},
"spriteSourceSize": {
"x": 8,
- "y": 8,
+ "y": 12,
"w": 16,
- "h": 16
+ "h": 15
},
"frame": {
- "x": 358,
- "y": 284,
+ "x": 136,
+ "y": 360,
"w": 16,
- "h": 16
+ "h": 15
}
},
{
@@ -7437,8 +7416,8 @@
"h": 16
},
"frame": {
- "x": 358,
- "y": 300,
+ "x": 152,
+ "y": 360,
"w": 16,
"h": 16
}
@@ -7458,8 +7437,8 @@
"h": 16
},
"frame": {
- "x": 358,
- "y": 316,
+ "x": 148,
+ "y": 376,
"w": 16,
"h": 16
}
@@ -7479,8 +7458,8 @@
"h": 16
},
"frame": {
- "x": 374,
- "y": 284,
+ "x": 168,
+ "y": 361,
"w": 16,
"h": 16
}
@@ -7500,8 +7479,8 @@
"h": 16
},
"frame": {
- "x": 374,
- "y": 300,
+ "x": 184,
+ "y": 361,
"w": 16,
"h": 16
}
@@ -7521,8 +7500,8 @@
"h": 16
},
"frame": {
- "x": 374,
- "y": 316,
+ "x": 200,
+ "y": 361,
"w": 16,
"h": 16
}
@@ -7542,8 +7521,8 @@
"h": 16
},
"frame": {
- "x": 359,
- "y": 332,
+ "x": 216,
+ "y": 361,
"w": 16,
"h": 16
}
@@ -7563,8 +7542,8 @@
"h": 16
},
"frame": {
- "x": 359,
- "y": 348,
+ "x": 164,
+ "y": 377,
"w": 16,
"h": 16
}
@@ -7584,8 +7563,8 @@
"h": 16
},
"frame": {
- "x": 375,
- "y": 332,
+ "x": 180,
+ "y": 377,
"w": 16,
"h": 16
}
@@ -7605,8 +7584,8 @@
"h": 16
},
"frame": {
- "x": 375,
- "y": 348,
+ "x": 196,
+ "y": 377,
"w": 16,
"h": 16
}
@@ -7626,8 +7605,8 @@
"h": 16
},
"frame": {
- "x": 390,
- "y": 284,
+ "x": 212,
+ "y": 377,
"w": 16,
"h": 16
}
@@ -7647,8 +7626,8 @@
"h": 16
},
"frame": {
- "x": 390,
- "y": 300,
+ "x": 228,
+ "y": 377,
"w": 16,
"h": 16
}
@@ -7668,8 +7647,8 @@
"h": 16
},
"frame": {
- "x": 390,
- "y": 316,
+ "x": 349,
+ "y": 327,
"w": 16,
"h": 16
}
@@ -7689,8 +7668,8 @@
"h": 16
},
"frame": {
- "x": 391,
- "y": 332,
+ "x": 349,
+ "y": 343,
"w": 16,
"h": 16
}
@@ -7710,8 +7689,8 @@
"h": 16
},
"frame": {
- "x": 391,
- "y": 348,
+ "x": 349,
+ "y": 359,
"w": 16,
"h": 16
}
@@ -7731,8 +7710,8 @@
"h": 16
},
"frame": {
- "x": 393,
- "y": 268,
+ "x": 349,
+ "y": 375,
"w": 16,
"h": 16
}
@@ -7752,8 +7731,8 @@
"h": 16
},
"frame": {
- "x": 359,
- "y": 364,
+ "x": 354,
+ "y": 391,
"w": 16,
"h": 16
}
@@ -7773,8 +7752,8 @@
"h": 16
},
"frame": {
- "x": 375,
- "y": 364,
+ "x": 365,
+ "y": 330,
"w": 16,
"h": 16
}
@@ -7794,8 +7773,8 @@
"h": 16
},
"frame": {
- "x": 391,
- "y": 364,
+ "x": 381,
+ "y": 330,
"w": 16,
"h": 16
}
@@ -7815,8 +7794,8 @@
"h": 16
},
"frame": {
- "x": 358,
- "y": 380,
+ "x": 365,
+ "y": 346,
"w": 16,
"h": 16
}
@@ -7836,8 +7815,8 @@
"h": 16
},
"frame": {
- "x": 374,
- "y": 380,
+ "x": 365,
+ "y": 362,
"w": 16,
"h": 16
}
@@ -7857,8 +7836,8 @@
"h": 16
},
"frame": {
- "x": 390,
- "y": 380,
+ "x": 381,
+ "y": 346,
"w": 16,
"h": 16
}
@@ -7878,8 +7857,8 @@
"h": 16
},
"frame": {
- "x": 363,
- "y": 396,
+ "x": 381,
+ "y": 362,
"w": 16,
"h": 16
}
@@ -7899,8 +7878,8 @@
"h": 16
},
"frame": {
- "x": 379,
- "y": 396,
+ "x": 397,
+ "y": 342,
"w": 16,
"h": 16
}
@@ -7920,8 +7899,8 @@
"h": 16
},
"frame": {
- "x": 395,
- "y": 396,
+ "x": 397,
+ "y": 358,
"w": 16,
"h": 16
}
@@ -7941,8 +7920,8 @@
"h": 16
},
"frame": {
- "x": 396,
- "y": 158,
+ "x": 397,
+ "y": 374,
"w": 16,
"h": 16
}
@@ -7962,8 +7941,8 @@
"h": 16
},
"frame": {
- "x": 396,
- "y": 174,
+ "x": 370,
+ "y": 378,
"w": 16,
"h": 16
}
@@ -7974,6 +7953,6 @@
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
- "smartupdate": "$TexturePacker:SmartUpdate:8d494b572ffc237a0b6482a3c2b0958e:bce8aa90c95f0da5ffad5b6de5eaf4ed:110e074689c9edd2c54833ce2e4d9270$"
+ "smartupdate": "$TexturePacker:SmartUpdate:60db8f4653a650759cd9189e91c38a40:439307cbef9c000f6c45603b2d82d107:110e074689c9edd2c54833ce2e4d9270$"
}
}
diff --git a/public/images/items.png b/public/images/items.png
index e6ee07d6b107..6d9434d04541 100644
Binary files a/public/images/items.png and b/public/images/items.png differ
diff --git a/public/images/items/white_herb.png b/public/images/items/white_herb.png
deleted file mode 100644
index 25cfc6521091..000000000000
Binary files a/public/images/items/white_herb.png and /dev/null differ
diff --git a/public/images/mystery-encounters/chest_blue.json b/public/images/mystery-encounters/chest_blue.json
deleted file mode 100644
index 88aadda845ad..000000000000
--- a/public/images/mystery-encounters/chest_blue.json
+++ /dev/null
@@ -1,188 +0,0 @@
-{
- "textures": [
- {
- "image": "chest_blue.png",
- "format": "RGBA8888",
- "size": {
- "w": 300,
- "h": 75
- },
- "scale": 1,
- "frames": [
- {
- "filename": "0001.png",
- "rotated": false,
- "trimmed": false,
- "sourceSize": {
- "w": 75,
- "h": 75
- },
- "spriteSourceSize": {
- "x": 0,
- "y": 0,
- "w": 75,
- "h": 75
- },
- "frame": {
- "x": -15,
- "y": 0,
- "w": 75,
- "h": 75
- }
- },
- {
- "filename": "0002.png",
- "rotated": false,
- "trimmed": false,
- "sourceSize": {
- "w": 75,
- "h": 75
- },
- "spriteSourceSize": {
- "x": 0,
- "y": 0,
- "w": 75,
- "h": 75
- },
- "frame": {
- "x": -15,
- "y": 0,
- "w": 75,
- "h": 75
- }
- },
- {
- "filename": "0003.png",
- "rotated": false,
- "trimmed": false,
- "sourceSize": {
- "w": 75,
- "h": 75
- },
- "spriteSourceSize": {
- "x": 0,
- "y": 0,
- "w": 75,
- "h": 75
- },
- "frame": {
- "x": 57,
- "y": 0,
- "w": 75,
- "h": 75
- }
- },
- {
- "filename": "0004.png",
- "rotated": false,
- "trimmed": false,
- "sourceSize": {
- "w": 75,
- "h": 75
- },
- "spriteSourceSize": {
- "x": 0,
- "y": 0,
- "w": 75,
- "h": 75
- },
- "frame": {
- "x": 57,
- "y": 0,
- "w": 75,
- "h": 75
- }
- },
- {
- "filename": "0005.png",
- "rotated": false,
- "trimmed": false,
- "sourceSize": {
- "w": 75,
- "h": 75
- },
- "spriteSourceSize": {
- "x": 0,
- "y": 0,
- "w": 75,
- "h": 75
- },
- "frame": {
- "x": 129,
- "y": 0,
- "w": 75,
- "h": 75
- }
- },
- {
- "filename": "0006.png",
- "rotated": false,
- "trimmed": false,
- "sourceSize": {
- "w": 75,
- "h": 75
- },
- "spriteSourceSize": {
- "x": 0,
- "y": 0,
- "w": 75,
- "h": 75
- },
- "frame": {
- "x": 129,
- "y": 0,
- "w": 75,
- "h": 75
- }
- },
- {
- "filename": "0007.png",
- "rotated": false,
- "trimmed": false,
- "sourceSize": {
- "w": 75,
- "h": 75
- },
- "spriteSourceSize": {
- "x": 0,
- "y": 0,
- "w": 75,
- "h": 75
- },
- "frame": {
- "x": 201,
- "y": 0,
- "w": 75,
- "h": 75
- }
- },
- {
- "filename": "0008.png",
- "rotated": false,
- "trimmed": false,
- "sourceSize": {
- "w": 75,
- "h": 75
- },
- "spriteSourceSize": {
- "x": 0,
- "y": 0,
- "w": 75,
- "h": 75
- },
- "frame": {
- "x": 201,
- "y": 0,
- "w": 75,
- "h": 75
- }
- }
- ]
- }
- ],
- "meta": {
- "app": "https://www.codeandweb.com/texturepacker",
- "version": "3.0",
- "smartupdate": "$TexturePacker:SmartUpdate:895f0a79b89fa0fb44167f4584fd9a22:357b46953b7e17c6b2f43a62d52855d8:cc1ed0e4f90aaa9dcf1b39a0af1283b0$"
- }
-}
diff --git a/public/images/mystery-encounters/chest_blue.png b/public/images/mystery-encounters/chest_blue.png
deleted file mode 100644
index 0097346e845a..000000000000
Binary files a/public/images/mystery-encounters/chest_blue.png and /dev/null differ
diff --git a/public/images/mystery-encounters/chest_red.json b/public/images/mystery-encounters/chest_red.json
deleted file mode 100644
index d808652a1621..000000000000
--- a/public/images/mystery-encounters/chest_red.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
- "textures": [
- {
- "image": "chest_red.png",
- "format": "RGBA8888",
- "size": {
- "w": 76,
- "h": 57
- },
- "scale": 1,
- "frames": [
- {
- "filename": "0001.png",
- "rotated": false,
- "trimmed": false,
- "sourceSize": {
- "w": 76,
- "h": 57
- },
- "spriteSourceSize": {
- "x": 10,
- "y": 3,
- "w": 56,
- "h": 54
- },
- "frame": {
- "x": 8,
- "y": 0,
- "w": 56,
- "h": 54
- }
- }
- ]
- }
- ],
- "meta": {
- "app": "https://www.codeandweb.com/texturepacker",
- "version": "3.0",
- "smartupdate": "$TexturePacker:SmartUpdate:895f0a79b89fa0fb44167f4584fd9a22:357b46953b7e17c6b2f43a62d52855d8:cc1ed0e4f90aaa9dcf1b39a0af1283b0$"
- }
-}
diff --git a/public/images/mystery-encounters/chest_red.png b/public/images/mystery-encounters/chest_red.png
deleted file mode 100644
index e9ccfa2cfc6a..000000000000
Binary files a/public/images/mystery-encounters/chest_red.png and /dev/null differ
diff --git a/public/images/mystery-encounters/dark_deal_porygon.json b/public/images/mystery-encounters/dark_deal_porygon.json
deleted file mode 100644
index 5a48d95c18d4..000000000000
--- a/public/images/mystery-encounters/dark_deal_porygon.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
- "textures": [
- {
- "image": "dark_deal_porygon.png",
- "format": "RGBA8888",
- "size": {
- "w": 36,
- "h": 45
- },
- "scale": 1,
- "frames": [
- {
- "filename": "0001.png",
- "rotated": false,
- "trimmed": false,
- "sourceSize": {
- "w": 36,
- "h": 45
- },
- "spriteSourceSize": {
- "x": 0,
- "y": 0,
- "w": 44,
- "h": 44
- },
- "frame": {
- "x": 0,
- "y": 0,
- "w": 36,
- "h": 45
- }
- }
- ]
- }
- ],
- "meta": {
- "app": "https://www.codeandweb.com/texturepacker",
- "version": "3.0",
- "smartupdate": "$TexturePacker:SmartUpdate:895f0a79b89fa0fb44167f4584fd9a22:357b46953b7e17c6b2f43a62d52855d8:cc1ed0e4f90aaa9dcf1b39a0af1283b0$"
- }
-}
diff --git a/public/images/mystery-encounters/dark_deal_porygon.png b/public/images/mystery-encounters/dark_deal_porygon.png
deleted file mode 100644
index 168999fb0f46..000000000000
Binary files a/public/images/mystery-encounters/dark_deal_porygon.png and /dev/null differ
diff --git a/public/images/mystery-encounters/mad_scientist_m.json b/public/images/mystery-encounters/mad_scientist_m.json
deleted file mode 100644
index 0cb3f904cb0b..000000000000
--- a/public/images/mystery-encounters/mad_scientist_m.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
- "textures": [
- {
- "image": "mad_scientist_m.png",
- "format": "RGBA8888",
- "size": {
- "w": 44,
- "h": 74
- },
- "scale": 1,
- "frames": [
- {
- "filename": "0001.png",
- "rotated": false,
- "trimmed": false,
- "sourceSize": {
- "w": 44,
- "h": 74
- },
- "spriteSourceSize": {
- "x": 0,
- "y": 0,
- "w": 44,
- "h": 74
- },
- "frame": {
- "x": 0,
- "y": 0,
- "w": 44,
- "h": 74
- }
- }
- ]
- }
- ],
- "meta": {
- "app": "https://www.codeandweb.com/texturepacker",
- "version": "3.0",
- "smartupdate": "$TexturePacker:SmartUpdate:895f0a79b89fa0fb44167f4584fd9a22:357b46953b7e17c6b2f43a62d52855d8:cc1ed0e4f90aaa9dcf1b39a0af1283b0$"
- }
-}
diff --git a/public/images/mystery-encounters/mad_scientist_m.png b/public/images/mystery-encounters/mad_scientist_m.png
deleted file mode 100644
index 84349b46c8a9..000000000000
Binary files a/public/images/mystery-encounters/mad_scientist_m.png and /dev/null differ
diff --git a/public/images/mystery-encounters/training_gear.json b/public/images/mystery-encounters/training_gear.json
deleted file mode 100644
index fb8f4ec9c8ea..000000000000
--- a/public/images/mystery-encounters/training_gear.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
- "textures": [
- {
- "image": "training_gear.png",
- "format": "RGBA8888",
- "size": {
- "w": 76,
- "h": 57
- },
- "scale": 1,
- "frames": [
- {
- "filename": "0001.png",
- "rotated": false,
- "trimmed": false,
- "sourceSize": {
- "w": 76,
- "h": 57
- },
- "spriteSourceSize": {
- "x": 10,
- "y": 3,
- "w": 56,
- "h": 54
- },
- "frame": {
- "x": 8,
- "y": 0,
- "w": 56,
- "h": 54
- }
- }
- ]
- }
- ],
- "meta": {
- "app": "https://www.codeandweb.com/texturepacker",
- "version": "3.0",
- "smartupdate": "$TexturePacker:SmartUpdate:895f0a79b89fa0fb44167f4584fd9a22:357b46953b7e17c6b2f43a62d52855d8:cc1ed0e4f90aaa9dcf1b39a0af1283b0$"
- }
-}
diff --git a/public/images/mystery-encounters/training_gear.png b/public/images/mystery-encounters/training_gear.png
deleted file mode 100644
index 42c3a9bb7d4e..000000000000
Binary files a/public/images/mystery-encounters/training_gear.png and /dev/null differ
diff --git a/public/images/ui/legacy/pbinfo_stat.json b/public/images/ui/legacy/pbinfo_stat.json
index a956f81150d4..b7da47fc1921 100644
--- a/public/images/ui/legacy/pbinfo_stat.json
+++ b/public/images/ui/legacy/pbinfo_stat.json
@@ -176,27 +176,6 @@
"w": 12,
"h": 6
}
- },
- {
- "filename": "HP",
- "rotated": false,
- "trimmed": true,
- "sourceSize": {
- "w": 9,
- "h": 8
- },
- "spriteSourceSize": {
- "x": 1,
- "y": 2,
- "w": 8,
- "h": 6
- },
- "frame": {
- "x": 112,
- "y": 0,
- "w": 8,
- "h": 6
- }
}
]
}
diff --git a/public/images/ui/legacy/pbinfo_stat.png b/public/images/ui/legacy/pbinfo_stat.png
index 18b0ca314dec..62ec3758772d 100644
Binary files a/public/images/ui/legacy/pbinfo_stat.png and b/public/images/ui/legacy/pbinfo_stat.png differ
diff --git a/public/images/ui/legacy/pbinfo_stat_numbers.json b/public/images/ui/legacy/pbinfo_stat_numbers.json
index c106d1cf41eb..fa7d757990ff 100644
--- a/public/images/ui/legacy/pbinfo_stat_numbers.json
+++ b/public/images/ui/legacy/pbinfo_stat_numbers.json
@@ -281,27 +281,6 @@
"w": 9,
"h": 8
}
- },
- {
- "filename": "empty",
- "rotated": false,
- "trimmed": false,
- "sourceSize": {
- "w": 1,
- "h": 8
- },
- "spriteSourceSize": {
- "x": 0,
- "y": 0,
- "w": 1,
- "h": 8
- },
- "frame": {
- "x": 117,
- "y": 0,
- "w": 1,
- "h": 8
- }
}
]
}
diff --git a/public/images/ui/legacy/pbinfo_stat_numbers.png b/public/images/ui/legacy/pbinfo_stat_numbers.png
index b02dfbec72f6..ee1453b21070 100644
Binary files a/public/images/ui/legacy/pbinfo_stat_numbers.png and b/public/images/ui/legacy/pbinfo_stat_numbers.png differ
diff --git a/public/images/ui/pbinfo_stat.json b/public/images/ui/pbinfo_stat.json
index 4ec46c467b13..f431e5afafd6 100644
--- a/public/images/ui/pbinfo_stat.json
+++ b/public/images/ui/pbinfo_stat.json
@@ -176,27 +176,6 @@
"w": 13,
"h": 7
}
- },
- {
- "filename": "HP",
- "rotated": false,
- "trimmed": true,
- "sourceSize": {
- "w": 9,
- "h": 8
- },
- "spriteSourceSize": {
- "x": 0,
- "y": 1,
- "w": 9,
- "h": 7
- },
- "frame": {
- "x": 120,
- "y": 0,
- "w": 9,
- "h": 7
- }
}
]
}
diff --git a/public/images/ui/pbinfo_stat.png b/public/images/ui/pbinfo_stat.png
index 1c20ed70e821..46169091e7cd 100644
Binary files a/public/images/ui/pbinfo_stat.png and b/public/images/ui/pbinfo_stat.png differ
diff --git a/public/images/ui/pbinfo_stat_numbers.json b/public/images/ui/pbinfo_stat_numbers.json
index ccd49bbbb79b..ec4f7117bb72 100644
--- a/public/images/ui/pbinfo_stat_numbers.json
+++ b/public/images/ui/pbinfo_stat_numbers.json
@@ -281,27 +281,6 @@
"w": 9,
"h": 8
}
- },
- {
- "filename": "empty",
- "rotated": false,
- "trimmed": false,
- "sourceSize": {
- "w": 1,
- "h": 8
- },
- "spriteSourceSize": {
- "x": 0,
- "y": 0,
- "w": 1,
- "h": 8
- },
- "frame": {
- "x": 117,
- "y": 0,
- "w": 1,
- "h": 8
- }
}
]
}
diff --git a/public/images/ui/pbinfo_stat_numbers.png b/public/images/ui/pbinfo_stat_numbers.png
index 1465f8b7a649..c778ba992734 100644
Binary files a/public/images/ui/pbinfo_stat_numbers.png and b/public/images/ui/pbinfo_stat_numbers.png differ
diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index a3f74eafc8b2..ba0720baab23 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -3,25 +3,9 @@ import UI from "./ui/ui";
import { NextEncounterPhase, NewBiomeEncounterPhase, SelectBiomePhase, MessagePhase, TurnInitPhase, ReturnPhase, LevelCapPhase, ShowTrainerPhase, LoginPhase, MovePhase, TitlePhase, SwitchPhase } from "./phases";
import Pokemon, { PlayerPokemon, EnemyPokemon } from "./field/pokemon";
import PokemonSpecies, { PokemonSpeciesFilter, allSpecies, getPokemonSpecies } from "./data/pokemon-species";
-import {Constructor, isNullOrUndefined} from "#app/utils";
+import { Constructor } from "#app/utils";
import * as Utils from "./utils";
-import {
- Modifier,
- ModifierBar,
- ConsumablePokemonModifier,
- ConsumableModifier,
- PokemonHpRestoreModifier,
- HealingBoosterModifier,
- PersistentModifier,
- PokemonHeldItemModifier,
- ModifierPredicate,
- DoubleBattleChanceBoosterModifier,
- FusePokemonModifier,
- PokemonFormChangeItemModifier,
- TerastallizeModifier,
- overrideModifiers,
- overrideHeldItems
-} from "./modifier/modifier";
+import { Modifier, ModifierBar, ConsumablePokemonModifier, ConsumableModifier, PokemonHpRestoreModifier, HealingBoosterModifier, PersistentModifier, PokemonHeldItemModifier, ModifierPredicate, DoubleBattleChanceBoosterModifier, FusePokemonModifier, PokemonFormChangeItemModifier, TerastallizeModifier, overrideModifiers, overrideHeldItems } from "./modifier/modifier";
import { PokeballType } from "./data/pokeball";
import { initCommonAnims, initMoveAnim, loadCommonAnimAssets, loadMoveAnimAssets, populateAnims } from "./data/battle-anims";
import { Phase } from "./phase";
@@ -30,16 +14,7 @@ import { Arena, ArenaBase } from "./field/arena";
import { GameData } from "./system/game-data";
import { TextStyle, addTextObject, getTextColor } from "./ui/text";
import { allMoves } from "./data/move";
-import {
- ModifierPoolType,
- getDefaultModifierTypeForTier,
- getEnemyModifierTypesForWave,
- getLuckString,
- getLuckTextTint,
- getModifierPoolForType,
- getPartyLuckValue,
- PokemonHeldItemModifierType
-} from "./modifier/modifier-type";
+import { ModifierPoolType, getDefaultModifierTypeForTier, getEnemyModifierTypesForWave, getLuckString, getLuckTextTint, getModifierPoolForType, getPartyLuckValue } from "./modifier/modifier-type";
import AbilityBar from "./ui/ability-bar";
import { BlockItemTheftAbAttr, DoubleBattleChanceAbAttr, IncrementMovePriorityAbAttr, PostBattleInitAbAttr, applyAbAttrs, applyPostBattleInitAbAttrs } from "./data/ability";
import { allAbilities } from "./data/ability";
@@ -92,15 +67,6 @@ import { Species } from "#enums/species";
import { UiTheme } from "#enums/ui-theme";
import { TimedEventManager } from "#app/timed-event-manager.js";
import i18next from "i18next";
-import MysteryEncounter, { MysteryEncounterTier, MysteryEncounterVariant } from "./data/mystery-encounter";
-import {
- mysteryEncountersByBiome,
- allMysteryEncounters,
- BASE_MYSTERY_ENCOUNTER_WEIGHT,
- AVERAGE_ENCOUNTERS_PER_RUN_TARGET
-} from "./data/mystery-encounters/mystery-encounters";
-import {MysteryEncounterFlags} from "#app/data/mystery-encounter-flags";
-import { MysteryEncounterType } from "#enums/mystery-encounter-type";
export const bypassLogin = import.meta.env.VITE_BYPASS_LOGIN === "1";
@@ -153,7 +119,6 @@ export default class BattleScene extends SceneBase {
public enableTutorials: boolean = import.meta.env.VITE_BYPASS_TUTORIAL === "1";
public enableMoveInfo: boolean = true;
public enableRetries: boolean = false;
- public hideIvs: boolean = false;
/**
* Determines the condition for a notification should be shown for Candy Upgrades
* - 0 = 'Off'
@@ -214,21 +179,11 @@ export default class BattleScene extends SceneBase {
public gameData: GameData;
public sessionSlotId: integer;
- /**
- * queues are moved around during the function shiftPhase() below
- * can debug phases using "phase.constructor.name"
- */
-
- /** PhaseQueue: dequeue/remove the first element to get the next phase */
public phaseQueue: Phase[];
public conditionalQueue: Array<[() => boolean, Phase]>;
- /** PhaseQueuePrepend: is a temp storage of what will be added to PhaseQueue */
private phaseQueuePrepend: Phase[];
-
- /** overrides default of inserting phases to end of phaseQueuePrepend array, useful or inserting Phases "out of order" */
private phaseQueuePrependSpliceIndex: integer;
private nextCommandPhaseQueue: Phase[];
-
private currentPhase: Phase;
private standbyPhase: Phase;
public field: Phaser.GameObjects.Container;
@@ -268,9 +223,6 @@ export default class BattleScene extends SceneBase {
private fieldOverlay: Phaser.GameObjects.Rectangle;
private shopOverlay: Phaser.GameObjects.Rectangle;
- private shopOverlayShown: boolean = false;
- private shopOverlayOpacity: number = .80;
-
public modifiers: PersistentModifier[];
private enemyModifiers: PersistentModifier[];
public uiContainer: Phaser.GameObjects.Container;
@@ -301,9 +253,6 @@ export default class BattleScene extends SceneBase {
public eventManager: TimedEventManager;
- public mysteryEncounterFlags: MysteryEncounterFlags = new MysteryEncounterFlags(null);
- public lastMysteryEncounter: MysteryEncounter;
-
/**
* Allows subscribers to listen for events
*
@@ -867,20 +816,6 @@ export default class BattleScene extends SceneBase {
return pokemon;
}
- removePokemonFromPlayerParty(pokemon: PlayerPokemon, destroy: boolean = true) {
- if (!pokemon) {
- return;
- }
-
- const partyIndex = this.party.indexOf(pokemon);
- this.party.splice(partyIndex, 1);
- if (destroy) {
- this.field.remove(pokemon, true);
- pokemon.destroy();
- }
- this.updateModifiers(true);
- }
-
addPokemonIcon(pokemon: Pokemon, x: number, y: number, originX: number = 0.5, originY: number = 0.5, ignoreOverride: boolean = false): Phaser.GameObjects.Container {
const container = this.add.container(x, y);
container.setName(`${pokemon.name}-icon`);
@@ -1071,7 +1006,7 @@ export default class BattleScene extends SceneBase {
}
}
- newBattle(waveIndex?: integer, battleType?: BattleType, trainerData?: TrainerData, double?: boolean, mysteryEncounter?: MysteryEncounter): Battle {
+ newBattle(waveIndex?: integer, battleType?: BattleType, trainerData?: TrainerData, double?: boolean): Battle {
const _startingWave = Overrides.STARTING_WAVE_OVERRIDE || startingWave;
const newWaveIndex = waveIndex || ((this.currentBattle?.waveIndex || (_startingWave - 1)) + 1);
let newDouble: boolean;
@@ -1115,37 +1050,6 @@ export default class BattleScene extends SceneBase {
newTrainer = trainerData !== undefined ? trainerData.toTrainer(this) : new Trainer(this, trainerType, doubleTrainer ? TrainerVariant.DOUBLE : Utils.randSeedInt(2) ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT);
this.field.add(newTrainer);
}
-
- // Check for mystery encounter
- // Can only occur in place of a standard wild battle, waves 10-180
- // let testStartingWeight = 10;
- // while (testStartingWeight < 30) {
- // calculateMEAggregateStats(this, testStartingWeight);
- // testStartingWeight += 2;
- // }
- if (this.gameMode.hasMysteryEncounters && newBattleType === BattleType.WILD && !this.gameMode.isBoss(newWaveIndex) && newWaveIndex < 180 && newWaveIndex > 10) {
- const roll = Utils.randSeedInt(256);
-
- // Base spawn weight is 3/256, and increases by 1/256 for each missed attempt at spawning an encounter on a valid floor
- const sessionEncounterRate = !isNullOrUndefined(this.mysteryEncounterFlags?.encounterSpawnChance) ? this.mysteryEncounterFlags.encounterSpawnChance : BASE_MYSTERY_ENCOUNTER_WEIGHT;
-
- // If total number of encounters is lower than expected for the run, slightly favor a new encounter spawn
- // Do the reverse as well
- // Reduces occurrence of runs with very few (<6) and a ton (>10) of encounters
- const expectedEncountersByFloor = AVERAGE_ENCOUNTERS_PER_RUN_TARGET / (180 - 10) * newWaveIndex;
- const currentRunDiffFromAvg = expectedEncountersByFloor - (this.mysteryEncounterFlags?.encounteredEvents?.length || 0);
- const favoredEncounterRate = sessionEncounterRate + currentRunDiffFromAvg * 5;
-
- const successRate = isNullOrUndefined(Overrides.MYSTERY_ENCOUNTER_RATE_OVERRIDE) ? favoredEncounterRate : Overrides.MYSTERY_ENCOUNTER_RATE_OVERRIDE;
-
- if (roll < successRate) {
- newBattleType = BattleType.MYSTERY_ENCOUNTER;
- // Reset base spawn weight
- this.mysteryEncounterFlags.encounterSpawnChance = BASE_MYSTERY_ENCOUNTER_WEIGHT;
- } else {
- this.mysteryEncounterFlags.encounterSpawnChance = sessionEncounterRate + 1;
- }
- }
}
if (double === undefined && newWaveIndex > 1) {
@@ -1178,19 +1082,12 @@ export default class BattleScene extends SceneBase {
const maxExpLevel = this.getMaxExpLevel();
this.lastEnemyTrainer = lastBattle?.trainer ?? null;
- this.lastMysteryEncounter = lastBattle?.mysteryEncounter ?? null;
this.executeWithSeedOffset(() => {
this.currentBattle = new Battle(this.gameMode, newWaveIndex, newBattleType, newTrainer, newDouble);
}, newWaveIndex << 3, this.waveSeed);
this.currentBattle.incrementTurn(this);
- if (newBattleType === BattleType.MYSTERY_ENCOUNTER) {
- // Disable double battle on mystery encounters (it may be re-enabled as part of encounter)
- this.currentBattle.double = false;
- this.currentBattle.mysteryEncounter = this.getMysteryEncounter(mysteryEncounter);
- }
-
//this.pushPhase(new TrainerMessageTestPhase(this, TrainerType.RIVAL, TrainerType.RIVAL_2, TrainerType.RIVAL_3, TrainerType.RIVAL_4, TrainerType.RIVAL_5, TrainerType.RIVAL_6));
if (!waveIndex && lastBattle) {
@@ -1215,9 +1112,7 @@ export default class BattleScene extends SceneBase {
isNewBiome = !Utils.randSeedInt(6 - biomeWaves);
}, lastBattle.waveIndex << 4);
}
-
-
- const resetArenaState = isNewBiome || this.currentBattle.battleType === BattleType.TRAINER || this.currentBattle.battleType === BattleType.MYSTERY_ENCOUNTER || this.currentBattle.battleSpec === BattleSpec.FINAL_BOSS;
+ const resetArenaState = isNewBiome || this.currentBattle.battleType === BattleType.TRAINER || this.currentBattle.battleSpec === BattleSpec.FINAL_BOSS;
this.getEnemyParty().forEach(enemyPokemon => enemyPokemon.destroy());
this.trySpreadPokerus();
if (!isNewBiome && (newWaveIndex % 10) === 5) {
@@ -1225,24 +1120,17 @@ export default class BattleScene extends SceneBase {
}
if (resetArenaState) {
this.arena.removeAllTags();
- // If last battle was mystery encounter and no battle occurred, skip return phases
- if (lastBattle?.mysteryEncounter?.encounterVariant !== MysteryEncounterVariant.NO_BATTLE) {
- playerField.forEach((_, p) => this.unshiftPhase(new ReturnPhase(this, p)));
- for (const pokemon of this.getParty()) {
- // Only trigger form change when Eiscue is in Noice form
- // Hardcoded Eiscue for now in case it is fused with another pokemon
- if (pokemon.species.speciesId === Species.EISCUE && pokemon.hasAbility(Abilities.ICE_FACE) && pokemon.formIndex === 1) {
- this.triggerPokemonFormChange(pokemon, SpeciesFormChangeManualTrigger);
- }
- // Only trigger form change when Mimikyu is in Busted form
- // Hardcoded Mimikyu for now in case it is fused with another pokemon
- if (pokemon.species.speciesId === Species.MIMIKYU && pokemon.hasAbility(Abilities.DISGUISE) && pokemon.formIndex === 1) {
- this.triggerPokemonFormChange(pokemon, SpeciesFormChangeManualTrigger);
- }
+ playerField.forEach((_, p) => this.unshiftPhase(new ReturnPhase(this, p)));
- pokemon.resetBattleData();
- applyPostBattleInitAbAttrs(PostBattleInitAbAttr, pokemon);
+ for (const pokemon of this.getParty()) {
+ // Only trigger form change when Eiscue is in Noice form
+ // Hardcoded Eiscue for now in case it is fused with another pokemon
+ if (pokemon.species.speciesId === Species.EISCUE && pokemon.hasAbility(Abilities.ICE_FACE) && pokemon.formIndex === 1) {
+ this.triggerPokemonFormChange(pokemon, SpeciesFormChangeManualTrigger);
}
+
+ pokemon.resetBattleData();
+ applyPostBattleInitAbAttrs(PostBattleInitAbAttr, pokemon);
}
this.unshiftPhase(new ShowTrainerPhase(this));
@@ -1534,29 +1422,19 @@ export default class BattleScene extends SceneBase {
});
}
- updateShopOverlayOpacity(value: number): void {
- this.shopOverlayOpacity = value;
-
- if (this.shopOverlayShown) {
- this.shopOverlay.setAlpha(this.shopOverlayOpacity);
- }
- }
-
showShopOverlay(duration: integer): Promise {
- this.shopOverlayShown = true;
return new Promise(resolve => {
this.tweens.add({
targets: this.shopOverlay,
- alpha: this.shopOverlayOpacity,
+ alpha: 0.8,
ease: "Sine.easeOut",
- duration,
+ duration: duration,
onComplete: () => resolve()
});
});
}
hideShopOverlay(duration: integer): Promise {
- this.shopOverlayShown = false;
return new Promise(resolve => {
this.tweens.add({
targets: this.shopOverlay,
@@ -2064,12 +1942,6 @@ export default class BattleScene extends SceneBase {
return this.standbyPhase;
}
- /**
- * PhaseQueuePrepend: is a temp storage of what will be added to PhaseQueue
- * PhaseQueue: dequeue/remove the first element to get the next phase
- * queues are moved around during shiftPhase() below
- */
-
/**
* Adds a phase to the conditional queue and ensures it is executed only when the specified condition is met.
*
@@ -2084,64 +1956,31 @@ export default class BattleScene extends SceneBase {
this.conditionalQueue.push([condition, phase]);
}
- /**
- * Adds a phase to nextCommandPhaseQueue, as long as boolean passed in is false
- * @param phase {@linkcode Phase} the phase to add
- * @param defer boolean on which queue to add to, defaults to false, and adds to phaseQueue
- */
+
pushPhase(phase: Phase, defer: boolean = false): void {
(!defer ? this.phaseQueue : this.nextCommandPhaseQueue).push(phase);
}
- /**
- * Adds Phase to the end of phaseQueuePrepend, or at phaseQueuePrependSpliceIndex
- * @param phase {@linkcode Phase} the phase to add
- */
unshiftPhase(phase: Phase): void {
if (this.phaseQueuePrependSpliceIndex === -1) {
- // .push() adds to end of array
this.phaseQueuePrepend.push(phase);
} else {
- // .splice(index, num elements to remove, what to add)
- // modifies array by inserting at index, removing num of elements after index
this.phaseQueuePrepend.splice(this.phaseQueuePrependSpliceIndex, 0, phase);
}
- /**
- * debugging queues via printing, may be helpful in the future
- console.log(`State of the phaseQueuePrepend (will be moved over to phaseQeueu)`)
- this.phaseQueuePrepend.forEach(p => console.log(p.constructor.name));
-
- console.log(`State of the phaseQueue, what is going to be called next `)
- this.phaseQueue.forEach(p => console.log(p.constructor.name));
- */
}
- /**
- * Clears phaseQueue
- */
clearPhaseQueue(): void {
this.phaseQueue.splice(0, this.phaseQueue.length);
}
- /**
- * combo with unshiftPhase(), want to start inserting at current length instead of the "end", useful if phaseQueuePrepend gets longer with Phases
- */
setPhaseQueueSplice(): void {
this.phaseQueuePrependSpliceIndex = this.phaseQueuePrepend.length;
}
- /**
- * Resets phaseQueuePrependSpliceIndex to -1, implies that calls to unshiftPhase will insert at end of phaseQueuePrepend
- */
clearPhaseQueueSplice(): void {
this.phaseQueuePrependSpliceIndex = -1;
}
- /**
- * is called by each Phase implementations "end()" by default
- * dumps everything from phaseQueuePrepend to the start of of phaseQueue
- * then removes first Phase and starts it
- */
shiftPhase(): void {
if (this.standbyPhase) {
this.currentPhase = this.standbyPhase;
@@ -2149,21 +1988,14 @@ export default class BattleScene extends SceneBase {
return;
}
- // shifting phase (with no standby phase) will move everything from prepend to actual PhaseQueue?
- // resets the index, if it was changed via setPhaseQueueSplice()
if (this.phaseQueuePrependSpliceIndex > -1) {
this.clearPhaseQueueSplice();
}
if (this.phaseQueuePrepend.length) {
while (this.phaseQueuePrepend.length) {
- // appends phaseQueuePrepend to phaseQueue
- // eg: phaseQueue = [4,5,6], phaseQUeuePrepend = [1,2,3]
- // -> [1,2,3,4,5,6]
this.phaseQueue.unshift(this.phaseQueuePrepend.pop());
}
}
- // then starts from PhaseQueue, .shift() removes first elm of array
- // populatePhaseQueue() adds a turnInit Phase at the end of phaseQueue (if the queue is emtpy)
if (!this.phaseQueue.length) {
this.populatePhaseQueue();
// clear the conditionalQueue if there are no phases left in the phaseQueue
@@ -2233,28 +2065,15 @@ export default class BattleScene extends SceneBase {
}
}
- /**
- * Adds a MessagePhase, either to PhaseQueuePrepend or nextCommandPhaseQueue
- * @param message string for MessagePhase
- * @param callbackDelay optional param for MessagePhase constructor
- * @param prompt optional param for MessagePhase constructor
- * @param promptDelay optional param for MessagePhase constructor
- * @param defer boolean for which queue to add it to, false -> add to PhaseQueuePrepend, true -> nextCommandPhaseQueue
- */
queueMessage(message: string, callbackDelay?: integer, prompt?: boolean, promptDelay?: integer, defer?: boolean) {
const phase = new MessagePhase(this, message, callbackDelay, prompt, promptDelay);
if (!defer) {
- // adds to the end of PhaseQueuePrepend
this.unshiftPhase(phase);
} else {
- //remember that pushPhase adds it to nextCommandPhaseQueue
this.pushPhase(phase);
}
}
- /**
- * Moves everything from nextCommandPhaseQueue to phaseQueue (keeping order)
- */
populatePhaseQueue(): void {
if (this.nextCommandPhaseQueue.length) {
this.phaseQueue.push(...this.nextCommandPhaseQueue);
@@ -2456,7 +2275,7 @@ export default class BattleScene extends SceneBase {
});
}
- generateEnemyModifiers(customHeldModifiers?: PokemonHeldItemModifierType[][]): Promise {
+ generateEnemyModifiers(): Promise {
return new Promise(resolve => {
if (this.currentBattle.battleSpec === BattleSpec.FINAL_BOSS) {
return resolve();
@@ -2478,33 +2297,29 @@ export default class BattleScene extends SceneBase {
}
party.forEach((enemyPokemon: EnemyPokemon, i: integer) => {
- if (customHeldModifiers && i < customHeldModifiers.length && customHeldModifiers[i].length > 0) {
- customHeldModifiers[i].forEach(mt => mt.newModifier(enemyPokemon).add(this.enemyModifiers, false, this));
- } else {
- const isBoss = enemyPokemon.isBoss() || (this.currentBattle.battleType === BattleType.TRAINER && this.currentBattle.trainer.config.isBoss);
- let upgradeChance = 32;
- if (isBoss) {
- upgradeChance /= 2;
- }
- if (isFinalBoss) {
- upgradeChance /= 8;
- }
- const modifierChance = this.gameMode.getEnemyModifierChance(isBoss);
- let pokemonModifierChance = modifierChance;
- if (this.currentBattle.battleType === BattleType.TRAINER)
- pokemonModifierChance = Math.ceil(pokemonModifierChance * this.currentBattle.trainer.getPartyMemberModifierChanceMultiplier(i)); // eslint-disable-line
- let count = 0;
- for (let c = 0; c < chances; c++) {
- if (!Utils.randSeedInt(modifierChance)) {
- count++;
- }
- }
- if (isBoss) {
- count = Math.max(count, Math.floor(chances / 2));
+ const isBoss = enemyPokemon.isBoss() || (this.currentBattle.battleType === BattleType.TRAINER && this.currentBattle.trainer.config.isBoss);
+ let upgradeChance = 32;
+ if (isBoss) {
+ upgradeChance /= 2;
+ }
+ if (isFinalBoss) {
+ upgradeChance /= 8;
+ }
+ const modifierChance = this.gameMode.getEnemyModifierChance(isBoss);
+ let pokemonModifierChance = modifierChance;
+ if (this.currentBattle.battleType === BattleType.TRAINER)
+ pokemonModifierChance = Math.ceil(pokemonModifierChance * this.currentBattle.trainer.getPartyMemberModifierChanceMultiplier(i)); // eslint-disable-line
+ let count = 0;
+ for (let c = 0; c < chances; c++) {
+ if (!Utils.randSeedInt(modifierChance)) {
+ count++;
}
- getEnemyModifierTypesForWave(difficultyWaveIndex, count, [ enemyPokemon ], this.currentBattle.battleType === BattleType.TRAINER ? ModifierPoolType.TRAINER : ModifierPoolType.WILD, upgradeChance)
- .map(mt => mt.newModifier(enemyPokemon).add(this.enemyModifiers, false, this));
}
+ if (isBoss) {
+ count = Math.max(count, Math.floor(chances / 2));
+ }
+ getEnemyModifierTypesForWave(difficultyWaveIndex, count, [ enemyPokemon ], this.currentBattle.battleType === BattleType.TRAINER ? ModifierPoolType.TRAINER : ModifierPoolType.WILD, upgradeChance)
+ .map(mt => mt.newModifier(enemyPokemon).add(this.enemyModifiers, false, this));
});
this.updateModifiers(false).then(() => resolve());
@@ -2726,88 +2541,4 @@ export default class BattleScene extends SceneBase {
};
(window as any).gameInfo = gameInfo;
}
-
- /**
- * Loads or generates a mystery encounter
- * @param override - used to load session encounter when restarting game, etc.
- * @returns
- */
- getMysteryEncounter(override: MysteryEncounter): MysteryEncounter {
- // Loading override or session encounter
- let encounter: MysteryEncounter;
- if (!isNullOrUndefined(Overrides.MYSTERY_ENCOUNTER_OVERRIDE) && allMysteryEncounters.hasOwnProperty(Overrides.MYSTERY_ENCOUNTER_OVERRIDE)) {
- encounter = allMysteryEncounters[Overrides.MYSTERY_ENCOUNTER_OVERRIDE];
- } else {
- encounter = override?.encounterType >= 0 ? allMysteryEncounters[override?.encounterType] : null;
- }
-
- // Check for queued encounters first
- if (!encounter && this.mysteryEncounterFlags?.nextEncounterQueue?.length > 0) {
- let i = 0;
- while (i < this.mysteryEncounterFlags.nextEncounterQueue.length && !!encounter) {
- const candidate = this.mysteryEncounterFlags.nextEncounterQueue[i];
- const forcedChance = candidate[1];
- if (Utils.randSeedInt(100) < forcedChance) {
- encounter = allMysteryEncounters[candidate[0]];
- }
-
- i++;
- }
- }
-
- if (encounter) {
- encounter = new MysteryEncounter(encounter);
- encounter.meetsRequirements(this);
- return encounter;
- }
-
- // Common / Uncommon / Rare / Super Rare
- const tierWeights = [61, 40, 21, 6];
-
- // Adjust tier weights by previously encountered events to lower odds of only common/uncommons in run
- this.mysteryEncounterFlags.encounteredEvents.forEach(val => {
- const tier = val[1];
- if (tier === MysteryEncounterTier.COMMON) {
- tierWeights[0] = tierWeights[0] - 6;
- } else if (tier === MysteryEncounterTier.UNCOMMON) {
- tierWeights[1] = tierWeights[1] - 4;
- }
- });
-
- const totalWeight = tierWeights.reduce((a, b) => a + b);
- const tierValue = Utils.randSeedInt(totalWeight);
- const commonThreshold = totalWeight - tierWeights[0];
- const uncommonThreshold = totalWeight - tierWeights[0] - tierWeights[1];
- const rareThreshold = totalWeight - tierWeights[0] - tierWeights[1] - tierWeights[2];
- let tier = tierValue > commonThreshold ? MysteryEncounterTier.COMMON : tierValue > uncommonThreshold ? MysteryEncounterTier.UNCOMMON : tierValue > rareThreshold ? MysteryEncounterTier.RARE : MysteryEncounterTier.SUPER_RARE;
-
- if (!isNullOrUndefined(Overrides.MYSTERY_ENCOUNTER_TIER_OVERRIDE)) {
- tier = Overrides.MYSTERY_ENCOUNTER_TIER_OVERRIDE;
- }
-
- let availableEncounters = [];
- // New encounter will never be the same as the most recent encounter
- const previousEncounter = this.mysteryEncounterFlags.encounteredEvents?.length > 0 ? this.mysteryEncounterFlags.encounteredEvents[this.mysteryEncounterFlags.encounteredEvents.length - 1][0] : null;
- const biomeMysteryEncounters = mysteryEncountersByBiome.get(this.arena.biomeType);
- // If no valid encounters exist at tier, checks next tier down, continuing until there are some encounters available
- while (availableEncounters.length === 0 && tier >= 0) {
- availableEncounters = biomeMysteryEncounters
- .filter((encounterType) =>
- allMysteryEncounters[encounterType]?.meetsRequirements(this) &&
- allMysteryEncounters[encounterType].encounterTier === tier &&
- (isNullOrUndefined(previousEncounter) || encounterType !== previousEncounter))
- .map((m) => (allMysteryEncounters[m]));
- tier--;
- }
-
- // If absolutely no encounters are available, spawn 0th encounter
- if (availableEncounters.length === 0) {
- return allMysteryEncounters[MysteryEncounterType.MYSTERIOUS_CHALLENGERS];
- }
- encounter = availableEncounters[Utils.randSeedInt(availableEncounters.length)];
- // New encounter object to not dirty flags
- encounter = new MysteryEncounter(encounter);
- encounter.meetsRequirements(this);
- return encounter;
- }
}
diff --git a/src/battle.ts b/src/battle.ts
index ec61596131eb..c3a481e9956d 100644
--- a/src/battle.ts
+++ b/src/battle.ts
@@ -13,34 +13,32 @@ import { Moves } from "#enums/moves";
import { PlayerGender } from "#enums/player-gender";
import { Species } from "#enums/species";
import { TrainerType } from "#enums/trainer-type";
-import MysteryEncounter, { MysteryEncounterVariant } from "./data/mystery-encounter";
export enum BattleType {
- WILD,
- TRAINER,
- CLEAR,
- MYSTERY_ENCOUNTER
+ WILD,
+ TRAINER,
+ CLEAR
}
export enum BattlerIndex {
- ATTACKER = -1,
- PLAYER,
- PLAYER_2,
- ENEMY,
- ENEMY_2
+ ATTACKER = -1,
+ PLAYER,
+ PLAYER_2,
+ ENEMY,
+ ENEMY_2
}
export interface TurnCommand {
- command: Command;
- cursor?: integer;
- move?: QueuedMove;
- targets?: BattlerIndex[];
- skip?: boolean;
- args?: any[];
+ command: Command;
+ cursor?: integer;
+ move?: QueuedMove;
+ targets?: BattlerIndex[];
+ skip?: boolean;
+ args?: any[];
}
interface TurnCommands {
- [key: integer]: TurnCommand
+ [key: integer]: TurnCommand
}
export default class Battle {
@@ -68,7 +66,6 @@ export default class Battle {
public lastUsedPokeball: PokeballType;
public playerFaints: number; // The amount of times pokemon on the players side have fainted
public enemyFaints: number; // The amount of times pokemon on the enemies side have fainted
- public mysteryEncounter: MysteryEncounter;
private rngCounter: integer = 0;
@@ -107,7 +104,7 @@ export default class Battle {
this.battleSpec = spec;
}
- public getLevelForWave(): integer {
+ private getLevelForWave(): integer {
const levelWaveIndex = this.gameMode.getWaveForDifficulty(this.waveIndex);
const baseLevel = 1 + levelWaveIndex / 2 + Math.pow(levelWaveIndex / 25, 2);
const bossMultiplier = 1.2;
@@ -201,7 +198,7 @@ export default class Battle {
getBgmOverride(scene: BattleScene): string {
const battlers = this.enemyParty.slice(0, this.getBattlerCount());
- if (this.battleType === BattleType.TRAINER || this.mysteryEncounter?.encounterVariant === MysteryEncounterVariant.TRAINER_BATTLE) {
+ if (this.battleType === BattleType.TRAINER) {
if (!this.started && this.trainer.config.encounterBgm && this.trainer.getEncounterMessages()?.length) {
return `encounter_${this.trainer.getEncounterBgm()}`;
}
diff --git a/src/data/ability.ts b/src/data/ability.ts
index 16c2f9b0456a..f449b33992bf 100644
--- a/src/data/ability.ts
+++ b/src/data/ability.ts
@@ -245,6 +245,25 @@ export class PreDefendAbAttr extends AbAttr {
}
}
+export class PreDefendFormChangeAbAttr extends PreDefendAbAttr {
+ private formFunc: (p: Pokemon) => integer;
+
+ constructor(formFunc: ((p: Pokemon) => integer)) {
+ super(true);
+
+ this.formFunc = formFunc;
+ }
+
+ applyPreDefend(pokemon: Pokemon, passive: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ const formIndex = this.formFunc(pokemon);
+ if (formIndex !== pokemon.formIndex) {
+ pokemon.scene.triggerPokemonFormChange(pokemon, SpeciesFormChangeManualTrigger, false);
+ return true;
+ }
+
+ return false;
+ }
+}
export class PreDefendFullHpEndureAbAttr extends PreDefendAbAttr {
applyPreDefend(pokemon: Pokemon, passive: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean {
if (pokemon.hp === pokemon.getMaxHp() &&
@@ -308,6 +327,21 @@ export class ReceivedTypeDamageMultiplierAbAttr extends ReceivedMoveDamageMultip
}
}
+export class PreDefendMoveDamageToOneAbAttr extends ReceivedMoveDamageMultiplierAbAttr {
+ constructor(condition: PokemonDefendCondition) {
+ super(condition, 1);
+ }
+
+ applyPreDefend(pokemon: Pokemon, passive: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ if (this.condition(pokemon, attacker, move)) {
+ (args[0] as Utils.NumberHolder).value = Math.floor(pokemon.getMaxHp() / 8);
+ return true;
+ }
+
+ return false;
+ }
+}
+
/**
* Determines whether a Pokemon is immune to a move because of an ability.
* @extends PreDefendAbAttr
@@ -456,6 +490,45 @@ export class PostDefendAbAttr extends AbAttr {
}
}
+export class PostDefendDisguiseAbAttr extends PostDefendAbAttr {
+
+ applyPostDefend(pokemon: Pokemon, passive: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, args: any[]): boolean {
+ if (pokemon.formIndex === 0 && pokemon.battleData.hitCount !== 0 && (move.category === MoveCategory.SPECIAL || move.category === MoveCategory.PHYSICAL)) {
+
+ const recoilDamage = Math.ceil((pokemon.getMaxHp() / 8) - attacker.turnData.damageDealt);
+ if (!recoilDamage) {
+ return false;
+ }
+ pokemon.damageAndUpdate(recoilDamage, HitResult.OTHER);
+ pokemon.turnData.damageTaken += recoilDamage;
+ pokemon.scene.queueMessage(getPokemonMessage(pokemon, "'s disguise was busted!"));
+ return true;
+ }
+
+ return false;
+ }
+}
+
+export class PostDefendFormChangeAbAttr extends PostDefendAbAttr {
+ private formFunc: (p: Pokemon) => integer;
+
+ constructor(formFunc: ((p: Pokemon) => integer)) {
+ super(true);
+
+ this.formFunc = formFunc;
+ }
+
+ applyPostDefend(pokemon: Pokemon, passive: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, args: any[]): boolean {
+ const formIndex = this.formFunc(pokemon);
+ if (formIndex !== pokemon.formIndex) {
+ pokemon.scene.triggerPokemonFormChange(pokemon, SpeciesFormChangeManualTrigger, false);
+ return true;
+ }
+
+ return false;
+ }
+}
+
export class FieldPriorityMoveImmunityAbAttr extends PreDefendAbAttr {
applyPreDefend(pokemon: Pokemon, passive: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean {
const attackPriority = new Utils.IntegerHolder(move.priority);
@@ -2048,50 +2121,6 @@ export class PostSummonCopyAbilityAbAttr extends PostSummonAbAttr {
}
}
-/**
- * Removes supplied status effects from the user's field.
- */
-export class PostSummonUserFieldRemoveStatusEffectAbAttr extends PostSummonAbAttr {
- private statusEffect: StatusEffect[];
-
- /**
- *
- * @param statusEffect - The status effects to be removed from the user's field.
- */
- constructor(...statusEffect: StatusEffect[]) {
- super(false);
-
- this.statusEffect = statusEffect;
- }
-
- /**
- * Applies the post-summon ability.
- *
- * @param pokemon - The Pokémon that triggered the ability.
- * @param passive - Whether the ability is applied passively.
- * @param args - Additional arguments for the ability.
- * @returns A boolean or a promise that resolves to a boolean indicating the result of the ability application.
- */
- applyPostSummon(pokemon: Pokemon, passive: boolean, args: any[]): boolean | Promise {
- const field = pokemon.getAlliedField();
- const allowedParty = field.filter(p => p.isAllowedInBattle());
-
- if (allowedParty.length < 1) {
- return false;
- }
-
- for (const pokemon of allowedParty) {
- if (this.statusEffect.includes(pokemon.status?.effect)) {
- pokemon.scene.queueMessage(getStatusEffectHealText(pokemon.status.effect, getPokemonNameWithAffix(pokemon)));
- pokemon.resetStatus(false);
- pokemon.updateInfo();
- }
- }
-
- return true;
- }
-}
-
/** Attempt to copy the stat changes on an ally pokemon */
export class PostSummonCopyAllyStatsAbAttr extends PostSummonAbAttr {
@@ -2339,33 +2368,17 @@ export class PreSetStatusAbAttr extends AbAttr {
}
}
-/**
- * Provides immunity to status effects to specified targets.
- */
-export class PreSetStatusEffectImmunityAbAttr extends PreSetStatusAbAttr {
+export class StatusEffectImmunityAbAttr extends PreSetStatusAbAttr {
private immuneEffects: StatusEffect[];
- /**
- * @param immuneEffects - The status effects to which the Pokémon is immune.
- */
constructor(...immuneEffects: StatusEffect[]) {
super();
this.immuneEffects = immuneEffects;
}
- /**
- * Applies a pre-set status to a Pokémon.
- *
- * @param pokemon - The Pokémon to which the status is being applied.
- * @param passive - Whether the status is applied passively.
- * @param effect - The status effect being applied.
- * @param cancelled - A holder for a boolean value indicating if the status application was cancelled.
- * @param args - Additional arguments for the status application.
- * @returns A boolean indicating the result of the status application.
- */
applyPreSetStatus(pokemon: Pokemon, passive: boolean, effect: StatusEffect, cancelled: Utils.BooleanHolder, args: any[]): boolean {
- if (this.immuneEffects.length < 1 || this.immuneEffects.includes(effect)) {
+ if (!this.immuneEffects.length || this.immuneEffects.indexOf(effect) > -1) {
cancelled.value = true;
return true;
}
@@ -2378,31 +2391,14 @@ export class PreSetStatusEffectImmunityAbAttr extends PreSetStatusAbAttr {
}
}
-/**
- * Provides immunity to status effects to the user.
- * @extends PreSetStatusEffectImmunityAbAttr
- */
-export class StatusEffectImmunityAbAttr extends PreSetStatusEffectImmunityAbAttr { }
-
-/**
- * Provides immunity to status effects to the user's field.
- * @extends PreSetStatusEffectImmunityAbAttr
- */
-export class UserFieldStatusEffectImmunityAbAttr extends PreSetStatusEffectImmunityAbAttr { }
-
export class PreApplyBattlerTagAbAttr extends AbAttr {
applyPreApplyBattlerTag(pokemon: Pokemon, passive: boolean, tag: BattlerTag, cancelled: Utils.BooleanHolder, args: any[]): boolean | Promise {
return false;
}
}
-/**
- * Provides immunity to BattlerTags {@linkcode BattlerTag} to specified targets.
- * @extends PreApplyBattlerTagAbAttr
- */
-export class PreApplyBattlerTagImmunityAbAttr extends PreApplyBattlerTagAbAttr {
+export class BattlerTagImmunityAbAttr extends PreApplyBattlerTagAbAttr {
private immuneTagType: BattlerTagType;
- private battlerTag: BattlerTag;
constructor(immuneTagType: BattlerTagType) {
super();
@@ -2413,7 +2409,6 @@ export class PreApplyBattlerTagImmunityAbAttr extends PreApplyBattlerTagAbAttr {
applyPreApplyBattlerTag(pokemon: Pokemon, passive: boolean, tag: BattlerTag, cancelled: Utils.BooleanHolder, args: any[]): boolean {
if (tag.tagType === this.immuneTagType) {
cancelled.value = true;
- this.battlerTag = tag;
return true;
}
@@ -2421,22 +2416,10 @@ export class PreApplyBattlerTagImmunityAbAttr extends PreApplyBattlerTagAbAttr {
}
getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]): string {
- return getPokemonMessage(pokemon, `'s ${abilityName}\nprevents ${this.battlerTag.getDescriptor()}!`);
+ return getPokemonMessage(pokemon, `'s ${abilityName}\nprevents ${(args[0] as BattlerTag).getDescriptor()}!`);
}
}
-/**
- * Provides immunity to BattlerTags {@linkcode BattlerTag} to the user.
- * @extends PreApplyBattlerTagImmunityAbAttr
- */
-export class BattlerTagImmunityAbAttr extends PreApplyBattlerTagImmunityAbAttr { }
-
-/**
- * Provides immunity to BattlerTags {@linkcode BattlerTag} to the user's field.
- * @extends PreApplyBattlerTagImmunityAbAttr
- */
-export class UserFieldBattlerTagImmunityAbAttr extends PreApplyBattlerTagImmunityAbAttr { }
-
export class BlockCritAbAttr extends AbAttr {
apply(pokemon: Pokemon, passive: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
(args[0] as Utils.BooleanHolder).value = true;
@@ -3891,54 +3874,6 @@ export class IceFaceBlockPhysicalAbAttr extends ReceivedMoveDamageMultiplierAbAt
}
}
-/**
- * Takes no damage from the first hit of a damaging move.
- * This is used in the Disguise ability.
- */
-export class DisguiseBlockDamageAbAttr extends ReceivedMoveDamageMultiplierAbAttr {
- private multiplier: number;
-
- constructor(condition: PokemonDefendCondition, multiplier: number) {
- super(condition, multiplier);
-
- this.multiplier = multiplier;
- }
-
- /**
- * Applies the Disguise pre-defense ability to the Pokémon.
- * Removes BattlerTagType.DISGUISE when hit by an attack and is in its Disguised form.
- *
- * @param {Pokemon} pokemon - The Pokémon with the Disguise ability.
- * @param {boolean} passive - Whether the ability is passive.
- * @param {Pokemon} attacker - The attacking Pokémon.
- * @param {PokemonMove} move - The move being used.
- * @param {Utils.BooleanHolder} cancelled - A holder for whether the move was cancelled.
- * @param {any[]} args - Additional arguments.
- * @returns {boolean} - Whether the immunity was applied.
- */
- applyPreDefend(pokemon: Pokemon, passive: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean {
- if (this.condition(pokemon, attacker, move)) {
- (args[0] as Utils.NumberHolder).value = this.multiplier;
- pokemon.removeTag(BattlerTagType.DISGUISE);
- pokemon.damageAndUpdate(Math.floor(pokemon.getMaxHp() / 8), HitResult.OTHER);
- return true;
- }
-
- return false;
- }
-
- /**
- * Gets the message triggered when the Pokémon avoids damage using the Disguise ability.
- * @param {Pokemon} pokemon - The Pokémon with the Disguise ability.
- * @param {string} abilityName - The name of the ability.
- * @param {...any} args - Additional arguments.
- * @returns {string} - The trigger message.
- */
- getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]): string {
- return i18next.t("abilityTriggers:disguiseAvoidedDamage", { pokemonName: pokemon.name, abilityName: abilityName });
- }
-}
-
/**
* If a Pokémon with this Ability selects a damaging move, it has a 30% chance of going first in its priority bracket. If the Ability activates, this is announced at the start of the turn (after move selection).
*
@@ -3987,42 +3922,47 @@ export class BypassSpeedChanceAbAttr extends AbAttr {
}
}
-async function applyAbAttrsInternal(
- attrType: Constructor,
- pokemon: Pokemon,
- applyFunc: AbAttrApplyFunc,
- args: any[],
- showAbilityInstant: boolean = false,
- quiet: boolean = false,
-) {
- for (const passive of [false, true]) {
+function applyAbAttrsInternal(attrType: Constructor,
+ pokemon: Pokemon, applyFunc: AbAttrApplyFunc, args: any[], isAsync: boolean = false, showAbilityInstant: boolean = false, quiet: boolean = false, passive: boolean = false): Promise {
+ return new Promise(resolve => {
if (!pokemon.canApplyAbility(passive)) {
- continue;
- }
-
- const ability = passive ? pokemon.getPassiveAbility() : pokemon.getAbility();
- for (const attr of ability.getAttrs(attrType)) {
- const condition = attr.getCondition();
- if (condition && !condition(pokemon)) {
- continue;
+ if (!passive) {
+ return applyAbAttrsInternal(attrType, pokemon, applyFunc, args, isAsync, showAbilityInstant, quiet, true).then(() => resolve());
+ } else {
+ return resolve();
}
+ }
- pokemon.scene.setPhaseQueueSplice();
+ const ability = (!passive ? pokemon.getAbility() : pokemon.getPassiveAbility());
+ const attrs = ability.getAttrs(attrType);
- let result = applyFunc(attr, passive);
- // TODO Remove this when promises get reworked PR#924
- if (result instanceof Promise) {
- result = await result;
+ const clearSpliceQueueAndResolve = () => {
+ pokemon.scene?.clearPhaseQueueSplice();
+ if (!passive) {
+ return applyAbAttrsInternal(attrType, pokemon, applyFunc, args, isAsync, showAbilityInstant, quiet, true).then(() => resolve());
+ } else {
+ return resolve();
}
-
- if (result) {
+ };
+ const applyNextAbAttr = () => {
+ if (attrs.length) {
+ applyAbAttr(attrs.shift());
+ } else {
+ clearSpliceQueueAndResolve();
+ }
+ };
+ const applyAbAttr = (attr: TAttr) => {
+ if (!canApplyAttr(pokemon, attr)) {
+ return applyNextAbAttr();
+ }
+ pokemon.scene.setPhaseQueueSplice();
+ const onApplySuccess = () => {
if (pokemon.summonData && !pokemon.summonData.abilitiesApplied.includes(ability.id)) {
pokemon.summonData.abilitiesApplied.push(ability.id);
}
if (pokemon.battleData && !pokemon.battleData.abilitiesApplied.includes(ability.id)) {
pokemon.battleData.abilitiesApplied.push(ability.id);
}
-
if (attr.showAbility && !quiet) {
if (showAbilityInstant) {
pokemon.scene.abilityBar.showAbility(pokemon, passive);
@@ -4030,18 +3970,34 @@ async function applyAbAttrsInternal(
queueShowAbility(pokemon, passive);
}
}
-
if (!quiet) {
- const message = attr.getTriggerMessage(pokemon, ability.name, args);
+ const message = attr.getTriggerMessage(pokemon, (!passive ? pokemon.getAbility() : pokemon.getPassiveAbility()).name, args);
if (message) {
- pokemon.scene.queueMessage(message);
+ if (isAsync) {
+ pokemon.scene.ui.showText(message, null, () => pokemon.scene.ui.showText(null, 0), null, true);
+ } else {
+ pokemon.scene.queueMessage(message);
+ }
}
}
+ };
+ const result = applyFunc(attr, passive);
+ if (result instanceof Promise) {
+ result.then(success => {
+ if (success) {
+ onApplySuccess();
+ }
+ applyNextAbAttr();
+ });
+ } else {
+ if (result) {
+ onApplySuccess();
+ }
+ applyNextAbAttr();
}
- }
-
- pokemon.scene.clearPhaseQueueSplice();
- }
+ };
+ applyNextAbAttr();
+ });
}
export function applyAbAttrs(attrType: Constructor, pokemon: Pokemon, cancelled: Utils.BooleanHolder, ...args: any[]): Promise {
@@ -4056,7 +4012,7 @@ export function applyPostBattleInitAbAttrs(attrType: Constructor,
pokemon: Pokemon, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, ...args: any[]): Promise {
const simulated = args.length > 1 && args[1];
- return applyAbAttrsInternal(attrType, pokemon, (attr, passive) => attr.applyPreDefend(pokemon, passive, attacker, move, cancelled, args), args, false, simulated);
+ return applyAbAttrsInternal(attrType, pokemon, (attr, passive) => attr.applyPreDefend(pokemon, passive, attacker, move, cancelled, args), args, false, false, simulated);
}
export function applyPostDefendAbAttrs(attrType: Constructor,
@@ -4116,7 +4072,7 @@ export function applyPostSummonAbAttrs(attrType: Constructor,
export function applyPreSwitchOutAbAttrs(attrType: Constructor,
pokemon: Pokemon, ...args: any[]): Promise {
- return applyAbAttrsInternal(attrType, pokemon, (attr, passive) => attr.applyPreSwitchOut(pokemon, passive, args), args, true);
+ return applyAbAttrsInternal(attrType, pokemon, (attr, passive) => attr.applyPreSwitchOut(pokemon, passive, args), args, false, true);
}
export function applyPreStatChangeAbAttrs(attrType: Constructor,
@@ -4132,7 +4088,7 @@ export function applyPostStatChangeAbAttrs(attrType: Constructor,
pokemon: Pokemon, effect: StatusEffect, cancelled: Utils.BooleanHolder, ...args: any[]): Promise {
const simulated = args.length > 1 && args[1];
- return applyAbAttrsInternal(attrType, pokemon, (attr, passive) => attr.applyPreSetStatus(pokemon, passive, effect, cancelled, args), args, false, !simulated);
+ return applyAbAttrsInternal(attrType, pokemon, (attr, passive) => attr.applyPreSetStatus(pokemon, passive, effect, cancelled, args), args, false, false, !simulated);
}
export function applyPreApplyBattlerTagAbAttrs(attrType: Constructor,
@@ -4142,7 +4098,7 @@ export function applyPreApplyBattlerTagAbAttrs(attrType: Constructor,
pokemon: Pokemon, weather: Weather, cancelled: Utils.BooleanHolder, ...args: any[]): Promise {
- return applyAbAttrsInternal(attrType, pokemon, (attr, passive) => attr.applyPreWeatherEffect(pokemon, passive, weather, cancelled, args), args, true);
+ return applyAbAttrsInternal(attrType, pokemon, (attr, passive) => attr.applyPreWeatherEffect(pokemon, passive, weather, cancelled, args), args, false, true);
}
export function applyPostTurnAbAttrs(attrType: Constructor,
@@ -4167,7 +4123,7 @@ export function applyPostTerrainChangeAbAttrs(attrType: Constructor,
pokemon: Pokemon, trapped: Utils.BooleanHolder, otherPokemon: Pokemon, ...args: any[]): Promise {
- return applyAbAttrsInternal(attrType, pokemon, (attr, passive) => attr.applyCheckTrapped(pokemon, passive, trapped, otherPokemon, args), args);
+ return applyAbAttrsInternal(attrType, pokemon, (attr, passive) => attr.applyCheckTrapped(pokemon, passive, trapped, otherPokemon, args), args, true);
}
export function applyPostBattleAbAttrs(attrType: Constructor,
@@ -4180,6 +4136,11 @@ export function applyPostFaintAbAttrs(attrType: Constructor,
return applyAbAttrsInternal(attrType, pokemon, (attr, passive) => attr.applyPostFaint(pokemon, passive, attacker, move, hitResult, args), args);
}
+function canApplyAttr(pokemon: Pokemon, attr: AbAttr): boolean {
+ const condition = attr.getCondition();
+ return !condition || condition(pokemon);
+}
+
function queueShowAbility(pokemon: Pokemon, passive: boolean): void {
pokemon.scene.unshiftPhase(new ShowAbilityPhase(pokemon.scene, pokemon.id, passive));
pokemon.scene.clearPhaseQueueSplice();
@@ -4735,10 +4696,10 @@ export function initAbilities() {
new Ability(Abilities.REFRIGERATE, 6)
.attr(MoveTypeChangeAttr, Type.ICE, 1.2, (user, target, move) => move.type === Type.NORMAL),
new Ability(Abilities.SWEET_VEIL, 6)
- .attr(UserFieldStatusEffectImmunityAbAttr, StatusEffect.SLEEP)
- .attr(UserFieldBattlerTagImmunityAbAttr, BattlerTagType.DROWSY)
+ .attr(StatusEffectImmunityAbAttr, StatusEffect.SLEEP)
+ .attr(BattlerTagImmunityAbAttr, BattlerTagType.DROWSY)
.ignorable()
- .partial(), // Mold Breaker ally should not be affected by Sweet Veil
+ .partial(),
new Ability(Abilities.STANCE_CHANGE, 6)
.attr(UncopiableAbilityAbAttr)
.attr(UnswappableAbilityAbAttr)
@@ -4848,15 +4809,20 @@ export function initAbilities() {
.attr(NoFusionAbilityAbAttr)
.bypassFaint(),
new Ability(Abilities.DISGUISE, 7)
+ .attr(PreDefendMoveDamageToOneAbAttr, (target, user, move) => target.formIndex === 0 && target.getAttackTypeEffectiveness(move.type, user) > 0)
+ .attr(PostSummonFormChangeAbAttr, p => p.battleData.hitCount === 0 ? 0 : 1)
+ .attr(PostBattleInitFormChangeAbAttr, () => 0)
+ .attr(PostDefendFormChangeAbAttr, p => p.battleData.hitCount === 0 ? 0 : 1)
+ .attr(PreDefendFormChangeAbAttr, p => p.battleData.hitCount === 0 ? 0 : 1)
+ .attr(PostDefendDisguiseAbAttr)
.attr(UncopiableAbilityAbAttr)
.attr(UnswappableAbilityAbAttr)
.attr(UnsuppressableAbilityAbAttr)
.attr(NoTransformAbilityAbAttr)
.attr(NoFusionAbilityAbAttr)
- // Add BattlerTagType.DISGUISE if the pokemon is in its disguised form
- .conditionalAttr(pokemon => pokemon.formIndex === 0, PostSummonAddBattlerTagAbAttr, BattlerTagType.DISGUISE, 0, false)
- .attr(DisguiseBlockDamageAbAttr, (target, user, move) => !!target.getTag(BattlerTagType.DISGUISE) && target.getAttackTypeEffectiveness(move.type, user) > 0, 0)
- .ignorable(),
+ .bypassFaint()
+ .ignorable()
+ .partial(),
new Ability(Abilities.BATTLE_BOND, 7)
.attr(PostVictoryFormChangeAbAttr, () => 2)
.attr(PostBattleInitFormChangeAbAttr, () => 1)
@@ -5028,8 +4994,7 @@ export function initAbilities() {
.attr(PostSummonMessageAbAttr, (pokemon: Pokemon) => getPokemonMessage(pokemon, "'s Neutralizing Gas filled the area!"))
.partial(),
new Ability(Abilities.PASTEL_VEIL, 8)
- .attr(PostSummonUserFieldRemoveStatusEffectAbAttr, StatusEffect.POISON)
- .attr(UserFieldStatusEffectImmunityAbAttr, StatusEffect.POISON, StatusEffect.TOXIC)
+ .attr(StatusEffectImmunityAbAttr, StatusEffect.POISON, StatusEffect.TOXIC)
.ignorable(),
new Ability(Abilities.HUNGER_SWITCH, 8)
.attr(PostTurnFormChangeAbAttr, p => p.getFormKey ? 0 : 1)
diff --git a/src/data/battle-stat.ts b/src/data/battle-stat.ts
index 4a8e15902b6b..7dccd4f8a7c3 100644
--- a/src/data/battle-stat.ts
+++ b/src/data/battle-stat.ts
@@ -1,4 +1,4 @@
-import i18next, {ParseKeys} from "i18next";
+import i18next from "i18next";
export enum BattleStat {
ATK,
@@ -8,8 +8,7 @@ export enum BattleStat {
SPD,
ACC,
EVA,
- RAND,
- HP
+ RAND
}
export function getBattleStatName(stat: BattleStat) {
@@ -28,15 +27,13 @@ export function getBattleStatName(stat: BattleStat) {
return i18next.t("pokemonInfo:Stat.ACC");
case BattleStat.EVA:
return i18next.t("pokemonInfo:Stat.EVA");
- case BattleStat.HP:
- return i18next.t("pokemonInfo:Stat.HPStat");
default:
return "???";
}
}
-export function getBattleStatLevelChangeDescription(pokemonNameWithAffix: string, stats: string, levels: integer, up: boolean,multiple: boolean = false) {
- let stringKey = (() => {
+export function getBattleStatLevelChangeDescription(pokemonNameWithAffix: string, stats: string, levels: integer, up: boolean) {
+ const stringKey = (() => {
if (up) {
switch (levels) {
case 1:
@@ -68,9 +65,5 @@ export function getBattleStatLevelChangeDescription(pokemonNameWithAffix: string
}
})();
- if (multiple) {
- stringKey += "Multiple";
- }
-
- return i18next.t(stringKey as ParseKeys, { pokemonNameWithAffix, stats });
+ return i18next.t(stringKey, { pokemonNameWithAffix, stats });
}
diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts
index 9c5c680da556..41b6f73ec282 100644
--- a/src/data/battler-tags.ts
+++ b/src/data/battler-tags.ts
@@ -7,7 +7,7 @@ import { StatusEffect } from "./status-effect";
import * as Utils from "../utils";
import { ChargeAttr, MoveFlags, allMoves } from "./move";
import { Type } from "./type";
-import { BlockNonDirectDamageAbAttr, FlinchEffectAbAttr, ReverseDrainAbAttr, applyAbAttrs, ProtectStatAbAttr } from "./ability";
+import { BlockNonDirectDamageAbAttr, FlinchEffectAbAttr, ReverseDrainAbAttr, applyAbAttrs } from "./ability";
import { TerrainType } from "./terrain";
import { WeatherType } from "./weather";
import { BattleStat } from "./battle-stat";
@@ -1386,18 +1386,6 @@ export class IgnoreAccuracyTag extends BattlerTag {
}
}
-export class AlwaysGetHitTag extends BattlerTag {
- constructor(sourceMove: Moves) {
- super(BattlerTagType.ALWAYS_GET_HIT, BattlerTagLapseType.PRE_MOVE, 1, sourceMove);
- }
-}
-
-export class ReceiveDoubleDamageTag extends BattlerTag {
- constructor(sourceMove: Moves) {
- super(BattlerTagType.RECEIVE_DOUBLE_DAMAGE, BattlerTagLapseType.PRE_MOVE, 1, sourceMove);
- }
-}
-
export class SaltCuredTag extends BattlerTag {
private sourceIndex: integer;
@@ -1549,86 +1537,6 @@ export class IceFaceTag extends BattlerTag {
}
}
-/**
- * Provides the Disguise ability's effects.
- */
-export class DisguiseTag extends BattlerTag {
- constructor(sourceMove: Moves) {
- super(BattlerTagType.DISGUISE, BattlerTagLapseType.CUSTOM, 1, sourceMove);
- }
-
- /**
- * Determines if the Disguise tag can be added to the Pokémon.
- * @param {Pokemon} pokemon - The Pokémon to which the tag might be added.
- * @returns {boolean} - True if the tag can be added, false otherwise.
- */
- canAdd(pokemon: Pokemon): boolean {
- const isFormDisguised = pokemon.formIndex === 0;
-
- // Hard code Mimikyu for now, this is to prevent the game from crashing if fused pokemon has Disguise
- if (pokemon.species.speciesId === Species.MIMIKYU && isFormDisguised) {
- return true;
- }
- return false;
- }
-
- /**
- * Applies the Disguise tag to the Pokémon.
- * Triggers a form change to Disguised if the Pokémon is not in its Disguised form.
- * @param {Pokemon} pokemon - The Pokémon to which the tag is added.
- */
- onAdd(pokemon: Pokemon): void {
- super.onAdd(pokemon);
-
- if (pokemon.formIndex !== 0) {
- pokemon.scene.triggerPokemonFormChange(pokemon, SpeciesFormChangeManualTrigger);
- }
- }
-
- /**
- * Removes the Disguise tag from the Pokémon.
- * Triggers a form change to Busted when the tag is removed.
- * @param {Pokemon} pokemon - The Pokémon from which the tag is removed.
- */
- onRemove(pokemon: Pokemon): void {
- super.onRemove(pokemon);
-
- pokemon.scene.triggerPokemonFormChange(pokemon, SpeciesFormChangeManualTrigger);
- }
-}
-
-export class MysteryEncounterPostSummonTag extends BattlerTag {
- constructor(sourceMove: Moves) {
- super(BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON, BattlerTagLapseType.CUSTOM, 1, sourceMove);
- }
-
- onAdd(pokemon: Pokemon): void {
- super.onAdd(pokemon);
- }
-
- lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
- const ret = super.lapse(pokemon, lapseType);
-
- if (lapseType === BattlerTagLapseType.CUSTOM) {
- // Give pokemon +1 stats for battle
- const cancelled = new Utils.BooleanHolder(false);
- applyAbAttrs(ProtectStatAbAttr, pokemon, cancelled);
- if (!cancelled.value) {
- const mysteryEncounterBattleEffects = pokemon.summonData.mysteryEncounterBattleEffects;
- if (mysteryEncounterBattleEffects) {
- mysteryEncounterBattleEffects(pokemon);
- }
- }
- }
-
- return ret;
- }
-
- onRemove(pokemon: Pokemon): void {
- super.onRemove(pokemon);
- }
-}
-
export function getBattlerTag(tagType: BattlerTagType, turnCount: integer, sourceMove: Moves, sourceId: integer): BattlerTag {
switch (tagType) {
case BattlerTagType.RECHARGING:
@@ -1726,10 +1634,6 @@ export function getBattlerTag(tagType: BattlerTagType, turnCount: integer, sourc
return new BattlerTag(tagType, BattlerTagLapseType.AFTER_MOVE, turnCount, sourceMove);
case BattlerTagType.IGNORE_ACCURACY:
return new IgnoreAccuracyTag(sourceMove);
- case BattlerTagType.ALWAYS_GET_HIT:
- return new AlwaysGetHitTag(sourceMove);
- case BattlerTagType.RECEIVE_DOUBLE_DAMAGE:
- return new ReceiveDoubleDamageTag(sourceMove);
case BattlerTagType.BYPASS_SLEEP:
return new BattlerTag(BattlerTagType.BYPASS_SLEEP, BattlerTagLapseType.TURN_END, turnCount, sourceMove);
case BattlerTagType.IGNORE_FLYING:
@@ -1750,10 +1654,6 @@ export function getBattlerTag(tagType: BattlerTagType, turnCount: integer, sourc
return new DestinyBondTag(sourceMove, sourceId);
case BattlerTagType.ICE_FACE:
return new IceFaceTag(sourceMove);
- case BattlerTagType.DISGUISE:
- return new DisguiseTag(sourceMove);
- case BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON:
- return new MysteryEncounterPostSummonTag(sourceMove);
case BattlerTagType.NONE:
default:
return new BattlerTag(tagType, BattlerTagLapseType.CUSTOM, turnCount, sourceMove, sourceId);
diff --git a/src/data/challenge.ts b/src/data/challenge.ts
index 32b98a04b969..75b200b24eee 100644
--- a/src/data/challenge.ts
+++ b/src/data/challenge.ts
@@ -422,21 +422,19 @@ export class SingleTypeChallenge extends Challenge {
const isValidStarter = args[1] as Utils.BooleanHolder;
const dexAttr = args[2] as DexAttrProps;
const amountOfPokemon = args[3] as number;
- const checkEvolutions = args[4] ?? true as boolean;
- const checkForms = args[5] ?? true as boolean;
const speciesForm = getPokemonSpeciesForm(species.speciesId, dexAttr.formIndex);
const types = [speciesForm.type1, speciesForm.type2];
if (amountOfPokemon > 0) {
const speciesToCheck = [species.speciesId];
while (speciesToCheck.length) {
const checking = speciesToCheck.pop();
- if (pokemonEvolutions.hasOwnProperty(checking) && checkEvolutions) {
+ if (pokemonEvolutions.hasOwnProperty(checking)) {
pokemonEvolutions[checking].forEach(e => {
speciesToCheck.push(e.speciesId);
types.push(getPokemonSpecies(e.speciesId).type1, getPokemonSpecies(e.speciesId).type2);
});
}
- if (pokemonFormChanges.hasOwnProperty(checking) && checkForms) {
+ if (pokemonFormChanges.hasOwnProperty(checking)) {
pokemonFormChanges[checking].forEach(f1 => {
getPokemonSpecies(checking).forms.forEach(f2 => {
if (f1.formKey === f2.formKey) {
diff --git a/src/data/move.ts b/src/data/move.ts
index 5fda19a8b137..7fba094e6568 100644
--- a/src/data/move.ts
+++ b/src/data/move.ts
@@ -861,47 +861,6 @@ export class MoveEffectAttr extends MoveAttr {
}
}
-/**
- * Base class defining all Move Header attributes.
- * Move Header effects apply at the beginning of a turn before any moves are resolved.
- * They can be used to apply effects to the field (e.g. queueing a message) or to the user
- * (e.g. adding a battler tag).
- */
-export class MoveHeaderAttr extends MoveAttr {
- constructor() {
- super(true);
- }
-
- apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean | Promise {
- return true;
- }
-}
-
-/**
- * Header attribute to queue a message at the beginning of a turn.
- * @see {@link MoveHeaderAttr}
- */
-export class MessageHeaderAttr extends MoveHeaderAttr {
- private message: string | ((user: Pokemon, move: Move) => string);
-
- constructor(message: string | ((user: Pokemon, move: Move) => string)) {
- super();
- this.message = message;
- }
-
- apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- const message = typeof this.message === "string"
- ? this.message as string
- : this.message(user, move);
-
- if (message) {
- user.scene.queueMessage(message);
- return true;
- }
- return false;
- }
-}
-
export class PreMoveMessageAttr extends MoveAttr {
private message: string | ((user: Pokemon, target: Pokemon, move: Move) => string);
@@ -4178,9 +4137,9 @@ export class IgnoreAccuracyAttr extends AddBattlerTagAttr {
}
}
-export class AlwaysGetHitAttr extends AddBattlerTagAttr {
+export class AlwaysCritsAttr extends AddBattlerTagAttr {
constructor() {
- super(BattlerTagType.ALWAYS_GET_HIT, true, false, 0, 0, true);
+ super(BattlerTagType.ALWAYS_CRIT, true, false, 2);
}
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
@@ -4188,19 +4147,7 @@ export class AlwaysGetHitAttr extends AddBattlerTagAttr {
return false;
}
- return true;
- }
-}
-
-export class ReceiveDoubleDamageAttr extends AddBattlerTagAttr {
- constructor() {
- super(BattlerTagType.RECEIVE_DOUBLE_DAMAGE, true, false, 0, 0, true);
- }
-
- apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- if (!super.apply(user, target, move, args)) {
- return false;
- }
+ user.scene.queueMessage(getPokemonMessage(user, ` took aim\nat ${target.name}!`));
return true;
}
@@ -5693,10 +5640,6 @@ export const allMoves: Move[] = [
new SelfStatusMove(Moves.NONE, Type.NORMAL, MoveCategory.STATUS, -1, -1, 0, 1),
];
-export const selfStatLowerMoves: Moves[] = [
-
-];
-
export function initMoves() {
allMoves.push(
new AttackMove(Moves.POUND, Type.NORMAL, MoveCategory.PHYSICAL, 40, 100, 35, -1, 0, 1),
@@ -6431,7 +6374,6 @@ export function initMoves() {
&& (user.status.effect === StatusEffect.BURN || user.status.effect === StatusEffect.POISON || user.status.effect === StatusEffect.TOXIC || user.status.effect === StatusEffect.PARALYSIS) ? 2 : 1)
.attr(BypassBurnDamageReductionAttr),
new AttackMove(Moves.FOCUS_PUNCH, Type.FIGHTING, MoveCategory.PHYSICAL, 150, 100, 20, -1, -3, 3)
- .attr(MessageHeaderAttr, (user, move) => getPokemonMessage(user, " is tightening its focus!"))
.punchingMove()
.ignoresVirtual()
.condition((user, target, move) => !user.turnData.attacksReceived.find(r => r.damage)),
@@ -8269,8 +8211,7 @@ export function initMoves() {
new AttackMove(Moves.ICE_SPINNER, Type.ICE, MoveCategory.PHYSICAL, 80, 100, 15, -1, 0, 9)
.attr(ClearTerrainAttr),
new AttackMove(Moves.GLAIVE_RUSH, Type.DRAGON, MoveCategory.PHYSICAL, 120, 100, 5, -1, 0, 9)
- .attr(AlwaysGetHitAttr)
- .attr(ReceiveDoubleDamageAttr),
+ .partial(),
new StatusMove(Moves.REVIVAL_BLESSING, Type.NORMAL, -1, 1, -1, 0, 9)
.triageMove()
.attr(RevivalBlessingAttr)
@@ -8464,9 +8405,4 @@ export function initMoves() {
new AttackMove(Moves.MALIGNANT_CHAIN, Type.POISON, MoveCategory.SPECIAL, 100, 100, 5, 50, 0, 9)
.attr(StatusEffectAttr, StatusEffect.TOXIC)
);
- allMoves.map(m=>{
- if (m.getAttrs(StatChangeAttr).some(a=> a.selfTarget && a.levels < 0)) {
- selfStatLowerMoves.push(m.id);
- }
- });
}
diff --git a/src/data/mystery-encounter-flags.ts b/src/data/mystery-encounter-flags.ts
deleted file mode 100644
index 33ef84e2d1d3..000000000000
--- a/src/data/mystery-encounter-flags.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import {MysteryEncounterTier} from "#app/data/mystery-encounter";
-import {MysteryEncounterType} from "#enums/mystery-encounter-type";
-import {BASE_MYSTERY_ENCOUNTER_WEIGHT} from "#app/data/mystery-encounters/mystery-encounters";
-import {isNullOrUndefined} from "../utils";
-
-export class MysteryEncounterFlags {
- encounteredEvents: [MysteryEncounterType, MysteryEncounterTier][] = [];
- encounterSpawnChance: number = BASE_MYSTERY_ENCOUNTER_WEIGHT;
- nextEncounterQueue: [MysteryEncounterType, integer][] = [];
-
- constructor(flags: MysteryEncounterFlags) {
- if (!isNullOrUndefined(flags)) {
- Object.assign(this, flags);
- }
- }
-}
diff --git a/src/data/mystery-encounter-option.ts b/src/data/mystery-encounter-option.ts
deleted file mode 100644
index 9f23a94e3f3c..000000000000
--- a/src/data/mystery-encounter-option.ts
+++ /dev/null
@@ -1,158 +0,0 @@
-import { PlayerPokemon } from "#app/field/pokemon";
-import * as Utils from "../utils";
-import BattleScene from "../battle-scene";
-import { EncounterPokemonRequirement, EncounterSceneRequirement } from "./mystery-encounter-requirements";
-import {OptionTextDisplay} from "#app/data/mystery-encounters/dialogue/mystery-encounter-dialogue";
-
-export default interface MysteryEncounterOption {
- requirements?: EncounterSceneRequirement[];
- primaryPokemonRequirements?: EncounterPokemonRequirement[];
- secondaryPokemonRequirements ?: EncounterPokemonRequirement[];
- primaryPokemon?: PlayerPokemon;
- secondaryPokemon?: PlayerPokemon[];
- excludePrimaryFromSecondaryRequirements?: boolean;
-
- /**
- * Dialogue object containing all the dialogue, messages, tooltips, etc. for this option
- * Will be populated on MysteryEncounter initialization
- */
- dialogue?: OptionTextDisplay;
-
- // Executes before any following dialogue or business logic from option. Usually this will be for calculating dialogueTokens or performing scene/data updates
- onPreOptionPhase?: (scene: BattleScene) => Promise;
- // Business logic for option
- onOptionPhase?: (scene: BattleScene) => Promise;
- // Executes after the encounter is over. Usually this will be for calculating dialogueTokens or performing data updates
- onPostOptionPhase?: (scene: BattleScene) => Promise;
-}
-
-export default class MysteryEncounterOption implements MysteryEncounterOption {
- constructor(option: MysteryEncounterOption) {
- Object.assign(this, option);
- this.requirements = this.requirements ? this.requirements : [];
- }
-
- meetsRequirements?(scene: BattleScene) {
- return !this.requirements.some(requirement => !requirement.meetsRequirement(scene)) &&
- this.meetsPrimaryRequirementAndPrimaryPokemonSelected(scene) &&
- this.meetsSupportingRequirementAndSupportingPokemonSelected(scene);
- }
- meetsPrimaryRequirementAndPrimaryPokemonSelected?(scene: BattleScene) {
- if (!this.primaryPokemonRequirements) {
- return true;
- }
- let qualified:PlayerPokemon[] = scene.getParty();
- for (const req of this.primaryPokemonRequirements) {
- console.log(req);
- if (req.meetsRequirement(scene)) {
- if (req instanceof EncounterPokemonRequirement) {
- qualified = qualified.filter(pkmn => req.queryParty(scene.getParty()).includes(pkmn));
- }
- } else {
- this.primaryPokemon = null;
- return false;
- }
- }
-
- if (qualified.length === 0) {
- return false;
- }
-
- if (this.excludePrimaryFromSecondaryRequirements && this.secondaryPokemon) {
- const truePrimaryPool = [];
- const overlap = [];
- for (const qp of qualified) {
- if (!this.secondaryPokemon.includes(qp)) {
- truePrimaryPool.push(qp);
- } else {
- overlap.push(qp);
- }
-
- }
- if (truePrimaryPool.length > 0) {
- // always choose from the non-overlapping pokemon first
- this.primaryPokemon = truePrimaryPool[Utils.randSeedInt(truePrimaryPool.length, 0)];
- return true;
- } else {
- // if there are multiple overlapping pokemon, we're okay - just choose one and take it out of the supporting pokemon pool
- if (overlap.length > 1 || (this.secondaryPokemon.length - overlap.length >= 1)) {
- // is this working?
- this.primaryPokemon = overlap[Utils.randSeedInt(overlap.length, 0)];
- this.secondaryPokemon = this.secondaryPokemon.filter((supp)=> supp !== this.primaryPokemon);
- return true;
- }
- console.log("Mystery Encounter Edge Case: Requirement not met due to primay pokemon overlapping with support pokemon. There's no valid primary pokemon left.");
- return false;
- }
- } else {
- // this means we CAN have the same pokemon be a primary and secondary pokemon, so just choose any qualifying one randomly.
- this.primaryPokemon = qualified[Utils.randSeedInt(qualified.length, 0)];
- return true;
- }
- }
-
- meetsSupportingRequirementAndSupportingPokemonSelected?(scene: BattleScene) {
- if (!this.secondaryPokemonRequirements) {
- this.secondaryPokemon = [];
- return true;
- }
-
- let qualified:PlayerPokemon[] = scene.getParty();
- for (const req of this.secondaryPokemonRequirements) {
- if (req.meetsRequirement(scene)) {
- if (req instanceof EncounterPokemonRequirement) {
- qualified = qualified.filter(pkmn => req.queryParty(scene.getParty()).includes(pkmn));
-
- }
- } else {
- this.secondaryPokemon = [];
- return false;
- }
- }
- this.secondaryPokemon = qualified;
- return true;
- }
-}
-
-
-export class MysteryEncounterOptionBuilder implements Partial {
- requirements?: EncounterSceneRequirement[] = [];
- primaryPokemonRequirements?: EncounterPokemonRequirement[] = [];
- secondaryPokemonRequirements ?: EncounterPokemonRequirement[] = [];
- excludePrimaryFromSecondaryRequirements?: boolean;
- onPreOptionPhase?: (scene: BattleScene) => Promise;
- onOptionPhase?: (scene: BattleScene) => Promise;
- onPostOptionPhase?: (scene: BattleScene) => Promise;
-
- withSceneRequirement(requirement: EncounterSceneRequirement): this & Required> {
- this.requirements.push(requirement);
- return Object.assign(this, { requirements: this.requirements });
- }
-
- withPreOptionPhase(onPreOptionPhase: (scene: BattleScene) => Promise): this & Required> {
- return Object.assign(this, { onPreOptionPhase: onPreOptionPhase });
- }
-
- withOptionPhase(onOptionPhase: (scene: BattleScene) => Promise): this & Required> {
- return Object.assign(this, { onOptionPhase: onOptionPhase });
- }
-
- withPostOptionPhase(onPostOptionPhase: (scene: BattleScene) => Promise): this & Required> {
- return Object.assign(this, { onPostOptionPhase: onPostOptionPhase });
- }
-
- build(this: MysteryEncounterOption) {
- return new MysteryEncounterOption(this);
- }
-
- withPrimaryPokemonRequirement(requirement: EncounterPokemonRequirement): this & Required> {
- this.primaryPokemonRequirements.push(requirement);
- return Object.assign(this, { primaryPokemonRequirements: this.primaryPokemonRequirements });
- }
-
- withSecondaryPokemonRequirement(requirement: EncounterPokemonRequirement, excludePrimaryFromSecondaryRequirements?: boolean): this & Required> {
- this.secondaryPokemonRequirements.push(requirement);
- this.excludePrimaryFromSecondaryRequirements = excludePrimaryFromSecondaryRequirements;
- return Object.assign(this, { secondaryPokemonRequirements: this.secondaryPokemonRequirements });
- }
-}
diff --git a/src/data/mystery-encounter-requirements.ts b/src/data/mystery-encounter-requirements.ts
deleted file mode 100644
index d88ec530a74e..000000000000
--- a/src/data/mystery-encounter-requirements.ts
+++ /dev/null
@@ -1,914 +0,0 @@
-import { PlayerPokemon } from "#app/field/pokemon";
-import { ModifierType, PokemonHeldItemModifierType } from "#app/modifier/modifier-type";
-import BattleScene from "../battle-scene";
-import { isNullOrUndefined } from "../utils";
-import { Abilities } from "#enums/abilities";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
-import { TimeOfDay } from "#enums/time-of-day";
-import { Nature } from "./nature";
-import { EvolutionItem, pokemonEvolutions } from "./pokemon-evolutions";
-import { FormChangeItem, SpeciesFormChangeItemTrigger, pokemonFormChanges } from "./pokemon-forms";
-import { SpeciesFormKey } from "./pokemon-species";
-import { StatusEffect } from "./status-effect";
-import { Type } from "./type";
-import { WeatherType } from "./weather";
-import {MysteryEncounterType} from "#enums/mystery-encounter-type";
-
-export interface EncounterRequirement {
- meetsRequirement(scene: BattleScene): boolean; // Boolean to see if a requirement is met
- getDialogueToken(scene: BattleScene, pokemon?: PlayerPokemon): [string, string];
-}
-
-export abstract class EncounterSceneRequirement implements EncounterRequirement {
- meetsRequirement(scene: BattleScene): boolean {
- throw new Error("Method not implemented.");
- }
-
- getDialogueToken(scene: BattleScene, pokemon?: PlayerPokemon): [string, string] {
- return ["", ""];
- }
-}
-
-export abstract class EncounterPokemonRequirement implements EncounterRequirement {
- minNumberOfPokemon: number;
- invertQuery: boolean;
-
- meetsRequirement(scene: BattleScene): boolean {
- throw new Error("Method not implemented.");
- }
-
- // Returns all party members that are compatible with this requirement. For non pokemon related requirements, the entire party is returned..
- queryParty(partyPokemon: PlayerPokemon[]) {
- return [];
- }
-
- // Doesn't require the "@ec" as prefix, just the string; populates the token with the attribute
- // ex. @ec{primarySpecies} if strPrefix is simply "primary"
- getDialogueToken(scene: BattleScene, pokemon?: PlayerPokemon): [string, string] {
- return ["", ""];
- }
-}
-
-export class PreviousEncounterRequirement extends EncounterSceneRequirement {
- previousEncounterRequirement: MysteryEncounterType;
-
- /**
- * Used for specifying an encounter that must be seen before this encounter can spawn
- * @param previousEncounterRequirement
- */
- constructor(previousEncounterRequirement) {
- super();
- this.previousEncounterRequirement = previousEncounterRequirement;
- }
-
- meetsRequirement(scene: BattleScene): boolean {
- return scene.mysteryEncounterFlags.encounteredEvents.some(e => e[0] === this.previousEncounterRequirement);
- }
-
- getDialogueToken(scene: BattleScene, pokemon?: PlayerPokemon): [string, string] {
- return ["previousEncounter", scene.mysteryEncounterFlags.encounteredEvents.find(e => e[0] === this.previousEncounterRequirement)[0].toString()];
- }
-}
-
-export class WaveCountRequirement extends EncounterSceneRequirement {
- waveRange: [number, number];
-
- /**
- * Used for specifying a unique wave or wave range requirement
- * If minWaveIndex and maxWaveIndex are equivalent, will check for exact wave number
- * @param waveRange - [min, max]
- */
- constructor(waveRange: [number, number]) {
- super();
- this.waveRange = waveRange;
- }
-
- meetsRequirement(scene: BattleScene): boolean {
- if (!isNullOrUndefined(this?.waveRange) && this.waveRange?.[0] <= this.waveRange?.[1]) {
- const waveIndex = scene.currentBattle.waveIndex;
- if (waveIndex >= 0 && (this?.waveRange?.[0] >= 0 && this.waveRange?.[0] > waveIndex) || (this?.waveRange?.[1] >= 0 && this.waveRange?.[1] < waveIndex)) {
- return false;
- }
- }
- return true;
- }
-
- getDialogueToken(scene: BattleScene, pokemon?: PlayerPokemon): [string, string] {
- return ["waveCount", scene.currentBattle.waveIndex.toString()];
- }
-}
-
-export class TimeOfDayRequirement extends EncounterSceneRequirement {
- requiredTimeOfDay?: TimeOfDay[];
-
- constructor(timeOfDay: TimeOfDay | TimeOfDay[]) {
- super();
- if (timeOfDay instanceof Array) {
- this.requiredTimeOfDay = timeOfDay;
- } else {
- this.requiredTimeOfDay = [];
- this.requiredTimeOfDay.push(timeOfDay);
- }
- }
-
- meetsRequirement(scene: BattleScene): boolean {
- const timeOfDay = scene.arena?.getTimeOfDay();
- if (!isNullOrUndefined(timeOfDay) && this?.requiredTimeOfDay?.length > 0 && !this.requiredTimeOfDay.includes(timeOfDay)) {
- return false;
- }
-
- return true;
- }
-
- getDialogueToken(scene: BattleScene, pokemon?: PlayerPokemon): [string, string] {
- return ["timeOfDay", TimeOfDay[scene.arena.getTimeOfDay()].toLocaleLowerCase()];
- }
-}
-
-export class WeatherRequirement extends EncounterSceneRequirement {
- requiredWeather?: WeatherType[];
-
- constructor(weather: WeatherType | WeatherType[]) {
- super();
- if (weather instanceof Array) {
- this.requiredWeather = weather;
- } else {
- this.requiredWeather = [];
- this.requiredWeather.push(weather);
- }
- }
-
- meetsRequirement(scene: BattleScene): boolean {
- const currentWeather = scene.arena?.weather?.weatherType;
- if (!isNullOrUndefined(currentWeather) && this?.requiredWeather?.length > 0 && !this.requiredWeather.includes(currentWeather)) {
- return false;
- }
-
- return true;
- }
- getDialogueToken(scene: BattleScene, pokemon?: PlayerPokemon): [string, string] {
- return ["weather", WeatherType[scene.arena?.weather?.weatherType].replace("_", " ").toLocaleLowerCase()];
- }
-}
-
-export class PartySizeRequirement extends EncounterSceneRequirement {
- partySizeRange: [number, number];
-
- /**
- * Used for specifying a party size requirement
- * If min and max are equivalent, will check for exact size
- * @param partySizeRange - [min, max]
- */
- constructor(partySizeRange: [number, number]) {
- super();
- this.partySizeRange = partySizeRange;
- }
-
- meetsRequirement(scene: BattleScene): boolean {
- if (!isNullOrUndefined(this?.partySizeRange) && this.partySizeRange?.[0] <= this.partySizeRange?.[1]) {
- const partySize = scene.getParty().length;
- if (partySize >= 0 && (this?.partySizeRange?.[0] >= 0 && this.partySizeRange?.[0] > partySize) || (this?.partySizeRange?.[1] >= 0 && this.partySizeRange?.[1] < partySize)) {
- return false;
- }
- }
-
- return true;
- }
-
- getDialogueToken(scene: BattleScene, pokemon?: PlayerPokemon): [string, string] {
- return ["partySize", scene.getParty().length.toString()];
- }
-}
-
-export class PersistentModifierRequirement extends EncounterSceneRequirement {
- requiredItems?: ModifierType[]; // TODO: not implemented
- constructor(item: ModifierType | ModifierType[]) {
- super();
- if (item instanceof Array) {
- this.requiredItems = item;
- } else {
- this.requiredItems = [];
- this.requiredItems.push(item);
- }
- }
-
- meetsRequirement(scene: BattleScene): boolean {
- const items = scene.modifiers;
-
- if (!isNullOrUndefined(items) && this?.requiredItems.length > 0 && this.requiredItems.filter((searchingMod) =>
- items.filter((itemInScene) => itemInScene.type.id === searchingMod.id).length > 0).length === 0) {
- return false;
- }
- return true;
- }
-
- getDialogueToken(scene: BattleScene, pokemon?: PlayerPokemon): [string, string] {
- const requiredItemsInInventory = this.requiredItems.filter((a) => {
- scene.modifiers.filter((itemInScene) => itemInScene.type.id === a.id).length > 0;
- });
- if (requiredItemsInInventory.length > 0) {
- return ["requiredItem", requiredItemsInInventory[0].name];
- }
- return null;
- }
-}
-
-export class MoneyRequirement extends EncounterSceneRequirement {
- requiredMoney: number;
-
- constructor(requiredMoney: number) {
- super();
- this.requiredMoney = requiredMoney;
- }
-
- meetsRequirement(scene: BattleScene): boolean {
- const money = scene.money;
- if (!isNullOrUndefined(money) && this?.requiredMoney > 0 && this.requiredMoney > money) {
- return false;
- }
- return true;
- }
-
- getDialogueToken(scene: BattleScene, pokemon?: PlayerPokemon): [string, string] {
- return ["money", "₽" + scene.money.toString()];
- }
-}
-
-export class SpeciesRequirement extends EncounterPokemonRequirement {
- requiredSpecies: Species[];
- minNumberOfPokemon:number;
- invertQuery:boolean;
-
- constructor(species: Species | Species[], minNumberOfPokemon: number = 1, invertQuery: boolean = false) {
- super();
- this.minNumberOfPokemon = minNumberOfPokemon;
- this.invertQuery = invertQuery;
- if (species instanceof Array) {
- this.requiredSpecies = species;
- } else {
- this.requiredSpecies = [];
- this.requiredSpecies.push(species);
- }
- }
-
- meetsRequirement(scene: BattleScene): boolean {
- const partyPokemon = scene.getParty();
- if (isNullOrUndefined(partyPokemon) || this?.requiredSpecies?.length < 0) {
- return false;
- }
- return this.queryParty(partyPokemon).length >= this.minNumberOfPokemon;
- }
-
- queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] {
- if (!this.invertQuery) {
- return partyPokemon.filter((pokemon) => this.requiredSpecies.filter((species) => pokemon.species.speciesId === species).length > 0);
- } else {
- // for an inverted query, we only want to get the pokemon that don't have ANY of the listed speciess
- return partyPokemon.filter((pokemon) => this.requiredSpecies.filter((species) => pokemon.species.speciesId === species).length === 0);
- }
- }
-
- getDialogueToken(scene: BattleScene, pokemon?: PlayerPokemon): [string, string] {
- if (this.requiredSpecies.includes(pokemon.species.speciesId)) {
- return ["species", Species[pokemon.species.speciesId]];
- }
- return null;
- }
-}
-
-
-export class NatureRequirement extends EncounterPokemonRequirement {
- requiredNature: Nature[];
- minNumberOfPokemon:number;
- invertQuery:boolean;
-
- constructor(nature: Nature | Nature[], minNumberOfPokemon: number = 1, invertQuery: boolean = false) {
- super();
- this.minNumberOfPokemon = minNumberOfPokemon;
- this.invertQuery = invertQuery;
- if (nature instanceof Array) {
- this.requiredNature = nature;
- } else {
- this.requiredNature = [];
- this.requiredNature.push(nature);
- }
- }
-
- meetsRequirement(scene: BattleScene): boolean {
- const partyPokemon = scene.getParty();
- if (isNullOrUndefined(partyPokemon) || this?.requiredNature?.length < 0) {
- return false;
- }
- return this.queryParty(partyPokemon).length >= this.minNumberOfPokemon;
- }
-
- queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] {
- if (!this.invertQuery) {
- return partyPokemon.filter((pokemon) => this.requiredNature.filter((nature) => pokemon.nature === nature).length > 0);
- } else {
- // for an inverted query, we only want to get the pokemon that don't have ANY of the listed natures
- return partyPokemon.filter((pokemon) => this.requiredNature.filter((nature) => pokemon.nature === nature).length === 0);
- }
- }
-
- getDialogueToken(scene: BattleScene, pokemon?: PlayerPokemon): [string, string] {
- if (this.requiredNature.includes(pokemon.nature)) {
- return ["nature", Nature[pokemon.nature]];
- }
- return null;
- }
-}
-
-export class TypeRequirement extends EncounterPokemonRequirement {
- requiredType: Type[];
- minNumberOfPokemon:number;
- invertQuery:boolean;
-
- constructor(type: Type | Type[], minNumberOfPokemon: number = 1, invertQuery: boolean = false) {
- super();
- this.minNumberOfPokemon = minNumberOfPokemon;
- this.invertQuery = invertQuery;
- if (type instanceof Array) {
- this.requiredType = type;
- } else {
- this.requiredType = [];
- this.requiredType.push(type);
- }
- }
-
- meetsRequirement(scene: BattleScene): boolean {
- const partyPokemon = scene.getParty();
- if (isNullOrUndefined(partyPokemon) || this?.requiredType?.length < 0) {
- return false;
- }
- return this.queryParty(partyPokemon).length >= this.minNumberOfPokemon;
- }
-
- queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] {
- if (!this.invertQuery) {
- return partyPokemon.filter((pokemon) => this.requiredType.filter((type) => pokemon.getTypes().includes(type)).length > 0);
- } else {
- // for an inverted query, we only want to get the pokemon that don't have ANY of the listed types
- return partyPokemon.filter((pokemon) => this.requiredType.filter((type) => pokemon.getTypes().includes(type)).length === 0);
- }
- }
-
- getDialogueToken(scene: BattleScene, pokemon?: PlayerPokemon): [string, string] {
- const includedTypes = this.requiredType.filter((ty) => pokemon.getTypes().includes(ty));
- if (includedTypes.length > 0) {
- return ["type", Type[includedTypes[0]]];
- }
- return null;
- }
-}
-
-
-export class MoveRequirement extends EncounterPokemonRequirement {
- requiredMoves: Moves[] = [];
- minNumberOfPokemon:number;
- invertQuery:boolean;
-
- constructor(moves: Moves | Moves[], minNumberOfPokemon: number = 1, invertQuery: boolean = false) {
- super();
- this.minNumberOfPokemon = minNumberOfPokemon;
- this.invertQuery = invertQuery;
- if (moves instanceof Array) {
- this.requiredMoves = moves;
- } else {
- this.requiredMoves = [];
- this.requiredMoves.push(moves);
- }
- }
-
- meetsRequirement(scene: BattleScene): boolean {
- const partyPokemon = scene.getParty();
- if (isNullOrUndefined(partyPokemon) || this?.requiredMoves?.length < 0) {
- return false;
- }
- return this.queryParty(partyPokemon).length >= this.minNumberOfPokemon;
- }
-
- queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] {
- if (!this.invertQuery) {
- return partyPokemon.filter((pokemon) => this.requiredMoves.filter((reqMove) => pokemon.moveset.filter((move) => move.moveId === reqMove).length > 0).length > 0);
- } else {
- // for an inverted query, we only want to get the pokemon that don't have ANY of the listed moves
- return partyPokemon.filter((pokemon) => this.requiredMoves.filter((reqMove) => pokemon.moveset.filter((move) => move.moveId === reqMove).length === 0).length === 0);
- }
- }
-
- getDialogueToken(scene: BattleScene, pokemon?: PlayerPokemon): [string, string] {
- const includedMoves = this.requiredMoves.filter((reqMove) => pokemon.moveset.filter((move) => move.moveId === reqMove).length > 0);
- if (includedMoves.length > 0) {
- return ["move", Moves[includedMoves[0]].replace("_", " ")];
- }
- return null;
- }
-
-}
-
-/**
- * Find out if Pokemon in the party are able to learn one of many specific moves by TM.
- * NOTE: Egg moves are not included as learnable.
- * NOTE: If the Pokemon already knows the move, this requirement will fail, since it's not technically learnable.
- */
-export class CompatibleMoveRequirement extends EncounterPokemonRequirement {
- requiredMoves: Moves[];
- minNumberOfPokemon:number;
- invertQuery:boolean;
-
- constructor(learnableMove: Moves | Moves[], minNumberOfPokemon: number = 1, invertQuery: boolean = false) {
- super();
- this.minNumberOfPokemon = minNumberOfPokemon;
- this.invertQuery = invertQuery;
- if (learnableMove instanceof Array) {
- this.requiredMoves = learnableMove;
- } else {
- this.requiredMoves = [];
- this.requiredMoves.push(learnableMove);
- }
- }
-
- meetsRequirement(scene: BattleScene): boolean {
- const partyPokemon = scene.getParty();
- if (isNullOrUndefined(partyPokemon) || this?.requiredMoves?.length < 0) {
- return false;
- }
- return this.queryParty(partyPokemon).length >= this.minNumberOfPokemon;
- }
-
- queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] {
- if (!this.invertQuery) {
- return partyPokemon.filter((pokemon) => this.requiredMoves.filter((learnableMove) => pokemon.compatibleTms.filter(tm => !pokemon.moveset.find(m => m.moveId === tm)).includes(learnableMove)).length > 0);
- } else {
- // for an inverted query, we only want to get the pokemon that don't have ANY of the listed learnableMoves
- return partyPokemon.filter((pokemon) => this.requiredMoves.filter((learnableMove) => pokemon.compatibleTms.filter(tm => !pokemon.moveset.find(m => m.moveId === tm)).includes(learnableMove)).length === 0);
- }
- }
-
- getDialogueToken(scene: BattleScene, pokemon?: PlayerPokemon): [string, string] {
- const includedCompatMoves = this.requiredMoves.filter((reqMove) => pokemon.compatibleTms.filter((tm) => !pokemon.moveset.find(m => m.moveId === tm)).includes(reqMove));
- if (includedCompatMoves.length > 0) {
- return ["compatibleMove", Moves[includedCompatMoves[0]]];
- }
- return null;
- }
-
-}
-
-/*
-export class EvolutionTargetSpeciesRequirement extends EncounterPokemonRequirement {
- requiredEvolutionTargetSpecies: Species[];
- minNumberOfPokemon:number;
- invertQuery:boolean;
-
- constructor(evolutionTargetSpecies: Species | Species[], minNumberOfPokemon: number = 1, invertQuery: boolean = false) {
- super();
- this.minNumberOfPokemon = minNumberOfPokemon;
- this.invertQuery = invertQuery;
- if (evolutionTargetSpecies instanceof Array) {
- this.requiredEvolutionTargetSpecies = evolutionTargetSpecies;
- } else {
- this.requiredEvolutionTargetSpecies = [];
- this.requiredEvolutionTargetSpecies.push(evolutionTargetSpecies);
- }
- }
-
- meetsRequirement(scene: BattleScene): boolean {
- const partyPokemon = scene.getParty();
- if (isNullOrUndefined(partyPokemon) || this?.requiredEvolutionTargetSpecies?.length < 0) {
- return false;
- }
- return this.queryParty(partyPokemon).length >= this.minNumberOfPokemon;
- }
-
- queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] {
- if (!this.invertQuery) {
- return partyPokemon.filter((pokemon) => this.requiredEvolutionTargetSpecies.filter((evolutionTargetSpecies) => pokemon.getEvolution()?.speciesId === evolutionTargetSpecies).length > 0);
- } else {
- // for an inverted query, we only want to get the pokemon that don't have ANY of the listed evolutionTargetSpeciess
- return partyPokemon.filter((pokemon) => this.requiredEvolutionTargetSpecies.filter((evolutionTargetSpecies) => pokemon.getEvolution()?.speciesId === evolutionTargetSpecies).length === 0);
- }
- }
-
- getMatchingDialogueToken(str:string, pokemon: PlayerPokemon): [RegExp, string] {
- const evos = this.requiredEvolutionTargetSpecies.filter((evolutionTargetSpecies) => pokemon.getEvolution().speciesId === evolutionTargetSpecies);
- if (evos.length > 0) {
- return ["Evolution", Species[evos[0]]];
- }
- return null;
- }
-
-}*/
-
-export class AbilityRequirement extends EncounterPokemonRequirement {
- requiredAbilities: Abilities[];
- minNumberOfPokemon:number;
- invertQuery:boolean;
-
- constructor(abilities: Abilities | Abilities[], minNumberOfPokemon: number = 1, invertQuery: boolean = false) {
- super();
- this.minNumberOfPokemon = minNumberOfPokemon;
- this.invertQuery = invertQuery;
- if (abilities instanceof Array) {
- this.requiredAbilities = abilities;
- } else {
- this.requiredAbilities = [];
- this.requiredAbilities.push(abilities);
- }
- }
-
- meetsRequirement(scene: BattleScene): boolean {
- const partyPokemon = scene.getParty();
- if (isNullOrUndefined(partyPokemon) || this?.requiredAbilities?.length < 0) {
- return false;
- }
- return this.queryParty(partyPokemon).length >= this.minNumberOfPokemon;
- }
-
- queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] {
- if (!this.invertQuery) {
- return partyPokemon.filter((pokemon) => this.requiredAbilities.filter((abilities) => pokemon.hasAbility(abilities)).length > 0);
- } else {
- // for an inverted query, we only want to get the pokemon that don't have ANY of the listed abilitiess
- return partyPokemon.filter((pokemon) => this.requiredAbilities.filter((abilities) => pokemon.hasAbility(abilities)).length === 0);
- }
- }
-
- getDialogueToken(scene: BattleScene, pokemon?: PlayerPokemon): [string, string] {
- const reqAbilities = this.requiredAbilities.filter((a) => {
- pokemon.hasAbility(a);
- });
- if (reqAbilities.length > 0) {
- return ["ability", Abilities[reqAbilities[0]]];
- }
- return null;
- }
-}
-
-export class StatusEffectRequirement extends EncounterPokemonRequirement {
- requiredStatusEffect: StatusEffect[];
- minNumberOfPokemon:number;
- invertQuery:boolean;
-
- constructor(StatusEffect: StatusEffect | StatusEffect[], minNumberOfPokemon: number = 1, invertQuery: boolean = false) {
- super();
- this.minNumberOfPokemon = minNumberOfPokemon;
- this.invertQuery = invertQuery;
- if (StatusEffect instanceof Array) {
- this.requiredStatusEffect = StatusEffect;
- } else {
- this.requiredStatusEffect = [];
- this.requiredStatusEffect.push(StatusEffect);
- }
- }
-
- meetsRequirement(scene: BattleScene): boolean {
- const partyPokemon = scene.getParty();
- if (isNullOrUndefined(partyPokemon) || this?.requiredStatusEffect?.length < 0) {
- return false;
- }
- const x = this.queryParty(partyPokemon).length >= this.minNumberOfPokemon;
- console.log(x);
- return x;
- }
-
- queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] {
- if (!this.invertQuery) {
- return partyPokemon.filter((pokemon) => this.requiredStatusEffect.filter((StatusEffect) => pokemon.status?.effect === StatusEffect).length > 0);
- } else {
- // for an inverted query, we only want to get the pokemon that don't have ANY of the listed StatusEffects
- return partyPokemon.filter((pokemon) => this.requiredStatusEffect.filter((StatusEffect) => pokemon.status?.effect === StatusEffect).length === 0);
- }
- }
-
- getDialogueToken(scene: BattleScene, pokemon?: PlayerPokemon): [string, string] {
- const reqStatus = this.requiredStatusEffect.filter((a) => {
- pokemon.status?.effect ===(a);
- });
- if (reqStatus.length > 0) {
- return ["status", StatusEffect[reqStatus[0]]];
- }
- return null;
- }
-
-}
-
-/**
- * Finds if there are pokemon that can form change with a given item.
- * Notice that we mean specific items, like Charizardite, not the Mega Bracelet.
- * If you want to trigger the event based on the form change enabler, use PersistentModifierRequirement.
- */
-export class CanFormChangeWithItemRequirement extends EncounterPokemonRequirement {
- requiredFormChangeItem: FormChangeItem[];
- minNumberOfPokemon:number;
- invertQuery:boolean;
-
- constructor(formChangeItem: FormChangeItem | FormChangeItem[], minNumberOfPokemon: number = 1, invertQuery: boolean = false) {
- super();
- this.minNumberOfPokemon = minNumberOfPokemon;
- this.invertQuery = invertQuery;
- if (formChangeItem instanceof Array) {
- this.requiredFormChangeItem = formChangeItem;
- } else {
- this.requiredFormChangeItem = [];
- this.requiredFormChangeItem.push(formChangeItem);
- }
- }
-
- meetsRequirement(scene: BattleScene): boolean {
- const partyPokemon = scene.getParty();
- if (isNullOrUndefined(partyPokemon) || this?.requiredFormChangeItem?.length < 0) {
- return false;
- }
- return this.queryParty(partyPokemon).length >= this.minNumberOfPokemon;
- }
- filterByForm(pokemon, formChangeItem) {
- if (pokemonFormChanges.hasOwnProperty(pokemon.species.speciesId)
- // Get all form changes for this species with an item trigger, including any compound triggers
- && pokemonFormChanges[pokemon.species.speciesId].filter(fc => fc.trigger.hasTriggerType(SpeciesFormChangeItemTrigger))
- // Returns true if any form changes match this item
- .map(fc => fc.findTrigger(SpeciesFormChangeItemTrigger) as SpeciesFormChangeItemTrigger)
- .flat().flatMap(fc => fc.item).includes(formChangeItem)) {
- return true;
- } else {
- return false;
- }
- }
-
- queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] {
- if (!this.invertQuery) {
- return partyPokemon.filter((pokemon) => this.requiredFormChangeItem.filter((formChangeItem) => this.filterByForm(pokemon, formChangeItem)).length > 0);
- } else {
- // for an inverted query, we only want to get the pokemon that don't have ANY of the listed formChangeItems
- return partyPokemon.filter((pokemon) => this.requiredFormChangeItem.filter((formChangeItem) => this.filterByForm(pokemon, formChangeItem)).length === 0);
- }
- }
-
- getDialogueToken(scene: BattleScene, pokemon?: PlayerPokemon): [string, string] {
- const requiredItems = this.requiredFormChangeItem.filter((formChangeItem) => this.filterByForm(pokemon, formChangeItem));
- if (requiredItems.length > 0) {
- return ["formChangeItem", FormChangeItem[requiredItems[0]]];
- }
- return null;
- }
-
-}
-
-export class CanEvolveWithItemRequirement extends EncounterPokemonRequirement {
- requiredEvolutionItem: EvolutionItem[];
- minNumberOfPokemon:number;
- invertQuery:boolean;
-
- constructor(evolutionItems: EvolutionItem | EvolutionItem[], minNumberOfPokemon: number = 1, invertQuery: boolean = false) {
- super();
- this.minNumberOfPokemon = minNumberOfPokemon;
- this.invertQuery = invertQuery;
- if (evolutionItems instanceof Array) {
- this.requiredEvolutionItem = evolutionItems;
- } else {
- this.requiredEvolutionItem = [];
- this.requiredEvolutionItem.push(evolutionItems);
- }
- }
-
- meetsRequirement(scene: BattleScene): boolean {
- const partyPokemon = scene.getParty();
- if (isNullOrUndefined(partyPokemon) || this?.requiredEvolutionItem?.length < 0) {
- return false;
- }
- return this.queryParty(partyPokemon).length >= this.minNumberOfPokemon;
- }
-
- filterByEvo(pokemon, evolutionItem) {
- if (pokemonEvolutions.hasOwnProperty(pokemon.species.speciesId) && pokemonEvolutions[pokemon.species.speciesId].filter(e => e.item === evolutionItem
- && (!e.condition || e.condition.predicate(pokemon))).length && (pokemon.getFormKey() !== SpeciesFormKey.GIGANTAMAX)) {
- return true;
- } else if (pokemon.isFusion() && pokemonEvolutions.hasOwnProperty(pokemon.fusionSpecies.speciesId) && pokemonEvolutions[pokemon.fusionSpecies.speciesId].filter(e => e.item === evolutionItem
- && (!e.condition || e.condition.predicate(pokemon))).length && (pokemon.getFusionFormKey() !== SpeciesFormKey.GIGANTAMAX)) {
- return true;
- }
- return false;
- }
-
- queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] {
- if (!this.invertQuery) {
- return partyPokemon.filter((pokemon) => this.requiredEvolutionItem.filter((evolutionItem) => this.filterByEvo(pokemon, evolutionItem)).length > 0);
- } else {
- // for an inverted query, we only want to get the pokemon that don't have ANY of the listed evolutionItemss
- return partyPokemon.filter((pokemon) => this.requiredEvolutionItem.filter((evolutionItems) => this.filterByEvo(pokemon, evolutionItems)).length === 0);
- }
- }
-
- getDialogueToken(scene: BattleScene, pokemon?: PlayerPokemon): [string, string] {
- const requiredItems = this.requiredEvolutionItem.filter((evoItem) => this.filterByEvo(pokemon, evoItem));
- if (requiredItems.length > 0) {
- return ["evolutionItem", EvolutionItem[requiredItems[0]]];
- }
- return null;
- }
-}
-
-export class HeldItemRequirement extends EncounterPokemonRequirement {
- requiredHeldItemModifier: PokemonHeldItemModifierType[];
- minNumberOfPokemon:number;
- invertQuery:boolean;
-
- constructor(heldItem: PokemonHeldItemModifierType | PokemonHeldItemModifierType[], minNumberOfPokemon: number = 1, invertQuery: boolean = false) {
- super();
- this.minNumberOfPokemon = minNumberOfPokemon;
- this.invertQuery = invertQuery;
- if (heldItem instanceof Array) {
- this.requiredHeldItemModifier = heldItem;
- } else {
- this.requiredHeldItemModifier = [];
- this.requiredHeldItemModifier.push(heldItem);
- }
- }
-
- meetsRequirement(scene: BattleScene): boolean {
- const partyPokemon = scene.getParty();
- if (isNullOrUndefined(partyPokemon) || this?.requiredHeldItemModifier?.length < 0) {
- return false;
- }
- return this.queryParty(partyPokemon).length >= this.minNumberOfPokemon;
- }
-
- queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] {
- if (!this.invertQuery) {
- return partyPokemon.filter((pokemon) => this.requiredHeldItemModifier.filter((heldItem) => pokemon.getHeldItems().filter((it) => it.type.id === heldItem.id).length > 0).length > 0);
- } else {
- // for an inverted query, we only want to get the pokemon that don't have ANY of the listed heldItems
- return partyPokemon.filter((pokemon) => this.requiredHeldItemModifier.filter((heldItem) => pokemon.getHeldItems().filter((it) => it.type.id === heldItem.id).length === 0).length === 0);
- }
- }
-
- getDialogueToken(scene: BattleScene, pokemon?: PlayerPokemon): [string, string] {
- const requiredItems = this.requiredHeldItemModifier.filter((a) => {
- pokemon.getHeldItems().filter((it) => it.type.id === a.id ).length > 0;
- });
- if (requiredItems.length > 0) {
- return ["heldItem", requiredItems[0].name];
- }
- return null;
- }
-}
-
-export class LevelRequirement extends EncounterPokemonRequirement {
- requiredLevelRange?: [number, number];
- minNumberOfPokemon:number;
- invertQuery:boolean;
-
- constructor(requiredLevelRange: [number, number], minNumberOfPokemon: number = 1, invertQuery: boolean = false) {
- super();
- this.minNumberOfPokemon = minNumberOfPokemon;
- this.invertQuery = invertQuery;
- this.requiredLevelRange = requiredLevelRange;
-
- }
-
- meetsRequirement(scene: BattleScene): boolean {
- // Party Pokemon inside required level range
- if (!isNullOrUndefined(this?.requiredLevelRange) && this.requiredLevelRange?.[0] <= this.requiredLevelRange?.[1]) {
- const partyPokemon = scene.getParty();
- const pokemonInRange = this.queryParty(partyPokemon);
- if (pokemonInRange.length < this.minNumberOfPokemon) {
- return false;
- }
- }
- return true;
- }
-
- queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] {
- if (!this.invertQuery) {
- return partyPokemon.filter((pokemon) => pokemon.level >= this.requiredLevelRange[0] && pokemon.level <= this.requiredLevelRange[1]);
- } else {
- // for an inverted query, we only want to get the pokemon that don't have ANY of the listed requiredLevelRanges
- return partyPokemon.filter((pokemon) => pokemon.level < this.requiredLevelRange[0] || pokemon.level > this.requiredLevelRange[1]);
- }
- }
-
- getDialogueToken(scene: BattleScene, pokemon?: PlayerPokemon): [string, string] {
- return ["level", pokemon.level.toString()];
- }
-}
-
-export class FriendshipRequirement extends EncounterPokemonRequirement {
- requiredFriendshipRange?: [number, number];
- minNumberOfPokemon:number;
- invertQuery:boolean;
-
- constructor(requiredFriendshipRange: [number, number], minNumberOfPokemon: number = 1, invertQuery: boolean = false) {
- super();
- this.minNumberOfPokemon = minNumberOfPokemon;
- this.invertQuery = invertQuery;
- this.requiredFriendshipRange = requiredFriendshipRange;
- }
-
- meetsRequirement(scene: BattleScene): boolean {
- // Party Pokemon inside required friendship range
- if (!isNullOrUndefined(this?.requiredFriendshipRange) && this.requiredFriendshipRange?.[0] <= this.requiredFriendshipRange?.[1]) {
- const partyPokemon = scene.getParty();
- const pokemonInRange = this.queryParty(partyPokemon);
- if (pokemonInRange.length < this.minNumberOfPokemon) {
- return false;
- }
- }
- return true;
- }
-
- queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] {
- if (!this.invertQuery) {
- return partyPokemon.filter((pokemon) => pokemon.friendship >= this.requiredFriendshipRange[0] && pokemon.friendship <= this.requiredFriendshipRange[1]);
- } else {
- // for an inverted query, we only want to get the pokemon that don't have ANY of the listed requiredFriendshipRanges
- return partyPokemon.filter((pokemon) => pokemon.friendship < this.requiredFriendshipRange[0] || pokemon.friendship > this.requiredFriendshipRange[1]);
- }
- }
-
- getDialogueToken(scene: BattleScene, pokemon?: PlayerPokemon): [string, string] {
- return ["friendship", pokemon.friendship.toString()];
- }
-}
-
-/**
- * .1 -> 10% hp
- * .5 -> 50% hp
- * 1 -> 100% hp
- */
-export class HealthRatioRequirement extends EncounterPokemonRequirement {
- requiredHealthRange?: [number, number];
- minNumberOfPokemon:number;
- invertQuery:boolean;
-
- constructor(requiredHealthRange: [number, number], minNumberOfPokemon: number = 1, invertQuery: boolean = false) {
- super();
- this.minNumberOfPokemon = minNumberOfPokemon;
- this.invertQuery = invertQuery;
- this.requiredHealthRange = requiredHealthRange;
- }
-
- meetsRequirement(scene: BattleScene): boolean {
- // Party Pokemon inside required level range
- if (!isNullOrUndefined(this?.requiredHealthRange) && this.requiredHealthRange?.[0] <= this.requiredHealthRange?.[1]) {
- const partyPokemon = scene.getParty();
- const pokemonInRange = this.queryParty(partyPokemon);
- if (pokemonInRange.length < this.minNumberOfPokemon) {
- return false;
- }
- }
- return true;
- }
-
- queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] {
- if (!this.invertQuery) {
- return partyPokemon.filter((pokemon) => pokemon.getHpRatio() >= this.requiredHealthRange[0] && pokemon.getHpRatio() <= this.requiredHealthRange[1]);
- } else {
- // for an inverted query, we only want to get the pokemon that don't have ANY of the listed requiredHealthRanges
- return partyPokemon.filter((pokemon) => pokemon.getHpRatio() < this.requiredHealthRange[0] || pokemon.getHpRatio() > this.requiredHealthRange[1]);
- }
- }
-
- getDialogueToken(scene: BattleScene, pokemon?: PlayerPokemon): [string, string] {
- return ["healthRatio", Math.floor(pokemon.getHpRatio()*100).toString() + "%"];
- }
-}
-
-export class WeightRequirement extends EncounterPokemonRequirement {
- requiredWeightRange?: [number, number];
- minNumberOfPokemon:number;
- invertQuery:boolean;
-
- constructor(requiredWeightRange: [number, number], minNumberOfPokemon: number = 1, invertQuery: boolean = false) {
- super();
- this.minNumberOfPokemon = minNumberOfPokemon;
- this.invertQuery = invertQuery;
- this.requiredWeightRange = requiredWeightRange;
- }
-
- meetsRequirement(scene: BattleScene): boolean {
- // Party Pokemon inside required friendship range
- if (!isNullOrUndefined(this?.requiredWeightRange) && this.requiredWeightRange?.[0] <= this.requiredWeightRange?.[1]) {
- const partyPokemon = scene.getParty();
- const pokemonInRange = this.queryParty(partyPokemon);
- if (pokemonInRange.length < this.minNumberOfPokemon) {
- return false;
- }
- }
- return true;
- }
-
- queryParty(partyPokemon: PlayerPokemon[]): PlayerPokemon[] {
- if (!this.invertQuery) {
- return partyPokemon.filter((pokemon) => pokemon.getWeight() >= this.requiredWeightRange[0] && pokemon.getWeight() <= this.requiredWeightRange[1]);
- } else {
- // for an inverted query, we only want to get the pokemon that don't have ANY of the listed requiredWeightRanges
- return partyPokemon.filter((pokemon) => pokemon.getWeight() < this.requiredWeightRange[0] || pokemon.getWeight() > this.requiredWeightRange[1]);
- }
- }
-
- getDialogueToken(scene: BattleScene, pokemon?: PlayerPokemon): [string, string] {
- return ["weight", pokemon.getWeight().toString()];
- }
-}
diff --git a/src/data/mystery-encounter.ts b/src/data/mystery-encounter.ts
deleted file mode 100644
index 8325a26d29df..000000000000
--- a/src/data/mystery-encounter.ts
+++ /dev/null
@@ -1,489 +0,0 @@
-import BattleScene from "../battle-scene";
-import MysteryEncounterIntroVisuals, { MysteryEncounterSpriteConfig } from "../field/mystery-encounter-intro";
-import { MysteryEncounterType } from "#enums/mystery-encounter-type";
-import MysteryEncounterDialogue, {
- allMysteryEncounterDialogue
-} from "./mystery-encounters/dialogue/mystery-encounter-dialogue";
-import MysteryEncounterOption from "./mystery-encounter-option";
-import { EncounterPokemonRequirement, EncounterSceneRequirement } from "./mystery-encounter-requirements";
-import * as Utils from "../utils";
-import {EnemyPartyConfig} from "#app/data/mystery-encounters/mystery-encounter-utils";
-import { PlayerPokemon } from "#app/field/pokemon";
-import {isNullOrUndefined} from "../utils";
-
-export enum MysteryEncounterVariant {
- DEFAULT,
- TRAINER_BATTLE,
- WILD_BATTLE,
- BOSS_BATTLE,
- NO_BATTLE
-}
-
-export enum MysteryEncounterTier {
- COMMON,
- UNCOMMON,
- RARE,
- SUPER_RARE,
- ULTRA_RARE // Not currently used
-}
-
-export default interface MysteryEncounter {
- /**
- * Required params
- */
- encounterType: MysteryEncounterType;
- options: [MysteryEncounterOption, MysteryEncounterOption, ...MysteryEncounterOption[]];
- spriteConfigs: MysteryEncounterSpriteConfig[];
- /**
- * Optional params
- */
- encounterTier?: MysteryEncounterTier;
- hideBattleIntroMessage?: boolean;
- hideIntroVisuals?: boolean;
- catchAllowed?: boolean;
- doEncounterRewards?: (scene: BattleScene) => boolean;
- onInit?: (scene: BattleScene) => boolean;
-
- /**
- * Requirements
- */
- requirements?: EncounterSceneRequirement[];
- primaryPokemonRequirements?: EncounterPokemonRequirement[];
- secondaryPokemonRequirements ?: EncounterPokemonRequirement[]; // A list of requirements that must ALL be met by a subset of pokemon to trigger the event
- excludePrimaryFromSupportRequirements?: boolean;
- // Primary Pokemon is a single pokemon randomly selected from a set of pokemon that meet ALL primary pokemon requirements
- primaryPokemon?: PlayerPokemon;
- // Support Pokemon are pokemon that meet ALL support pokemon requirements.
- // Note that an individual requirement may require multiple pokemon, but the resulting pokemon after all secondary requirements are met may be lower than expected
- // If the primary pokemon and supporting pokemon are the same and ExcludePrimaryFromSupportRequirements flag is true, primary pokemon may be promoted from secondary pool
- secondaryPokemon?: PlayerPokemon[];
-
- /**
- * Post-construct / Auto-populated params
- */
-
- /**
- * Dialogue object containing all the dialogue, messages, tooltips, etc. for an encounter
- */
- dialogue?: MysteryEncounterDialogue;
- /**
- * Data used for setting up/initializing enemy party in battles
- * Can store multiple configs so that one can be chosen based on option selected
- */
- enemyPartyConfigs?: EnemyPartyConfig[];
- /**
- * Object instance containing sprite data for an encounter when it is being spawned
- * Otherwise, will be undefined
- * You probably shouldn't do anything with this unless you have a very specific need
- */
- introVisuals?: MysteryEncounterIntroVisuals;
-
- /**
- * Flags
- */
-
- /**
- * Can be set for uses programatic dialogue during an encounter (storing the name of one of the party's pokemon, etc.)
- * Example use: see MYSTERIOUS_CHEST
- */
- dialogueTokens?: Map;
- /**
- * Should be set depending upon option selected as part of an encounter
- * For example, if there is no battle as part of the encounter/selected option, should be set to NO_BATTLE
- * Defaults to DEFAULT
- */
- encounterVariant?: MysteryEncounterVariant;
- /**
- * Flag for checking if it's the first time a shop is being shown for an encounter.
- * Defaults to true so that the first shop does not override the specified rewards.
- * Will be set to false after a shop is shown (so can't reroll same rarity items for free)
- */
- lockEncounterRewardTiers?: boolean;
- /**
- * Will be set by option select handlers automatically, and can be used to refer to which option was chosen by later phases
- */
- selectedOption?: MysteryEncounterOption;
- /**
- * Can be set higher or lower based on the type of battle or exp gained for an option/encounter
- * Defaults to 1
- */
- expMultiplier?: number;
-
- /**
- * Generic property to set any custom data required for the encounter
- */
- misc?: any;
-}
-
-/**
- * MysteryEncounter class that defines the logic for a single encounter
- * These objects will be saved as part of session data any time the player is on a floor with an encounter
- * Unless you know what you're doing, you should use MysteryEncounterBuilder to create an instance for this class
- */
-export default class MysteryEncounter implements MysteryEncounter {
- constructor(encounter: MysteryEncounter) {
- if (!isNullOrUndefined(encounter)) {
- Object.assign(this, encounter);
- }
- this.encounterTier = this.encounterTier ? this.encounterTier : MysteryEncounterTier.COMMON;
- this.dialogue = allMysteryEncounterDialogue[this.encounterType];
- this.encounterVariant = MysteryEncounterVariant.DEFAULT;
- this.requirements = this.requirements ? this.requirements : [];
- this.hideBattleIntroMessage = !isNullOrUndefined(this.hideBattleIntroMessage) ? this.hideBattleIntroMessage : false;
- this.hideIntroVisuals = !isNullOrUndefined(this.hideIntroVisuals) ? this.hideIntroVisuals : true;
-
- // Populate options with respective dialogue
- if (this.dialogue) {
- this.options.forEach((o, i) => o.dialogue = this.dialogue.encounterOptionsDialogue.options[i]);
- }
-
- // Reset any dirty flags or encounter data
- this.lockEncounterRewardTiers = true;
- this.dialogueTokens = new Map;
- this.enemyPartyConfigs = [];
- this.introVisuals = null;
- this.misc = null;
- this.expMultiplier = 1;
- }
-
- /**
- * Checks if the current scene state meets the requirements for the MysteryEncounter to spawn
- * This is used to filter the pool of encounters down to only the ones with all requirements met
- * @param scene
- * @returns
- */
- meetsRequirements?(scene: BattleScene) {
- const sceneReq = !this.requirements.some(requirement => !requirement.meetsRequirement(scene));
- const secReqs = this.meetsSecondaryRequirementAndSecondaryPokemonSelected(scene); // secondary is checked first to handle cases of primary overlapping with secondary
- const priReqs = this.meetsPrimaryRequirementAndPrimaryPokemonSelected(scene);
-
- // console.log("-------" + MysteryEncounterType[this.encounterType] + " Encounter Check -------");
- // console.log(this);
- // console.log( "sceneCheck: " + sceneReq);
- // console.log( "primaryCheck: " + priReqs);
- // console.log( "secondaryCheck: " + secReqs);
- // console.log(MysteryEncounterTier[this.encounterTier]);
-
- return sceneReq && secReqs && priReqs;
- }
-
- private meetsPrimaryRequirementAndPrimaryPokemonSelected?(scene: BattleScene) {
- if (this.primaryPokemonRequirements.length === 0) {
- const activeMon = scene.getParty().filter(p => p.isActive(true));
- if (activeMon.length > 0) {
- this.primaryPokemon = activeMon[0];
- } else {
- this.primaryPokemon = scene.getParty().filter(p => !p.isFainted())[0];
- }
- return true;
- }
- let qualified:PlayerPokemon[] = scene.getParty();
- for (const req of this.primaryPokemonRequirements) {
- console.log(req);
- if (req.meetsRequirement(scene)) {
- if (req instanceof EncounterPokemonRequirement) {
- qualified = qualified.filter(pkmn => req.queryParty(scene.getParty()).includes(pkmn));
- }
- } else {
- this.primaryPokemon = null;
- return false;
- }
- }
-
- if (qualified.length === 0) {
- return false;
- }
-
- if (this.excludePrimaryFromSupportRequirements && this.secondaryPokemon) {
- const truePrimaryPool = [];
- const overlap = [];
- for (const qp of qualified) {
- if (!this.secondaryPokemon.includes(qp)) {
- truePrimaryPool.push(qp);
- } else {
- overlap.push(qp);
- }
-
- }
- if (truePrimaryPool.length > 0) {
- // always choose from the non-overlapping pokemon first
- this.primaryPokemon = truePrimaryPool[Utils.randSeedInt(truePrimaryPool.length, 0)];
- return true;
- } else {
- // if there are multiple overlapping pokemon, we're okay - just choose one and take it out of the primary pokemon pool
- if (overlap.length > 1 || (this.secondaryPokemon.length - overlap.length >= 1)) {
- // is this working?
- this.primaryPokemon = overlap[Utils.randSeedInt(overlap.length, 0)];
- this.secondaryPokemon = this.secondaryPokemon.filter((supp)=> supp !== this.primaryPokemon);
- return true;
- }
- console.log("Mystery Encounter Edge Case: Requirement not met due to primary pokemon overlapping with secondary pokemon. There's no valid primary pokemon left.");
- return false;
- }
- } else {
- // this means we CAN have the same pokemon be a primary and secondary pokemon, so just choose any qualifying one randomly.
- this.primaryPokemon = qualified[Utils.randSeedInt(qualified.length, 0)];
- return true;
- }
- }
-
- private meetsSecondaryRequirementAndSecondaryPokemonSelected?(scene: BattleScene) {
- if (!this.secondaryPokemonRequirements) {
- this.secondaryPokemon = [];
- return true;
- }
-
- let qualified:PlayerPokemon[] = scene.getParty();
- for (const req of this.secondaryPokemonRequirements) {
- if (req.meetsRequirement(scene)) {
- if (req instanceof EncounterPokemonRequirement) {
- qualified = qualified.filter(pkmn => req.queryParty(scene.getParty()).includes(pkmn));
-
- }
- } else {
- this.secondaryPokemon = [];
- return false;
- }
- }
- this.secondaryPokemon = qualified;
- return true;
- }
-
- /**
- * Initializes encounter intro sprites based on the sprite configs defined in spriteConfigs
- * @param scene
- */
- initIntroVisuals?(scene: BattleScene) {
- this.introVisuals = new MysteryEncounterIntroVisuals(scene, this);
- }
-
- /**
- * Auto-pushes dialogue tokens from the encounter (and option) requirements.
- * Will use the first support pokemon in list
- * For multiple support pokemon in the dialogue token, it will have to be overridden.
- */
- populateDialogueTokensFromRequirements?(scene: BattleScene) {
- if (this.primaryPokemon?.length > 0) {
- this.setDialogueToken("primaryName", this.primaryPokemon.name);
- for (const req of this.primaryPokemonRequirements) {
- if (!req.invertQuery) {
- const value = req.getDialogueToken(scene, this.primaryPokemon);
- this.setDialogueToken("primary" + this.capitalizeFirstLetter(value[0]), value[1]);
- }
- }
- }
- if (this.secondaryPokemonRequirements?.length > 0 && this.secondaryPokemon?.length > 0) {
- this.setDialogueToken("secondaryName", this.secondaryPokemon[0].name);
- for (const req of this.secondaryPokemonRequirements) {
- if (!req.invertQuery) {
- const value = req.getDialogueToken(scene, this.secondaryPokemon[0]);
- this.setDialogueToken("secondary" + this.capitalizeFirstLetter(value[0]), value[1]);
- }
- }
- }
- for (let i = 0; i < this.options.length; i++) {
- const opt = this.options[i];
- const j = i + 1;
- if (opt.primaryPokemonRequirements?.length > 0 && opt.primaryPokemon?.length > 0) {
- this.setDialogueToken("option" + j + "PrimaryName", opt.primaryPokemon.name);
- for (const req of opt.primaryPokemonRequirements) {
- if (!req.invertQuery) {
- const value = req.getDialogueToken(scene, opt.primaryPokemon);
- this.setDialogueToken("option" + j + "Primary", value[1]);
- }
- }
- }
- if (opt.secondaryPokemonRequirements?.length > 0 && opt.secondaryPokemon?.length > 0) {
- this.setDialogueToken("option" + j + "SecondaryName", opt.secondaryPokemon[0].name);
- for (const req of opt.secondaryPokemonRequirements) {
- if (!req.invertQuery) {
- const value = req.getDialogueToken(scene, opt.secondaryPokemon[0]);
- this.setDialogueToken("option" + j + "Secondary", value[1]);
- }
- }
- }
- }
- }
-
- setDialogueToken?(key: string, value: string) {
- this.dialogueTokens.set(key, [new RegExp("@ec\{" + key + "\\}", "gi"), value]);
- }
-
- private capitalizeFirstLetter?(str: string) {
- return str.charAt(0).toUpperCase() + str.slice(1);
- }
-}
-
-export class MysteryEncounterBuilder implements Partial {
- encounterType?: MysteryEncounterType;
- options?: [MysteryEncounterOption, MysteryEncounterOption, ...MysteryEncounterOption[]] = [null, null];
- spriteConfigs?: MysteryEncounterSpriteConfig[];
-
- dialogue?: MysteryEncounterDialogue;
- encounterTier?: MysteryEncounterTier;
- requirements?: EncounterSceneRequirement[] = [];
- primaryPokemonRequirements?: EncounterPokemonRequirement[] = [];
- secondaryPokemonRequirements ?: EncounterPokemonRequirement[] = [];
- excludePrimaryFromSupportRequirements?: boolean;
- dialogueTokens?: Map;
- doEncounterRewards?: (scene: BattleScene) => boolean;
- onInit?: (scene: BattleScene) => boolean;
- hideBattleIntroMessage?: boolean;
- hideIntroVisuals?: boolean;
- enemyPartyConfigs?: EnemyPartyConfig[] = [];
-
- /**
- * REQUIRED
- */
-
- /**
- * Defines the type of encounter which is used as an identifier, should be tied to a unique MysteryEncounterType
- * @param encounterType
- * @returns this
- */
- withEncounterType(encounterType: MysteryEncounterType): this & Pick {
- return Object.assign(this, { encounterType: encounterType });
- }
-
- /**
- * Defines an option for the encounter
- * There should be at least 2 options defined and no more than 4
- * @param option - MysteryEncounterOption to add, can use MysteryEncounterOptionBuilder to create instance
- * @returns
- */
- withOption(option: MysteryEncounterOption): this & Pick {
- if (this.options[0] === null) {
- return Object.assign(this, { options: [ option, this.options[0] ] });
- } else if (this.options[1] === null) {
- return Object.assign(this, { options: [this.options[0], option ] });
- } else {
- this.options.push(option);
- return Object.assign(this, { options: this.options });
- }
- }
-
- /**
- * Defines the sprites that will be shown on the enemy field when the encounter spawns
- * Can be one or more sprites, recommended not to exceed 4
- * @param spriteConfigs
- * @returns
- */
- withIntroSpriteConfigs(spriteConfigs: MysteryEncounterSpriteConfig[]): this & Pick {
- return Object.assign(this, { spriteConfigs: spriteConfigs });
- }
-
- /**
- * OPTIONAL
- */
-
- /**
- * Sets the rarity tier for an encounter
- * If not specified, defaults to COMMON
- * Tiers are:
- * COMMON 32/64 odds
- * UNCOMMON 16/64 odds
- * RARE 10/64 odds
- * SUPER_RARE 6/64 odds
- * ULTRA_RARE Not currently used
- * @param encounterTier
- * @returns
- */
- withEncounterTier(encounterTier: MysteryEncounterTier): this & Required> {
- return Object.assign(this, { encounterTier: encounterTier });
- }
-
- /**
- * Specifies a requirement for an encounter
- * For example, passing requirement as "new WaveCountRequirement([2, 180])" would create a requirement that the encounter can only be spawned between waves 2 and 180
- * Existing Requirement objects are defined in mystery-encounter-requirements.ts, and more can always be created to meet a requirement need
- * @param requirement
- * @returns
- */
- withSceneRequirement(requirement: EncounterSceneRequirement): this & Required> {
- if (requirement instanceof EncounterPokemonRequirement) {
- Error("Incorrectly added pokemon requirement as scene requirement.");
- }
- this.requirements.push(requirement);
- return Object.assign(this, { requirements: this.requirements });
- }
-
- withPrimaryPokemonRequirement(requirement: EncounterPokemonRequirement): this & Required> {
- this.primaryPokemonRequirements.push(requirement);
- return Object.assign(this, { primaryPokemonRequirements: this.primaryPokemonRequirements });
- }
-
- // TODO: Maybe add an optional parameter for excluding primary pokemon from the support cast?
- // ex. if your only grass type pokemon, a snivy, is chosen as primary, if the support pokemon requires a grass type, the event won't trigger because
- // it's already been
- withSecondaryPokemonRequirement(requirement: EncounterPokemonRequirement, excludePrimaryFromSecondaryRequirements:boolean = false): this & Required> {
- this.secondaryPokemonRequirements.push(requirement);
- this.excludePrimaryFromSupportRequirements = excludePrimaryFromSecondaryRequirements;
- return Object.assign(this, { excludePrimaryFromSecondaryRequirements: this.excludePrimaryFromSupportRequirements, secondaryPokemonRequirements: this.secondaryPokemonRequirements });
- }
-
- /**
- * Can set custom encounter rewards via this callback function
- * If rewards are always deterministic for an encounter, this is a good way to set them
- *
- * NOTE: If rewards are dependent on options selected, runtime data, etc.,
- * It may be better to programmatically set doEncounterRewards elsewhere.
- * For instance, doEncounterRewards could instead be set inside the onOptionPhase() callback function for a MysteryEncounterOption
- * Check other existing mystery encounters for examples on how to use this
- * @param doEncounterRewards - synchronous callback function to perform during rewards phase of the encounter
- * @returns
- */
- withRewards(doEncounterRewards: (scene: BattleScene) => boolean): this & Required> {
- return Object.assign(this, { doEncounterRewards: doEncounterRewards });
- }
-
- /**
- * Can be used to perform init logic before intro visuals are shown and before the MysteryEncounterPhase begins
- * Useful for performing things like procedural generation of intro sprites, etc.
- *
- * @param onInit - synchronous callback function to perform as soon as the encounter is selected for the next phase
- * @returns
- */
- withOnInit(onInit: (scene: BattleScene) => boolean): this & Required> {
- return Object.assign(this, { onInit: onInit });
- }
-
- /**
- * Defines any enemies to use for a battle from the mystery encounter
- * @param enemyPartyConfig
- * @returns
- */
- withEnemyPartyConfig(enemyPartyConfig: EnemyPartyConfig): this & Required> {
- this.enemyPartyConfigs.push(enemyPartyConfig);
- return Object.assign(this, { enemyPartyConfigs: this.enemyPartyConfigs });
- }
-
- /**
- * Can set whether catching is allowed or not on the encounter
- * This flag can also be programmatically set inside option event functions or elsewhere
- * @param catchAllowed - if true, allows enemy pokemon to be caught during the encounter
- * @returns
- */
- withCatchAllowed(catchAllowed: boolean): this & Required> {
- return Object.assign(this, { catchAllowed: catchAllowed });
- }
-
- /**
- * @param hideBattleIntroMessage - if true, will not show the trainerAppeared/wildAppeared/bossAppeared message for an encounter
- * @returns
- */
- withHideWildIntroMessage(hideBattleIntroMessage: boolean): this & Required> {
- return Object.assign(this, { hideBattleIntroMessage: hideBattleIntroMessage });
- }
-
- /**
- * @param hideIntroVisuals - if false, will not hide the intro visuals that are displayed at the beginning of encounter
- * @returns
- */
- withHideIntroVisuals(hideIntroVisuals: boolean): this & Required> {
- return Object.assign(this, { hideIntroVisuals: hideIntroVisuals });
- }
-
- build(this: MysteryEncounter) {
- return new MysteryEncounter(this);
- }
-}
diff --git a/src/data/mystery-encounters/dark-deal.ts b/src/data/mystery-encounters/dark-deal.ts
deleted file mode 100644
index 170e9ac01b73..000000000000
--- a/src/data/mystery-encounters/dark-deal.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-import BattleScene from "../../battle-scene";
-import {AddPokeballModifierType} from "../../modifier/modifier-type";
-import {
- EnemyPartyConfig, EnemyPokemonConfig,
- getRandomPlayerPokemon,
- getRandomSpeciesByStarterTier,
- initBattleWithEnemyConfig,
- leaveEncounterWithoutBattle
-} from "./mystery-encounter-utils";
-import MysteryEncounter, {MysteryEncounterBuilder, MysteryEncounterTier} from "../mystery-encounter";
-import {ModifierRewardPhase} from "#app/phases";
-import {getPokemonSpecies} from "../pokemon-species";
-import {MysteryEncounterType} from "#enums/mystery-encounter-type";
-import {PokeballType} from "../pokeball";
-import {PartySizeRequirement, WaveCountRequirement} from "../mystery-encounter-requirements";
-import {MysteryEncounterOptionBuilder} from "../mystery-encounter-option";
-import {Type} from "#app/data/type";
-import {Species} from "#enums/species";
-import {isNullOrUndefined, randSeedInt} from "#app/utils";
-
-// Exclude Ultra Beasts, Paradox, Necrozma, Eternatus, and egg-locked mythicals
-const excludedBosses = [
- Species.NECROZMA,
- Species.ETERNATUS,
- Species.NIHILEGO,
- Species.BUZZWOLE,
- Species.PHEROMOSA,
- Species.XURKITREE,
- Species.CELESTEELA,
- Species.KARTANA,
- Species.GUZZLORD,
- Species.POIPOLE,
- Species.NAGANADEL,
- Species.STAKATAKA,
- Species.BLACEPHALON,
- Species.GREAT_TUSK,
- Species.SCREAM_TAIL,
- Species.BRUTE_BONNET,
- Species.FLUTTER_MANE,
- Species.SLITHER_WING,
- Species.SANDY_SHOCKS,
- Species.ROARING_MOON,
- Species.KORAIDON,
- Species.WALKING_WAKE,
- Species.GOUGING_FIRE,
- Species.RAGING_BOLT,
- Species.IRON_TREADS,
- Species.IRON_BUNDLE,
- Species.IRON_HANDS,
- Species.IRON_JUGULIS,
- Species.IRON_MOTH,
- Species.IRON_THORNS,
- Species.IRON_VALIANT,
- Species.MIRAIDON,
- Species.IRON_LEAVES,
- Species.IRON_BOULDER,
- Species.IRON_CROWN,
- Species.MEW,
- Species.CELEBI,
- Species.DEOXYS,
- Species.JIRACHI,
- Species.PHIONE,
- Species.MANAPHY,
- Species.ARCEUS,
- Species.VICTINI,
- Species.MELTAN,
- Species.PECHARUNT
-];
-
-export const DarkDealEncounter: MysteryEncounter = new MysteryEncounterBuilder()
- .withEncounterType(MysteryEncounterType.DARK_DEAL)
- .withEncounterTier(MysteryEncounterTier.ULTRA_RARE)
- .withIntroSpriteConfigs([
- {
- spriteKey: "mad_scientist_m",
- fileRoot: "mystery-encounters",
- hasShadow: true
- },
- {
- spriteKey: "dark_deal_porygon",
- fileRoot: "mystery-encounters",
- hasShadow: true,
- repeat: true
- }
- ])
- .withSceneRequirement(new WaveCountRequirement([30, 180])) // waves 30 to 180
- .withSceneRequirement(new PartySizeRequirement([2, 6])) // Must have at least 2 pokemon in party
- .withCatchAllowed(true)
- .withOption(new MysteryEncounterOptionBuilder()
- .withPreOptionPhase(async (scene: BattleScene) => {
- // Removes random pokemon (including fainted) from party and adds name to dialogue data tokens
- // Will never return last battle able mon and instead pick fainted/unable to battle
- const removedPokemon = getRandomPlayerPokemon(scene, false, true);
- scene.removePokemonFromPlayerParty(removedPokemon);
-
- scene.currentBattle.mysteryEncounter.setDialogueToken("pokeName", removedPokemon.name);
-
- // Store removed pokemon types
- scene.currentBattle.mysteryEncounter.misc = [removedPokemon.species.type1];
- if (removedPokemon.species.type2) {
- scene.currentBattle.mysteryEncounter.misc.push(removedPokemon.species.type2);
- }
- })
- .withOptionPhase(async (scene: BattleScene) => {
- // Give the player 5 Rogue Balls
- scene.unshiftPhase(new ModifierRewardPhase(scene, () => new AddPokeballModifierType("rb", PokeballType.ROGUE_BALL, 5)));
-
- // Start encounter with random legendary (7-10 starter strength) that has level additive
- const bossTypes = scene.currentBattle.mysteryEncounter.misc as Type[];
- // Starter egg tier, 35/50/10/5 %odds for tiers 6/7/8/9+
- const roll = randSeedInt(100);
- const starterTier: number | [number, number] = roll > 65 ? 6 : roll > 15 ? 7 : roll > 5 ? 8 : [9, 10];
- const bossSpecies = getPokemonSpecies(getRandomSpeciesByStarterTier(starterTier, excludedBosses, bossTypes));
- const pokemonConfig: EnemyPokemonConfig = {
- species: bossSpecies,
- isBoss: true
- };
- if (!isNullOrUndefined(bossSpecies.forms) && bossSpecies.forms.length > 0) {
- pokemonConfig.formIndex = 0;
- }
- const config: EnemyPartyConfig = {
- levelAdditiveMultiplier: 0.75,
- pokemonConfigs: [pokemonConfig]
- };
- return initBattleWithEnemyConfig(scene, config);
- })
- .build())
- .withOption(new MysteryEncounterOptionBuilder()
- .withOptionPhase(async (scene: BattleScene) => {
- // Leave encounter with no rewards or exp
- leaveEncounterWithoutBattle(scene, true);
- return true;
- })
- .build())
- .build();
diff --git a/src/data/mystery-encounters/dialogue/dark-deal-dialogue.ts b/src/data/mystery-encounters/dialogue/dark-deal-dialogue.ts
deleted file mode 100644
index 2fe86b046405..000000000000
--- a/src/data/mystery-encounters/dialogue/dark-deal-dialogue.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import MysteryEncounterDialogue from "#app/data/mystery-encounters/dialogue/mystery-encounter-dialogue";
-
-export const DarkDealDialogue: MysteryEncounterDialogue = {
- intro: [
- {
- text: "mysteryEncounter:dark_deal_intro_message"
- },
- {
- speaker: "mysteryEncounter:dark_deal_speaker",
- text: "mysteryEncounter:dark_deal_intro_dialogue"
- }
- ],
- encounterOptionsDialogue: {
- title: "mysteryEncounter:dark_deal_title",
- description: "mysteryEncounter:dark_deal_description",
- query: "mysteryEncounter:dark_deal_query",
- options: [
- {
- buttonLabel: "mysteryEncounter:dark_deal_option_1_label",
- buttonTooltip: "mysteryEncounter:dark_deal_option_1_tooltip",
- selected: [
- {
- speaker: "mysteryEncounter:dark_deal_speaker",
- text: "mysteryEncounter:dark_deal_option_1_selected"
- },
- {
- text: "mysteryEncounter:dark_deal_option_1_selected_message"
- }
- ]
- },
- {
- buttonLabel: "mysteryEncounter:dark_deal_option_2_label",
- buttonTooltip: "mysteryEncounter:dark_deal_option_2_tooltip",
- selected: [
- {
- speaker: "mysteryEncounter:dark_deal_speaker",
- text: "mysteryEncounter:dark_deal_option_2_selected"
- }
- ]
- }
- ]
- },
- outro: [
- {
- text: "mysteryEncounter:dark_deal_outro"
- }
- ]
-};
diff --git a/src/data/mystery-encounters/dialogue/fight-or-flight-dialogue.ts b/src/data/mystery-encounters/dialogue/fight-or-flight-dialogue.ts
deleted file mode 100644
index 300f6c45992f..000000000000
--- a/src/data/mystery-encounters/dialogue/fight-or-flight-dialogue.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import MysteryEncounterDialogue from "#app/data/mystery-encounters/dialogue/mystery-encounter-dialogue";
-
-export const FightOrFlightDialogue: MysteryEncounterDialogue = {
- intro: [
- {
- text: "mysteryEncounter:fight_or_flight_intro_message"
- }
- ],
- encounterOptionsDialogue: {
- title: "mysteryEncounter:fight_or_flight_title",
- description: "mysteryEncounter:fight_or_flight_description",
- query: "mysteryEncounter:fight_or_flight_query",
- options: [
- {
- buttonLabel: "mysteryEncounter:fight_or_flight_option_1_label",
- buttonTooltip: "mysteryEncounter:fight_or_flight_option_1_tooltip",
- selected: [
- {
- text: "mysteryEncounter:fight_or_flight_option_1_selected_message"
- }
- ]
- },
- {
- buttonLabel: "mysteryEncounter:fight_or_flight_option_2_label",
- buttonTooltip: "mysteryEncounter:fight_or_flight_option_2_tooltip"
- },
- {
- buttonLabel: "mysteryEncounter:fight_or_flight_option_3_label",
- buttonTooltip: "mysteryEncounter:fight_or_flight_option_3_tooltip",
- selected: [
- {
- text: "mysteryEncounter:fight_or_flight_option_3_selected"
- }
- ]
- }
- ]
- }
-};
diff --git a/src/data/mystery-encounters/dialogue/mysterious-challengers-dialogue.ts b/src/data/mystery-encounters/dialogue/mysterious-challengers-dialogue.ts
deleted file mode 100644
index a5699736a36e..000000000000
--- a/src/data/mystery-encounters/dialogue/mysterious-challengers-dialogue.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import MysteryEncounterDialogue from "#app/data/mystery-encounters/dialogue/mystery-encounter-dialogue";
-
-export const MysteriousChallengersDialogue: MysteryEncounterDialogue = {
- intro: [
- {
- text: "mysteryEncounter:mysterious_challengers_intro_message"
- }
- ],
- encounterOptionsDialogue: {
- title: "mysteryEncounter:mysterious_challengers_title",
- description: "mysteryEncounter:mysterious_challengers_description",
- query: "mysteryEncounter:mysterious_challengers_query",
- options: [
- {
- buttonLabel: "mysteryEncounter:mysterious_challengers_option_1_label",
- buttonTooltip: "mysteryEncounter:mysterious_challengers_option_1_tooltip",
- selected: [
- {
- text: "mysteryEncounter:mysterious_challengers_option_selected_message"
- }
- ]
- },
- {
- buttonLabel: "mysteryEncounter:mysterious_challengers_option_2_label",
- buttonTooltip: "mysteryEncounter:mysterious_challengers_option_2_tooltip",
- selected: [
- {
- text: "mysteryEncounter:mysterious_challengers_option_selected_message"
- }
- ]
- },
- {
- buttonLabel: "mysteryEncounter:mysterious_challengers_option_3_label",
- buttonTooltip: "mysteryEncounter:mysterious_challengers_option_3_tooltip",
- selected: [
- {
- text: "mysteryEncounter:mysterious_challengers_option_selected_message"
- }
- ]
- },
- {
- buttonLabel: "mysteryEncounter:mysterious_challengers_option_4_label",
- buttonTooltip: "mysteryEncounter:mysterious_challengers_option_4_tooltip",
- selected: [
- {
- text: "mysteryEncounter:mysterious_challengers_option_4_selected_message"
- }
- ]
- }
- ]
- },
- outro: [
- {
- text: "mysteryEncounter:mysterious_challengers_outro_win"
- }
- ]
-};
diff --git a/src/data/mystery-encounters/dialogue/mysterious-chest-dialogue.ts b/src/data/mystery-encounters/dialogue/mysterious-chest-dialogue.ts
deleted file mode 100644
index cc14670d5b47..000000000000
--- a/src/data/mystery-encounters/dialogue/mysterious-chest-dialogue.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import MysteryEncounterDialogue from "#app/data/mystery-encounters/dialogue/mystery-encounter-dialogue";
-
-export const MysteriousChestDialogue: MysteryEncounterDialogue = {
- intro: [
- {
- text: "mysteryEncounter:mysterious_chest_intro_message"
- }
- ],
- encounterOptionsDialogue: {
- title: "mysteryEncounter:mysterious_chest_title",
- description: "mysteryEncounter:mysterious_chest_description",
- query: "mysteryEncounter:mysterious_chest_query",
- options: [
- {
- buttonLabel: "mysteryEncounter:mysterious_chest_option_1_label",
- buttonTooltip: "mysteryEncounter:mysterious_chest_option_1_tooltip",
- selected: [
- {
- text: "mysteryEncounter:mysterious_chest_option_1_selected_message"
- }
- ]
- },
- {
- buttonLabel: "mysteryEncounter:mysterious_chest_option_2_label",
- buttonTooltip: "mysteryEncounter:mysterious_chest_option_2_tooltip",
- selected: [
- {
- text: "mysteryEncounter:mysterious_chest_option_2_selected_message"
- }
- ]
- }
- ]
- }
-};
diff --git a/src/data/mystery-encounters/dialogue/mystery-encounter-dialogue.ts b/src/data/mystery-encounters/dialogue/mystery-encounter-dialogue.ts
deleted file mode 100644
index e390b0e706a1..000000000000
--- a/src/data/mystery-encounters/dialogue/mystery-encounter-dialogue.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-import {MysteryEncounterType} from "#enums/mystery-encounter-type";
-import {MysteriousChallengersDialogue} from "#app/data/mystery-encounters/dialogue/mysterious-challengers-dialogue";
-import {MysteriousChestDialogue} from "#app/data/mystery-encounters/dialogue/mysterious-chest-dialogue";
-import {DarkDealDialogue} from "#app/data/mystery-encounters/dialogue/dark-deal-dialogue";
-import {FightOrFlightDialogue} from "#app/data/mystery-encounters/dialogue/fight-or-flight-dialogue";
-import {TrainingSessionDialogue} from "#app/data/mystery-encounters/dialogue/training-session-dialogue";
-import { SleepingSnorlaxDialogue } from "./sleeping-snorlax-dialogue";
-
-export class TextDisplay {
- speaker?: TemplateStringsArray | `mysteryEncounter:${string}`;
- text: TemplateStringsArray | `mysteryEncounter:${string}`;
-}
-
-export class OptionTextDisplay {
- buttonLabel: TemplateStringsArray | `mysteryEncounter:${string}`;
- buttonTooltip?: TemplateStringsArray | `mysteryEncounter:${string}`;
- disabledTooltip?: TemplateStringsArray | `mysteryEncounter:${string}`;
- secondOptionPrompt?: TemplateStringsArray | `mysteryEncounter:${string}`;
- selected?: TextDisplay[];
-}
-
-export class EncounterOptionsDialogue {
- title: TemplateStringsArray | `mysteryEncounter:${string}`;
- description: TemplateStringsArray | `mysteryEncounter:${string}`;
- query?: TemplateStringsArray | `mysteryEncounter:${string}`;
- options: [OptionTextDisplay, OptionTextDisplay, ...OptionTextDisplay[]]; // Options array with minimum 2 options
-}
-
-export default class MysteryEncounterDialogue {
- intro?: TextDisplay[];
- encounterOptionsDialogue: EncounterOptionsDialogue;
- outro?: TextDisplay[];
-}
-
-export interface EncounterTypeDialogue {
- [key: integer]: MysteryEncounterDialogue
-}
-
-
-/**
- * Example MysteryEncounterDialogue object:
- *
- {
- intro: [
- {
- text: "this is a rendered as a message window (no title display)"
- },
- {
- speaker: "John"
- text: "this is a rendered as a dialogue window (title "John" is displayed above text)"
- }
- ],
- encounterOptionsDialogue: {
- title: "This is the title displayed at top of encounter description box",
- description: "This is the description in the middle of encounter description box",
- query: "This is an optional question displayed at the bottom of the description box (keep it short)",
- options: [
- {
- buttonLabel: "Option #1 button label (keep these short)",
- selected: [ // Optional dialogue windows displayed when specific option is selected and before functional logic for the option is executed
- {
- text: "You chose option #1 message"
- },
- {
- speaker: "John"
- text: "So, you've chosen option #1! It's time to d-d-d-duel!"
- }
- ]
- },
- {
- buttonLabel: "Option #2"
- }
- ],
- },
- outro: [
- {
- text: "This message will be displayed at the very end of the encounter (i.e. post battle, post reward, etc.)"
- }
- ],
- }
- *
- */
-
-
-export const allMysteryEncounterDialogue: EncounterTypeDialogue = {};
-
-export function initMysteryEncounterDialogue() {
- allMysteryEncounterDialogue[MysteryEncounterType.MYSTERIOUS_CHALLENGERS] = MysteriousChallengersDialogue;
- allMysteryEncounterDialogue[MysteryEncounterType.MYSTERIOUS_CHEST] = MysteriousChestDialogue;
- allMysteryEncounterDialogue[MysteryEncounterType.DARK_DEAL] = DarkDealDialogue;
- allMysteryEncounterDialogue[MysteryEncounterType.FIGHT_OR_FLIGHT] = FightOrFlightDialogue;
- allMysteryEncounterDialogue[MysteryEncounterType.TRAINING_SESSION] = TrainingSessionDialogue;
- allMysteryEncounterDialogue[MysteryEncounterType.SLEEPING_SNORLAX] = SleepingSnorlaxDialogue;
-}
diff --git a/src/data/mystery-encounters/dialogue/sleeping-snorlax-dialogue.ts b/src/data/mystery-encounters/dialogue/sleeping-snorlax-dialogue.ts
deleted file mode 100644
index 0d9381d82780..000000000000
--- a/src/data/mystery-encounters/dialogue/sleeping-snorlax-dialogue.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import MysteryEncounterDialogue from "#app/data/mystery-encounters/dialogue/mystery-encounter-dialogue";
-
-export const SleepingSnorlaxDialogue: MysteryEncounterDialogue = {
- intro: [
- {
- text: "mysteryEncounter:sleeping_snorlax_intro_message"
- }
- ],
- encounterOptionsDialogue: {
- title: "mysteryEncounter:sleeping_snorlax_title",
- description: "mysteryEncounter:sleeping_snorlax_description",
- query: "mysteryEncounter:sleeping_snorlax_query",
- options: [
- {
- buttonLabel: "mysteryEncounter:sleeping_snorlax_option_1_label",
- buttonTooltip: "mysteryEncounter:sleeping_snorlax_option_1_tooltip",
- selected: [
- {
- text: "mysteryEncounter:sleeping_snorlax_option_1_selected_message"
- }
- ]
- },
- {
- buttonLabel: "mysteryEncounter:sleeping_snorlax_option_2_label",
- buttonTooltip: "mysteryEncounter:sleeping_snorlax_option_2_tooltip",
- selected: [
- {
- text: "mysteryEncounter:sleeping_snorlax_option_2_selected_message"
- }
- ]
- },
- {
- buttonLabel: "mysteryEncounter:sleeping_snorlax_option_3_label",
- buttonTooltip: "mysteryEncounter:sleeping_snorlax_option_3_tooltip",
- disabledTooltip: "mysteryEncounter:sleeping_snorlax_option_3_disabled_tooltip"
- }
- ]
- }
-};
diff --git a/src/data/mystery-encounters/dialogue/training-session-dialogue.ts b/src/data/mystery-encounters/dialogue/training-session-dialogue.ts
deleted file mode 100644
index 9f49fc389b62..000000000000
--- a/src/data/mystery-encounters/dialogue/training-session-dialogue.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import MysteryEncounterDialogue from "#app/data/mystery-encounters/dialogue/mystery-encounter-dialogue";
-
-export const TrainingSessionDialogue: MysteryEncounterDialogue = {
- intro: [
- {
- text: "mysteryEncounter:training_session_intro_message"
- }
- ],
- encounterOptionsDialogue: {
- title: "mysteryEncounter:training_session_title",
- description: "mysteryEncounter:training_session_description",
- query: "mysteryEncounter:training_session_query",
- options: [
- {
- buttonLabel: "mysteryEncounter:training_session_option_1_label",
- buttonTooltip: "mysteryEncounter:training_session_option_1_tooltip",
- selected: [
- {
- text: "mysteryEncounter:training_session_option_selected_message"
- }
- ]
- },
- {
- buttonLabel: "mysteryEncounter:training_session_option_2_label",
- buttonTooltip: "mysteryEncounter:training_session_option_2_tooltip",
- secondOptionPrompt: "mysteryEncounter:training_session_option_2_select_prompt",
- selected: [
- {
- text: "mysteryEncounter:training_session_option_selected_message"
- }
- ]
- },
- {
- buttonLabel: "mysteryEncounter:training_session_option_3_label",
- buttonTooltip: "mysteryEncounter:training_session_option_3_tooltip",
- secondOptionPrompt: "mysteryEncounter:training_session_option_3_select_prompt",
- selected: [
- {
- text: "mysteryEncounter:training_session_option_selected_message"
- }
- ]
- }
- ]
- },
- outro: [
- {
- text: "mysteryEncounter:training_session_outro_win"
- }
- ]
-};
diff --git a/src/data/mystery-encounters/fight-or-flight.ts b/src/data/mystery-encounters/fight-or-flight.ts
deleted file mode 100644
index 90cc57bbc137..000000000000
--- a/src/data/mystery-encounters/fight-or-flight.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-import BattleScene from "../../battle-scene";
-import {ModifierTier} from "#app/modifier/modifier-tier";
-import {
- EnemyPartyConfig,
- initBattleWithEnemyConfig,
- leaveEncounterWithoutBattle, queueEncounterMessage,
- setCustomEncounterRewards,
- showEncounterText
-} from "#app/data/mystery-encounters/mystery-encounter-utils";
-import MysteryEncounter, {MysteryEncounterBuilder, MysteryEncounterTier} from "../mystery-encounter";
-import {MysteryEncounterType} from "#enums/mystery-encounter-type";
-import {WaveCountRequirement} from "../mystery-encounter-requirements";
-import {MysteryEncounterOptionBuilder} from "../mystery-encounter-option";
-import {
- getPartyLuckValue,
- getPlayerModifierTypeOptions,
- ModifierPoolType,
- ModifierTypeOption,
- regenerateModifierPoolThresholds
-} from "#app/modifier/modifier-type";
-import {BattlerTagType} from "#enums/battler-tag-type";
-import {StatChangePhase} from "#app/phases";
-import {BattleStat} from "#app/data/battle-stat";
-import Pokemon from "#app/field/pokemon";
-import {randSeedInt} from "#app/utils";
-
-export const FightOrFlightEncounter: MysteryEncounter = new MysteryEncounterBuilder()
- .withEncounterType(MysteryEncounterType.FIGHT_OR_FLIGHT)
- .withEncounterTier(MysteryEncounterTier.COMMON)
- .withIntroSpriteConfigs([]) // Set in onInit()
- .withSceneRequirement(new WaveCountRequirement([10, 180])) // waves 10 to 180
- .withCatchAllowed(true)
- .withHideWildIntroMessage(true)
- .withOnInit((scene: BattleScene) => {
- const encounter = scene.currentBattle.mysteryEncounter;
-
- // Calculate boss mon
- const bossSpecies = scene.arena.randomSpecies(scene.currentBattle.waveIndex, scene.currentBattle.waveIndex, 0, getPartyLuckValue(scene.getParty()), true);
- const config: EnemyPartyConfig = {
- levelAdditiveMultiplier: 1,
- pokemonConfigs: [{species: bossSpecies, isBoss: true}]
- };
- encounter.enemyPartyConfigs = [config];
-
- // Calculate item
- // 10-60 GREAT, 60-110 ULTRA, 110-160 ROGUE, 160-180 MASTER
- const tier = scene.currentBattle.waveIndex > 160 ? ModifierTier.MASTER : scene.currentBattle.waveIndex > 110 ? ModifierTier.ROGUE : scene.currentBattle.waveIndex > 60 ? ModifierTier.ULTRA : ModifierTier.GREAT;
- regenerateModifierPoolThresholds(scene.getParty(), ModifierPoolType.PLAYER, 0); // refresh player item pool
- const item = getPlayerModifierTypeOptions(1, scene.getParty(), [], { guaranteedModifierTiers: [tier]})[0];
- encounter.setDialogueToken("itemName", item.type.name);
- encounter.misc = item;
-
- encounter.spriteConfigs = [
- {
- spriteKey: item.type.iconImage,
- fileRoot: "items",
- hasShadow: false,
- x: 35,
- y: -5,
- scale: 0.75,
- isItem: true
- },
- {
- spriteKey: bossSpecies.speciesId.toString(),
- fileRoot: "pokemon",
- hasShadow: true,
- tint: 0.25,
- x: -5,
- repeat: true
- }
- ];
-
- return true;
- })
- .withOption(new MysteryEncounterOptionBuilder()
- .withOptionPhase(async (scene: BattleScene) => {
- // Pick battle
- const item = scene.currentBattle.mysteryEncounter.misc as ModifierTypeOption;
- setCustomEncounterRewards(scene, { guaranteedModifierTypeOptions: [item], fillRemaining: false});
- await initBattleWithEnemyConfig(scene, scene.currentBattle.mysteryEncounter.enemyPartyConfigs[0]);
- })
- .build())
- .withOption(new MysteryEncounterOptionBuilder()
- .withOptionPhase(async (scene: BattleScene) => {
- // Pick steal
- const item = scene.currentBattle.mysteryEncounter.misc as ModifierTypeOption;
- setCustomEncounterRewards(scene, { guaranteedModifierTypeOptions: [item], fillRemaining: false});
-
- const roll = randSeedInt(16);
- if (roll > 6) {
- // Noticed and attacked by boss, gets +1 to all stats at start of fight (62.5%)
- const config = scene.currentBattle.mysteryEncounter.enemyPartyConfigs[0];
- config.pokemonConfigs[0].tags = [BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON];
- config.pokemonConfigs[0].mysteryEncounterBattleEffects = (pokemon: Pokemon) => {
- pokemon.scene.currentBattle.mysteryEncounter.setDialogueToken("enemyPokemon", pokemon.name);
- queueEncounterMessage(pokemon.scene, "mysteryEncounter:fight_or_flight_boss_enraged");
- pokemon.scene.unshiftPhase(new StatChangePhase(pokemon.scene, pokemon.getBattlerIndex(), true, [BattleStat.ATK, BattleStat.DEF, BattleStat.SPATK, BattleStat.SPDEF, BattleStat.SPD], 1));
- };
- await showEncounterText(scene, "mysteryEncounter:fight_or_flight_option_2_bad_result");
- await initBattleWithEnemyConfig(scene, config);
- } else {
- // Steal item (37.5%)
- // Display result message then proceed to rewards
- await showEncounterText(scene, "mysteryEncounter:fight_or_flight_option_2_good_result")
- .then(() => leaveEncounterWithoutBattle(scene));
- }
- })
- .build())
- .withOption(new MysteryEncounterOptionBuilder()
- .withOptionPhase(async (scene: BattleScene) => {
- // Leave encounter with no rewards or exp
- leaveEncounterWithoutBattle(scene, true);
- return true;
- })
- .build())
- .build();
diff --git a/src/data/mystery-encounters/mysterious-challengers.ts b/src/data/mystery-encounters/mysterious-challengers.ts
deleted file mode 100644
index eaaeffec9d02..000000000000
--- a/src/data/mystery-encounters/mysterious-challengers.ts
+++ /dev/null
@@ -1,151 +0,0 @@
-import BattleScene from "../../battle-scene";
-import { ModifierTier } from "#app/modifier/modifier-tier";
-import {modifierTypes} from "#app/modifier/modifier-type";
-import { EnemyPartyConfig, initBattleWithEnemyConfig, setCustomEncounterRewards } from "#app/data/mystery-encounters/mystery-encounter-utils";
-import { MysteryEncounterType } from "#enums/mystery-encounter-type";
-import MysteryEncounter, {MysteryEncounterBuilder, MysteryEncounterTier} from "../mystery-encounter";
-import { MysteryEncounterOptionBuilder } from "../mystery-encounter-option";
-import { WaveCountRequirement } from "../mystery-encounter-requirements";
-import {
- trainerConfigs,
- TrainerPartyCompoundTemplate,
- TrainerPartyTemplate,
- trainerPartyTemplates
-} from "#app/data/trainer-config";
-import * as Utils from "../../utils";
-import {PartyMemberStrength} from "#enums/party-member-strength";
-
-export const MysteriousChallengersEncounter: MysteryEncounter = new MysteryEncounterBuilder()
- .withEncounterType(MysteryEncounterType.MYSTERIOUS_CHALLENGERS)
- .withEncounterTier(MysteryEncounterTier.UNCOMMON)
- .withIntroSpriteConfigs([]) // These are set in onInit()
- .withSceneRequirement(new WaveCountRequirement([10, 180])) // waves 10 to 180
- .withOnInit((scene: BattleScene) => {
- const encounter = scene.currentBattle.mysteryEncounter;
- // Calculates what trainers are available for battle in the encounter
-
- // Normal difficulty trainer is randomly pulled from biome
- const normalTrainerType = scene.arena.randomTrainerType(scene.currentBattle.waveIndex);
- const normalConfig = trainerConfigs[normalTrainerType].copy();
- let female = false;
- if (normalConfig.hasGenders) {
- female = !!(Utils.randSeedInt(2));
- }
- const normalSpriteKey = normalConfig.getSpriteKey(female, normalConfig.doubleOnly);
- encounter.enemyPartyConfigs.push({
- trainerConfig: normalConfig,
- female: female
- });
-
- // Hard difficulty trainer is another random trainer, but with AVERAGE_BALANCED config
- // Number of mons is based off wave: 1-20 is 2, 20-40 is 3, etc. capping at 6 after wave 100
- const hardTrainerType = scene.arena.randomTrainerType(scene.currentBattle.waveIndex);
- const hardTemplate = new TrainerPartyCompoundTemplate(
- new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER, false, true),
- new TrainerPartyTemplate(Math.min(Math.ceil(scene.currentBattle.waveIndex / 20), 5), PartyMemberStrength.AVERAGE, false, true));
- const hardConfig = trainerConfigs[hardTrainerType].copy();
- hardConfig.setPartyTemplates(hardTemplate);
- female = false;
- if (hardConfig.hasGenders) {
- female = !!(Utils.randSeedInt(2));
- }
- const hardSpriteKey = hardConfig.getSpriteKey(female, hardConfig.doubleOnly);
- encounter.enemyPartyConfigs.push({
- trainerConfig: hardConfig,
- levelAdditiveMultiplier: 0.5,
- female: female,
- });
-
- // Brutal trainer is pulled from pool of boss trainers (gym leaders) for the biome
- // They are given an E4 template team, so will be stronger than usual boss encounter and always have 6 mons
- const brutalTrainerType = scene.arena.randomTrainerType(scene.currentBattle.waveIndex, true);
- const e4Template = trainerPartyTemplates.ELITE_FOUR;
- const brutalConfig = trainerConfigs[brutalTrainerType].copy();
- brutalConfig.setPartyTemplates(e4Template);
- brutalConfig.partyTemplateFunc = null; // Overrides gym leader party template func
- female = false;
- if (brutalConfig.hasGenders) {
- female = !!(Utils.randSeedInt(2));
- }
- const brutalSpriteKey = brutalConfig.getSpriteKey(female, brutalConfig.doubleOnly);
- encounter.enemyPartyConfigs.push({
- trainerConfig: brutalConfig,
- levelAdditiveMultiplier: 1.1,
- female: female
- });
-
- encounter.spriteConfigs = [
- {
- spriteKey: normalSpriteKey,
- fileRoot: "trainer",
- hasShadow: true,
- tint: 1
- },
- {
- spriteKey: hardSpriteKey,
- fileRoot: "trainer",
- hasShadow: true,
- tint: 1
- },
- {
- spriteKey: brutalSpriteKey,
- fileRoot: "trainer",
- hasShadow: true,
- tint: 1
- }
- ];
-
- return true;
- })
- .withOption(new MysteryEncounterOptionBuilder()
- .withOptionPhase(async (scene: BattleScene) => {
- const encounter = scene.currentBattle.mysteryEncounter;
- // Spawn standard trainer battle with memory mushroom reward
- const config: EnemyPartyConfig = encounter.enemyPartyConfigs[0];
-
- setCustomEncounterRewards(scene, { guaranteedModifierTypeFuncs: [modifierTypes.TM_COMMON, modifierTypes.TM_GREAT, modifierTypes.MEMORY_MUSHROOM], fillRemaining: true });
-
- // Seed offsets to remove possibility of different trainers having exact same teams
- let ret;
- scene.executeWithSeedOffset(() => {
- ret = initBattleWithEnemyConfig(scene, config);
- }, scene.currentBattle.waveIndex * 10);
- return ret;
- })
- .build())
- .withOption(new MysteryEncounterOptionBuilder()
- .withOptionPhase(async (scene: BattleScene) => {
- const encounter = scene.currentBattle.mysteryEncounter;
- // Spawn hard fight with ULTRA/GREAT reward (can improve with luck)
- const config: EnemyPartyConfig = encounter.enemyPartyConfigs[1];
-
- setCustomEncounterRewards(scene, { guaranteedModifierTiers: [ModifierTier.ULTRA, ModifierTier.GREAT, ModifierTier.GREAT], fillRemaining: true });
-
- // Seed offsets to remove possibility of different trainers having exact same teams
- let ret;
- scene.executeWithSeedOffset(() => {
- ret = initBattleWithEnemyConfig(scene, config);
- }, scene.currentBattle.waveIndex * 100);
- return ret;
- })
- .build())
- .withOption(new MysteryEncounterOptionBuilder()
- .withOptionPhase(async (scene: BattleScene) => {
- const encounter = scene.currentBattle.mysteryEncounter;
- // Spawn brutal fight with ROGUE/ULTRA/GREAT reward (can improve with luck)
- const config: EnemyPartyConfig = encounter.enemyPartyConfigs[2];
-
- // To avoid player level snowballing from picking this option
- encounter.expMultiplier = 0.9;
-
- setCustomEncounterRewards(scene, { guaranteedModifierTiers: [ModifierTier.ROGUE, ModifierTier.ULTRA, ModifierTier.GREAT], fillRemaining: true });
-
- // Seed offsets to remove possibility of different trainers having exact same teams
- let ret;
- scene.executeWithSeedOffset(() => {
- ret = initBattleWithEnemyConfig(scene, config);
- }, scene.currentBattle.waveIndex * 1000);
- return ret;
- })
- .build())
- .build();
diff --git a/src/data/mystery-encounters/mysterious-chest.ts b/src/data/mystery-encounters/mysterious-chest.ts
deleted file mode 100644
index 25abcf1fe741..000000000000
--- a/src/data/mystery-encounters/mysterious-chest.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import BattleScene from "../../battle-scene";
-import { ModifierTier } from "#app/modifier/modifier-tier";
-import {
- getHighestLevelPlayerPokemon,
- koPlayerPokemon,
- leaveEncounterWithoutBattle,
- queueEncounterMessage,
- setCustomEncounterRewards,
- showEncounterText
-} from "#app/data/mystery-encounters/mystery-encounter-utils";
-import MysteryEncounter, {MysteryEncounterBuilder, MysteryEncounterTier} from "../mystery-encounter";
-import { MysteryEncounterType } from "#enums/mystery-encounter-type";
-import {WaveCountRequirement} from "../mystery-encounter-requirements";
-import { MysteryEncounterOptionBuilder } from "../mystery-encounter-option";
-import {GameOverPhase} from "#app/phases";
-import {randSeedInt} from "#app/utils";
-
-export const MysteriousChestEncounter: MysteryEncounter = new MysteryEncounterBuilder()
- .withEncounterType(MysteryEncounterType.MYSTERIOUS_CHEST)
- .withEncounterTier(MysteryEncounterTier.COMMON)
- .withIntroSpriteConfigs([
- {
- spriteKey: "chest_blue",
- fileRoot: "mystery-encounters",
- hasShadow: true,
- x: 4,
- y: 8,
- disableAnimation: true // Re-enabled after option select
- }
- ])
- .withHideIntroVisuals(false)
- .withSceneRequirement(new WaveCountRequirement([10, 180])) // waves 2 to 180
- .withOption(new MysteryEncounterOptionBuilder()
- .withPreOptionPhase(async (scene: BattleScene) => {
- // Play animation
- const introVisuals = scene.currentBattle.mysteryEncounter.introVisuals;
- introVisuals.spriteConfigs[0].disableAnimation = false;
- introVisuals.playAnim();
- })
- .withOptionPhase(async (scene: BattleScene) => {
- // Open the chest
- const roll = randSeedInt(100);
- if (roll > 60) {
- // Choose between 2 COMMON / 2 GREAT tier items (40%)
- setCustomEncounterRewards(scene, { guaranteedModifierTiers: [ModifierTier.COMMON, ModifierTier.COMMON, ModifierTier.GREAT, ModifierTier.GREAT]});
- // Display result message then proceed to rewards
- queueEncounterMessage(scene, "mysteryEncounter:mysterious_chest_option_1_normal_result");
- leaveEncounterWithoutBattle(scene);
- } else if (roll > 40) {
- // Choose between 3 ULTRA tier items (20%)
- setCustomEncounterRewards(scene, { guaranteedModifierTiers: [ModifierTier.ULTRA, ModifierTier.ULTRA, ModifierTier.ULTRA]});
- // Display result message then proceed to rewards
- queueEncounterMessage(scene, "mysteryEncounter:mysterious_chest_option_1_good_result");
- leaveEncounterWithoutBattle(scene);
- } else if (roll > 36) {
- // Choose between 2 ROGUE tier items (4%)
- setCustomEncounterRewards(scene, { guaranteedModifierTiers: [ModifierTier.ROGUE, ModifierTier.ROGUE]});
- // Display result message then proceed to rewards
- queueEncounterMessage(scene, "mysteryEncounter:mysterious_chest_option_1_great_result");
- leaveEncounterWithoutBattle(scene);
- } else if (roll > 35) {
- // Choose 1 MASTER tier item (1%)
- setCustomEncounterRewards(scene, { guaranteedModifierTiers: [ModifierTier.MASTER]});
- // Display result message then proceed to rewards
- queueEncounterMessage(scene, "mysteryEncounter:mysterious_chest_option_1_amazing_result");
- leaveEncounterWithoutBattle(scene);
- } else {
- // Your highest level unfainted Pok�mon gets OHKO. Progress with no rewards (35%)
- const highestLevelPokemon = getHighestLevelPlayerPokemon(scene, true);
- koPlayerPokemon(highestLevelPokemon);
-
- scene.currentBattle.mysteryEncounter.setDialogueToken("pokeName", highestLevelPokemon.name);
- // Show which Pokemon was KOed, then leave encounter with no rewards
- // Does this synchronously so that game over doesn't happen over result message
- await showEncounterText(scene, "mysteryEncounter:mysterious_chest_option_1_bad_result")
- .then(() => {
- if (scene.getParty().filter(p => p.isAllowedInBattle()).length === 0) {
- // All pokemon fainted, game over
- scene.clearPhaseQueue();
- scene.unshiftPhase(new GameOverPhase(scene));
- } else {
- leaveEncounterWithoutBattle(scene);
- }
- });
- }
- })
- .build())
- .withOption(new MysteryEncounterOptionBuilder()
- .withOptionPhase(async (scene: BattleScene) => {
- // Leave encounter with no rewards or exp
- leaveEncounterWithoutBattle(scene, true);
- return true;
- })
- .build())
- .build();
diff --git a/src/data/mystery-encounters/mystery-encounter-utils.ts b/src/data/mystery-encounters/mystery-encounter-utils.ts
deleted file mode 100644
index 2a69becf1efd..000000000000
--- a/src/data/mystery-encounters/mystery-encounter-utils.ts
+++ /dev/null
@@ -1,698 +0,0 @@
-import i18next from "i18next";
-import {BattleType} from "#app/battle";
-import BattleScene from "../../battle-scene";
-import PokemonSpecies, {getPokemonSpecies, speciesStarters} from "../pokemon-species";
-import {MysteryEncounterVariant} from "../mystery-encounter";
-import {Status, StatusEffect} from "../status-effect";
-import {TrainerConfig, trainerConfigs, TrainerSlot} from "../trainer-config";
-import Pokemon, {FieldPosition, PlayerPokemon} from "#app/field/pokemon";
-import Trainer, {TrainerVariant} from "../../field/trainer";
-import {PokemonExpBoosterModifier} from "#app/modifier/modifier";
-import {
- CustomModifierSettings,
- ModifierPoolType,
- ModifierTypeFunc,
- PokemonHeldItemModifierType,
- regenerateModifierPoolThresholds
-} from "#app/modifier/modifier-type";
-import {BattleEndPhase, EggLapsePhase, ModifierRewardPhase, TrainerVictoryPhase} from "#app/phases";
-import {MysteryEncounterBattlePhase, MysteryEncounterRewardsPhase} from "#app/phases/mystery-encounter-phase";
-import * as Utils from "../../utils";
-import {isNullOrUndefined} from "#app/utils";
-import {SelectModifierPhase} from "#app/phases/select-modifier-phase";
-import {TrainerType} from "#enums/trainer-type";
-import {Species} from "#enums/species";
-import {Type} from "#app/data/type";
-import {BattlerTagType} from "#enums/battler-tag-type";
-import PokemonData from "#app/system/pokemon-data";
-import {Biome} from "#enums/biome";
-import {biomeLinks} from "#app/data/biomes";
-import {EncounterSceneRequirement} from "#app/data/mystery-encounter-requirements";
-import {Mode} from "#app/ui/ui";
-import {PartyOption, PartyUiMode} from "#app/ui/party-ui-handler";
-import {OptionSelectConfig, OptionSelectItem} from "#app/ui/abstact-option-select-ui-handler";
-
-/**
- *
- * Will never remove the player's last non-fainted Pokemon (if they only have 1)
- * Otherwise, picks a Pokemon completely at random and removes from the party
- * @param scene
- * @param isAllowedInBattle - default false. If true, only picks from unfainted mons. If there is only 1 unfainted mon left and doNotReturnLastAbleMon is also true, will return fainted mon
- * @param doNotReturnLastAbleMon - If true, will never return the last unfainted pokemon in the party. Useful when this function is being used to determine what Pokemon to remove from the party (Don't want to remove last unfainted)
- * @returns
- */
-export function getRandomPlayerPokemon(scene: BattleScene, isAllowedInBattle: boolean = false, doNotReturnLastAbleMon: boolean = false): PlayerPokemon {
- const party = scene.getParty();
- let chosenIndex: number;
- let chosenPokemon: PlayerPokemon;
- const unfaintedMons = party.filter(p => p.isAllowedInBattle());
- const faintedMons = party.filter(p => !p.isAllowedInBattle());
-
- if (doNotReturnLastAbleMon && unfaintedMons.length === 1) {
- chosenIndex = Utils.randSeedInt(faintedMons.length);
- chosenPokemon = faintedMons.at(chosenIndex);
- } else if (isAllowedInBattle) {
- chosenIndex = Utils.randSeedInt(unfaintedMons.length);
- chosenPokemon = unfaintedMons.at(chosenIndex);
- } else {
- chosenIndex = Utils.randSeedInt(party.length);
- chosenPokemon = party.at(chosenIndex);
- }
-
- return chosenPokemon;
-}
-
-export function getTokensFromScene(scene: BattleScene, reqs: EncounterSceneRequirement[]): Array<[RegExp, String]> {
- const arr = [];
- if (scene) {
- for (const req of reqs) {
- req.getDialogueToken(scene);
- }
- }
- return arr;
-}
-
-/**
- * Ties are broken by whatever mon is closer to the front of the party
- * @param scene
- * @param unfainted - default false. If true, only picks from unfainted mons.
- * @returns
- */
-export function getHighestLevelPlayerPokemon(scene: BattleScene, unfainted: boolean = false): PlayerPokemon {
- const party = scene.getParty();
- let pokemon: PlayerPokemon;
- party.every(p => {
- if (unfainted && p.isFainted()) {
- return true;
- }
-
- pokemon = pokemon ? pokemon?.level < p?.level ? p : pokemon : p;
- return true;
- });
-
- return pokemon;
-}
-
-/**
- * Ties are broken by whatever mon is closer to the front of the party
- * @param scene
- * @param unfainted - default false. If true, only picks from unfainted mons.
- * @returns
- */
-export function getLowestLevelPlayerPokemon(scene: BattleScene, unfainted: boolean = false): PlayerPokemon {
- const party = scene.getParty();
- let pokemon: PlayerPokemon;
- party.every(p => {
- if (unfainted && p.isFainted()) {
- return true;
- }
-
- pokemon = pokemon ? pokemon?.level > p?.level ? p : pokemon : p;
- return true;
- });
-
- return pokemon;
-}
-
-export function koPlayerPokemon(pokemon: PlayerPokemon) {
- pokemon.hp = 0;
- pokemon.trySetStatus(StatusEffect.FAINT);
- pokemon.updateInfo();
-}
-
-export function getTextWithEncounterDialogueTokens(scene: BattleScene, textKey: TemplateStringsArray | `mysteryEncounter:${string}`): string {
- if (isNullOrUndefined(textKey)) {
- return null;
- }
-
- let textString: string = i18next.t(textKey);
-
- const dialogueTokens = scene.currentBattle?.mysteryEncounter?.dialogueTokens;
-
- if (dialogueTokens) {
- dialogueTokens.forEach((value) => {
- textString = textString.replace(value[0], value[1]);
- });
- }
-
- return textString;
-}
-
-/**
- * Will queue a message in UI with injected encounter data tokens
- * @param scene
- * @param contentKey
- */
-export function queueEncounterMessage(scene: BattleScene, contentKey: TemplateStringsArray | `mysteryEncounter:${string}`): void {
- const text: string = getTextWithEncounterDialogueTokens(scene, contentKey);
- scene.queueMessage(text, null, true);
-}
-
-/**
- * Will display a message in UI with injected encounter data tokens
- * @param scene
- * @param contentKey
- */
-export function showEncounterText(scene: BattleScene, contentKey: TemplateStringsArray | `mysteryEncounter:${string}`): Promise {
- return new Promise(resolve => {
- const text: string = getTextWithEncounterDialogueTokens(scene, contentKey);
- scene.ui.showText(text, null, () => resolve(), 0, true);
- });
-}
-
-/**
- * Will display a dialogue (with speaker title) in UI with injected encounter data tokens
- * @param scene
- * @param textContentKey
- * @param speakerContentKey
- * @param callback
- */
-export function showEncounterDialogue(scene: BattleScene, textContentKey: TemplateStringsArray | `mysteryEncounter:${string}`, speakerContentKey: TemplateStringsArray | `mysteryEncounter:${string}`, callback?: Function) {
- const text: string = getTextWithEncounterDialogueTokens(scene, textContentKey);
- const speaker: string = getTextWithEncounterDialogueTokens(scene, speakerContentKey);
- scene.ui.showDialogue(text, speaker, null, callback, 0, 0);
-}
-
-/**
- *
- * NOTE: This returns ANY random species, including those locked behind eggs, etc.
- * @param starterTiers
- * @param excludedSpecies
- * @param types
- * @returns
- */
-export function getRandomSpeciesByStarterTier(starterTiers: number | [number, number], excludedSpecies?: Species[], types?: Type[]): Species {
- let min = starterTiers instanceof Array ? starterTiers[0] : starterTiers;
- let max = starterTiers instanceof Array ? starterTiers[1] : starterTiers;
-
- let filteredSpecies: [PokemonSpecies, number][] = Object.keys(speciesStarters)
- .map(s => [parseInt(s) as Species, speciesStarters[s] as number])
- .filter(s => getPokemonSpecies(s[0]) && !excludedSpecies.includes(s[0]))
- .map(s => [getPokemonSpecies(s[0]), s[1]]);
-
- if (!isNullOrUndefined(types) && types.length > 0) {
- filteredSpecies = filteredSpecies.filter(s => types.includes(s[0].type1) || types.includes(s[0].type2));
- }
-
- // If no filtered mons exist at specified starter tiers, will expand starter search range until there are
- // Starts by decrementing starter tier min until it is 0, then increments tier max up to 10
- let tryFilterStarterTiers: [PokemonSpecies, number][] = filteredSpecies.filter(s => (s[1] >= min && s[1] <= max));
- while (tryFilterStarterTiers.length === 0 && (min !== 0 && max !== 10)) {
- if (min > 0) {
- min--;
- } else {
- max++;
- }
-
- tryFilterStarterTiers = filteredSpecies.filter(s => s[1] >= min && s[1] <= max);
- }
-
- if (tryFilterStarterTiers.length > 0) {
- const index = Utils.randSeedInt(tryFilterStarterTiers.length);
- return Phaser.Math.RND.shuffle(tryFilterStarterTiers)[index][0].speciesId;
- }
-
- return Species.BULBASAUR;
-}
-
-export class EnemyPokemonConfig {
- species: PokemonSpecies;
- isBoss: boolean = false;
- bossSegments?: number;
- bossSegmentModifier?: number; // Additive to the determined segment number
- formIndex?: number;
- level?: number;
- modifierTypes?: PokemonHeldItemModifierType[];
- dataSource?: PokemonData;
- tags?: BattlerTagType[];
- mysteryEncounterBattleEffects?: (pokemon: Pokemon) => void;
- status?: StatusEffect;
-}
-
-export class EnemyPartyConfig {
- levelAdditiveMultiplier?: number = 0; // Formula for enemy: level += waveIndex / 10 * levelAdditive
- doubleBattle?: boolean = false;
- trainerType?: TrainerType; // Generates trainer battle solely off trainer type
- trainerConfig?: TrainerConfig; // More customizable option for configuring trainer battle
- pokemonConfigs?: EnemyPokemonConfig[];
- female?: boolean; // True for female trainer, false for male
-}
-
-/**
- * Generates an enemy party for a mystery encounter battle
- * This will override and replace any standard encounter generation logic
- * Useful for tailoring specific battles to mystery encounters
- * @param scene - Battle Scene
- * @param partyConfig - Can pass various customizable attributes for the enemy party, see EnemyPartyConfig
- */
-export async function initBattleWithEnemyConfig(scene: BattleScene, partyConfig: EnemyPartyConfig): Promise {
- const loaded = false;
- const loadEnemyAssets = [];
-
- const battle = scene.currentBattle;
-
- let doubleBattle = partyConfig?.doubleBattle;
-
- // Trainer
- const trainerType = partyConfig?.trainerType;
- let trainerConfig = partyConfig?.trainerConfig;
- if (trainerType || trainerConfig) {
- scene.currentBattle.mysteryEncounter.encounterVariant = MysteryEncounterVariant.TRAINER_BATTLE;
- if (scene.currentBattle.trainer) {
- scene.currentBattle.trainer.setVisible(false);
- scene.currentBattle.trainer.destroy();
- }
-
- trainerConfig = partyConfig?.trainerConfig ? partyConfig?.trainerConfig : trainerConfigs[trainerType];
-
- const doubleTrainer = trainerConfig.doubleOnly || (trainerConfig.hasDouble && partyConfig.doubleBattle);
- doubleBattle = doubleTrainer;
- const trainerFemale = isNullOrUndefined(partyConfig.female) ? !!(Utils.randSeedInt(2)) : partyConfig.female;
- const newTrainer = new Trainer(scene, trainerConfig.trainerType, doubleTrainer ? TrainerVariant.DOUBLE : trainerFemale ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT, null, null, null, trainerConfig);
- newTrainer.x += 300;
- newTrainer.setVisible(false);
- scene.field.add(newTrainer);
- scene.currentBattle.trainer = newTrainer;
- loadEnemyAssets.push(newTrainer.loadAssets());
-
- battle.enemyLevels = scene.currentBattle.trainer.getPartyLevels(scene.currentBattle.waveIndex);
- } else {
- // Wild
- scene.currentBattle.mysteryEncounter.encounterVariant = MysteryEncounterVariant.WILD_BATTLE;
- battle.enemyLevels = new Array(partyConfig?.pokemonConfigs?.length > 0 ? partyConfig?.pokemonConfigs?.length : doubleBattle ? 2 : 1).fill(null).map(() => scene.currentBattle.getLevelForWave());
- }
-
- scene.getEnemyParty().forEach(enemyPokemon => enemyPokemon.destroy());
- battle.enemyParty = [];
- battle.double = doubleBattle;
-
- // ME levels are modified by an additive value that scales with wave index
- // Base scaling: Every 10 waves, modifier gets +1 level
- // This can be amplified or counteracted by setting levelAdditiveMultiplier in config
- // levelAdditiveMultiplier value of 0.5 will halve the modifier scaling, 2 will double it, etc.
- // Leaving null/undefined will disable level scaling
- const mult = !isNullOrUndefined(partyConfig.levelAdditiveMultiplier) ? partyConfig.levelAdditiveMultiplier : 0;
- const additive = Math.max(Math.round((scene.currentBattle.waveIndex / 10) * mult), 0);
- battle.enemyLevels = battle.enemyLevels.map(level => level + additive);
-
- battle.enemyLevels.forEach((level, e) => {
- let enemySpecies;
- let dataSource;
- let isBoss = false;
- if (!loaded) {
- if (trainerType || trainerConfig) {
- battle.enemyParty[e] = battle.trainer.genPartyMember(e);
- } else {
- if (e < partyConfig?.pokemonConfigs?.length) {
- const config = partyConfig?.pokemonConfigs?.[e];
- level = config.level ? config.level : level;
- dataSource = config.dataSource;
- enemySpecies = config.species;
- isBoss = config.isBoss;
- if (isBoss) {
- scene.currentBattle.mysteryEncounter.encounterVariant = MysteryEncounterVariant.BOSS_BATTLE;
- }
- } else {
- enemySpecies = scene.randomSpecies(battle.waveIndex, level, true);
- }
-
- battle.enemyParty[e] = scene.addEnemyPokemon(enemySpecies, level, TrainerSlot.NONE, isBoss, dataSource);
- }
- }
-
- const enemyPokemon = scene.getEnemyParty()[e];
-
- if (e < (doubleBattle ? 2 : 1)) {
- enemyPokemon.setX(-66 + enemyPokemon.getFieldPositionOffset()[0]);
- enemyPokemon.resetSummonData();
- }
-
- if (!loaded) {
- scene.gameData.setPokemonSeen(enemyPokemon, true, !!(trainerType || trainerConfig));
- }
-
- if (e < partyConfig?.pokemonConfigs?.length) {
- const config = partyConfig?.pokemonConfigs?.[e];
-
- // Generate new id in case using data source
- if (config.dataSource) {
- enemyPokemon.id = Utils.randSeedInt(4294967296);
- }
-
- // Set form
- if (!isNullOrUndefined(config.formIndex)) {
- enemyPokemon.formIndex = config.formIndex;
- }
-
- // Set Boss
- if (config.isBoss) {
- let segments = !isNullOrUndefined(config.bossSegments) ? config.bossSegments : scene.getEncounterBossSegments(scene.currentBattle.waveIndex, level, enemySpecies, true);
- if (!isNullOrUndefined(config.bossSegmentModifier)) {
- segments += config.bossSegmentModifier;
- }
- enemyPokemon.setBoss(true, segments);
- }
-
- // Set Status
- if (partyConfig.pokemonConfigs[e].status) {
- // Default to cureturn 3 for sleep
- const cureTurn = partyConfig.pokemonConfigs[e].status === StatusEffect.SLEEP ? 3: null;
- enemyPokemon.status = new Status(partyConfig.pokemonConfigs[e].status, 0, cureTurn);
- }
-
- // Set tags
- if (config.tags?.length > 0) {
- const tags = config.tags;
- tags.forEach(tag => enemyPokemon.addTag(tag));
- // mysteryEncounterBattleEffects can be used IFF MYSTERY_ENCOUNTER_POST_SUMMON tag is applied
- enemyPokemon.summonData.mysteryEncounterBattleEffects = config.mysteryEncounterBattleEffects;
-
- // Requires re-priming summon data so that tags are not cleared on SummonPhase
- enemyPokemon.primeSummonData(enemyPokemon.summonData);
- }
-
- enemyPokemon.initBattleInfo();
- }
-
- loadEnemyAssets.push(enemyPokemon.loadAssets());
-
- console.log(enemyPokemon.name, enemyPokemon.species.speciesId, enemyPokemon.stats);
- });
-
- scene.pushPhase(new MysteryEncounterBattlePhase(scene));
-
- await Promise.all(loadEnemyAssets);
- battle.enemyParty.forEach((enemyPokemon_2, e_1) => {
- if (e_1 < (doubleBattle ? 2 : 1)) {
- enemyPokemon_2.setVisible(false);
- if (battle.double) {
- enemyPokemon_2.setFieldPosition(e_1 ? FieldPosition.RIGHT : FieldPosition.LEFT);
- }
- // Spawns at current visible field instead of on "next encounter" field (off screen to the left)
- enemyPokemon_2.x += 300;
- }
- });
- if (!loaded) {
- regenerateModifierPoolThresholds(scene.getEnemyField(), battle.battleType === BattleType.TRAINER ? ModifierPoolType.TRAINER : ModifierPoolType.WILD);
- const customModifiers = partyConfig?.pokemonConfigs?.map(config => config?.modifierTypes);
- scene.generateEnemyModifiers(customModifiers);
- }
-}
-
-/**
- * Will initialize reward phases to follow the mystery encounter
- * Can have shop displayed or skipped
- * @param scene - Battle Scene
- * @param customShopRewards - adds a shop phase with the specified rewards / reward tiers
- * @param nonShopRewards - will add a non-shop reward phase for each specified item/modifier (can happen in addition to a shop)
- * @param preRewardsCallback - can execute an arbitrary callback before the new phases if necessary (useful for updating items/party/injecting new phases before MysteryEncounterRewardsPhase)
- */
-export function setCustomEncounterRewards(scene: BattleScene, customShopRewards?: CustomModifierSettings, nonShopRewards?: ModifierTypeFunc[], preRewardsCallback?: Function) {
- scene.currentBattle.mysteryEncounter.doEncounterRewards = (scene: BattleScene) => {
- if (preRewardsCallback) {
- preRewardsCallback();
- }
-
- if (customShopRewards) {
- scene.unshiftPhase(new SelectModifierPhase(scene, 0, null, customShopRewards));
- } else {
- scene.tryRemovePhase(p => p instanceof SelectModifierPhase);
- }
-
- if (nonShopRewards?.length > 0) {
- nonShopRewards.forEach((reward) => {
- scene.unshiftPhase(new ModifierRewardPhase(scene, reward));
- });
- } else {
- while (!isNullOrUndefined(scene.findPhase(p => p instanceof ModifierRewardPhase))) {
- scene.tryRemovePhase(p => p instanceof ModifierRewardPhase);
- }
- }
-
- return true;
- };
-}
-
-/**
- *
- * @param scene
- * @param onPokemonSelected - Any logic that needs to be performed when Pokemon is chosen
- * If a second option needs to be selected, onPokemonSelected should return a OptionSelectItem[] object
- * @param onPokemonNotSelected - Any logic that needs to be performed if no Pokemon is chosen
- */
-export function selectPokemonForOption(scene: BattleScene, onPokemonSelected: (pokemon: PlayerPokemon) => void | OptionSelectItem[], onPokemonNotSelected?: () => void): Promise {
- return new Promise(resolve => {
- // Open party screen to choose pokemon to train
- scene.ui.setMode(Mode.PARTY, PartyUiMode.SELECT, -1, (slotIndex: integer, option: PartyOption) => {
- if (slotIndex < scene.getParty().length) {
- scene.ui.setMode(Mode.MYSTERY_ENCOUNTER).then(() => {
- const pokemon = scene.getParty()[slotIndex];
- const secondaryOptions = onPokemonSelected(pokemon);
- if (!secondaryOptions) {
- scene.currentBattle.mysteryEncounter.setDialogueToken("selectedPokemon", pokemon.name);
- resolve(true);
- return;
- }
-
- // There is a second option to choose after selecting the Pokemon
- scene.ui.setMode(Mode.MESSAGE).then(() => {
- const displayOptions = () => {
- // Always appends a cancel option to bottom of options
- const fullOptions = secondaryOptions.map(option => {
- // Update handler to resolve promise
- const onSelect = option.handler;
- option.handler = () => {
- onSelect();
- scene.currentBattle.mysteryEncounter.setDialogueToken("selectedPokemon", pokemon.name);
- resolve(true);
- return true;
- };
- return option;
- }).concat({
- label: i18next.t("menu:cancel"),
- handler: () => {
- scene.ui.setMode(Mode.MYSTERY_ENCOUNTER);
- resolve(false);
- return true;
- },
- onHover: () => {
- scene.ui.showText("Return to encounter option select.");
- }
- });
-
- const config: OptionSelectConfig = {
- options: fullOptions,
- maxOptions: 7,
- yOffset: 0,
- supportHover: true
- };
- scene.ui.setModeWithoutClear(Mode.OPTION_SELECT, config, null, true);
- };
-
- const textPromptKey = scene.currentBattle.mysteryEncounter.selectedOption.dialogue.secondOptionPrompt;
- if (!textPromptKey) {
- displayOptions();
- } else {
- const secondOptionSelectPrompt = getTextWithEncounterDialogueTokens(scene, textPromptKey);
- scene.ui.showText(secondOptionSelectPrompt, null, displayOptions, null, true);
- }
- });
- });
- } else {
- scene.ui.setMode(Mode.MYSTERY_ENCOUNTER).then(() => {
- if (onPokemonNotSelected) {
- onPokemonNotSelected();
- }
- resolve(false);
- });
- }
- });
- });
-}
-
-/**
- * Will initialize exp phases to follow the mystery encounter (in addition to any combat or other exp earned)
- * Exp earned will be a simple function that linearly scales with wave index, that can be increased or decreased by the expMultiplier
- * Exp Share will have no effect (so no accounting for what mon is "on the field")
- * Exp Balance will still function as normal
- * @param scene - Battle Scene
- * @param expMultiplier - default is 100, can be increased or decreased as desired
- */
-export function setEncounterExp(scene: BattleScene, expMultiplier: number = 100) {
- //const expBalanceModifier = scene.findModifier(m => m instanceof ExpBalanceModifier) as ExpBalanceModifier;
- const expVal = scene.currentBattle.waveIndex * expMultiplier;
- const pokemonExp = new Utils.NumberHolder(expVal);
- const partyMemberExp = [];
-
- const party = scene.getParty();
- party.forEach(pokemon => {
- scene.applyModifiers(PokemonExpBoosterModifier, true, pokemon, pokemonExp);
- partyMemberExp.push(Math.floor(pokemonExp.value));
- });
-
- // TODO
- //if (expBalanceModifier) {
- // let totalLevel = 0;
- // let totalExp = 0;
- // expPartyMembers.forEach((expPartyMember, epm) => {
- // totalExp += partyMemberExp[epm];
- // totalLevel += expPartyMember.level;
- // });
-
- // const medianLevel = Math.floor(totalLevel / expPartyMembers.length);
-
- // const recipientExpPartyMemberIndexes = [];
- // expPartyMembers.forEach((expPartyMember, epm) => {
- // if (expPartyMember.level <= medianLevel) {
- // recipientExpPartyMemberIndexes.push(epm);
- // }
- // });
-
- // const splitExp = Math.floor(totalExp / recipientExpPartyMemberIndexes.length);
-
- // expPartyMembers.forEach((_partyMember, pm) => {
- // partyMemberExp[pm] = Phaser.Math.Linear(partyMemberExp[pm], recipientExpPartyMemberIndexes.indexOf(pm) > -1 ? splitExp : 0, 0.2 * expBalanceModifier.getStackCount());
- // });
- //}
-}
-
-/**
- * Can be used to exit an encounter without any battles or followup
- * Will skip any shops and rewards, and queue the next encounter phase as normal
- * @param scene
- * @param addHealPhase - when true, will add a shop phase to end of encounter with 0 rewards but healing items are available
- */
-export function leaveEncounterWithoutBattle(scene: BattleScene, addHealPhase: boolean = false) {
- scene.currentBattle.mysteryEncounter.encounterVariant = MysteryEncounterVariant.NO_BATTLE;
- scene.clearPhaseQueue();
- scene.clearPhaseQueueSplice();
- handleMysteryEncounterVictory(scene, addHealPhase);
-}
-
-export function handleMysteryEncounterVictory(scene: BattleScene, addHealPhase: boolean = false) {
- if (scene.currentBattle.mysteryEncounter.encounterVariant === MysteryEncounterVariant.NO_BATTLE) {
- scene.pushPhase(new EggLapsePhase(scene));
- scene.pushPhase(new MysteryEncounterRewardsPhase(scene, addHealPhase));
- } else if (!scene.getEnemyParty().find(p => scene.currentBattle.mysteryEncounter.encounterVariant !== MysteryEncounterVariant.TRAINER_BATTLE ? p.isOnField() : !p?.isFainted(true))) {
- scene.pushPhase(new BattleEndPhase(scene));
- if (scene.currentBattle.mysteryEncounter.encounterVariant === MysteryEncounterVariant.TRAINER_BATTLE) {
- scene.pushPhase(new TrainerVictoryPhase(scene));
- }
- if (scene.gameMode.isEndless || !scene.gameMode.isWaveFinal(scene.currentBattle.waveIndex)) {
- scene.pushPhase(new EggLapsePhase(scene));
- scene.pushPhase(new MysteryEncounterRewardsPhase(scene, addHealPhase));
- }
- }
-}
-
-/**
- * TODO: remove once encounter spawn rate is finalized
- * Just a helper function to calculate aggregate stats for MEs in a Classic run
- * @param scene
- * @param baseSpawnWeight
- */
-export function calculateMEAggregateStats(scene: BattleScene, baseSpawnWeight: number) {
- const numRuns = 1000;
- let run = 0;
- const targetEncountersPerRun = 15;
-
- const calculateNumEncounters = (): number[] => {
- let encounterRate = baseSpawnWeight;
- const numEncounters = [0, 0, 0, 0];
- let currentBiome = Biome.TOWN;
- let currentArena = scene.newArena(currentBiome);
- for (let i = 10; i < 180; i++) {
- // Boss
- if (i % 10 === 0) {
- continue;
- }
-
- // New biome
- if (i % 10 === 1) {
- if (Array.isArray(biomeLinks[currentBiome])) {
- let biomes: Biome[];
- scene.executeWithSeedOffset(() => {
- biomes = (biomeLinks[currentBiome] as (Biome | [Biome, integer])[])
- .filter(b => !Array.isArray(b) || !Utils.randSeedInt(b[1]))
- .map(b => !Array.isArray(b) ? b : b[0]);
- }, i);
- currentBiome = biomes[Utils.randSeedInt(biomes.length)];
- } else if (biomeLinks.hasOwnProperty(currentBiome)) {
- currentBiome = (biomeLinks[currentBiome] as Biome);
- } else {
- if (!(i % 50)) {
- currentBiome = Biome.END;
- } else {
- currentBiome = scene.generateRandomBiome(i);
- }
- }
-
- currentArena = scene.newArena(currentBiome);
- }
-
- // Fixed battle
- if (scene.gameMode.isFixedBattle(i)) {
- continue;
- }
-
- // Trainer
- if (scene.gameMode.isWaveTrainer(i, currentArena)) {
- continue;
- }
-
- // Otherwise, roll encounter
-
- const roll = Utils.randSeedInt(256);
-
- // If total number of encounters is lower than expected for the run, slightly favor a new encounter
- // Do the reverse as well
- const expectedEncountersByFloor = targetEncountersPerRun / (180 - 10) * i;
- const currentRunDiffFromAvg = expectedEncountersByFloor - numEncounters.reduce((a, b) => a + b);
- const favoredEncounterRate = encounterRate + currentRunDiffFromAvg * 5;
-
- if (roll < favoredEncounterRate) {
- encounterRate = baseSpawnWeight;
-
- // Calculate encounter rarity
- // Common / Uncommon / Rare / Super Rare (base is out of 128)
- const tierWeights = [61, 40, 21, 6];
-
- // Adjust tier weights by currently encountered events (pity system that lowers odds of multiple common/uncommons)
- tierWeights[0] = tierWeights[0] - 6 * numEncounters[0];
- tierWeights[1] = tierWeights[1] - 4 * numEncounters[1];
-
- const totalWeight = tierWeights.reduce((a, b) => a + b);
- const tierValue = Utils.randSeedInt(totalWeight);
- const commonThreshold = totalWeight - tierWeights[0]; // 64 - 32 = 32
- const uncommonThreshold = totalWeight - tierWeights[0] - tierWeights[1]; // 64 - 32 - 16 = 16
- const rareThreshold = totalWeight - tierWeights[0] - tierWeights[1] - tierWeights[2]; // 64 - 32 - 16 - 10 = 6
-
- tierValue > commonThreshold ? ++numEncounters[0] : tierValue > uncommonThreshold ? ++numEncounters[1] : tierValue > rareThreshold ? ++numEncounters[2] : ++numEncounters[3];
- } else {
- encounterRate++;
- }
- }
-
- return numEncounters;
- };
-
- const runs = [];
- while (run < numRuns) {
- scene.executeWithSeedOffset(() => {
- const numEncounters = calculateNumEncounters();
- runs.push(numEncounters);
- }, 1000 * run);
- run++;
- }
-
- const n = runs.length;
- const totalEncountersInRun = runs.map(run => run.reduce((a, b) => a + b));
- const totalMean = totalEncountersInRun.reduce((a, b) => a + b) / n;
- const totalStd = Math.sqrt(totalEncountersInRun.map(x => Math.pow(x - totalMean, 2)).reduce((a, b) => a + b) / n);
- const commonMean = runs.reduce((a, b) => a + b[0], 0) / n;
- const uncommonMean = runs.reduce((a, b) => a + b[1], 0) / n;
- const rareMean = runs.reduce((a, b) => a + b[2], 0) / n;
- const superRareMean = runs.reduce((a, b) => a + b[3], 0) / n;
-
- console.log(`Starting weight: ${baseSpawnWeight}\nAverage MEs per run: ${totalMean}\nStandard Deviation: ${totalStd}\nAvg Commons: ${commonMean}\nAvg Uncommons: ${uncommonMean}\nAvg Rares: ${rareMean}\nAvg Super Rares: ${superRareMean}`);
-}
diff --git a/src/data/mystery-encounters/mystery-encounters.ts b/src/data/mystery-encounters/mystery-encounters.ts
deleted file mode 100644
index 1a0f6f2a1ceb..000000000000
--- a/src/data/mystery-encounters/mystery-encounters.ts
+++ /dev/null
@@ -1,144 +0,0 @@
-import MysteryEncounter from "../mystery-encounter";
-import {DarkDealEncounter} from "./dark-deal";
-import {MysteriousChallengersEncounter} from "./mysterious-challengers";
-import {MysteriousChestEncounter} from "./mysterious-chest";
-import {FightOrFlightEncounter} from "#app/data/mystery-encounters/fight-or-flight";
-import {TrainingSessionEncounter} from "#app/data/mystery-encounters/training-session";
-import { Biome } from "#app/enums/biome";
-import { SleepingSnorlaxEncounter } from "./sleeping-snorlax";
-import { MysteryEncounterType } from "#enums/mystery-encounter-type";
-
-export const BASE_MYSTERY_ENCOUNTER_WEIGHT = 19;
-export const AVERAGE_ENCOUNTERS_PER_RUN_TARGET = 15;
-
-export const allMysteryEncounters : {[encounterType:string]: MysteryEncounter} = {};
-
-// Add MysteryEncounterType to biomes to enable it exclusively for those biomes
-// To enable an encounter in all biomes, do not add to this map
-export const mysteryEncountersByBiome = new Map([
- [Biome.TOWN, [
- ]],
- [Biome.PLAINS,[
-
- ]],
- [Biome.GRASS, [
- MysteryEncounterType.SLEEPING_SNORLAX
- ]],
- [Biome.TALL_GRASS, [
-
- ]],
- [Biome.METROPOLIS, [
-
- ]],
- [Biome.FOREST, [
- MysteryEncounterType.SLEEPING_SNORLAX
- ]],
-
- [Biome.SEA, [
-
- ]],
- [Biome.SWAMP, [
-
- ]],
- [Biome.BEACH, [
-
- ]],
- [Biome.LAKE, [
-
- ]],
- [Biome.SEABED, [
-
- ]],
- [Biome.MOUNTAIN, [
- MysteryEncounterType.SLEEPING_SNORLAX
- ]],
- [Biome.BADLANDS, [
-
- ]],
- [Biome.CAVE, [
- MysteryEncounterType.SLEEPING_SNORLAX
- ]],
- [Biome.DESERT, [
-
- ]],
- [Biome.ICE_CAVE, [
-
- ]],
- [Biome.MEADOW, [
-
- ]],
- [Biome.POWER_PLANT, [
-
- ]],
- [Biome.VOLCANO, [
-
- ]],
- [Biome.GRAVEYARD, [
-
- ]],
- [Biome.DOJO, [
-
- ]],
- [Biome.FACTORY, [
-
- ]],
- [Biome.RUINS, [
-
- ]],
- [Biome.WASTELAND, [
-
- ]],
- [Biome.ABYSS, [
-
- ]],
- [Biome.SPACE, [
-
- ]],
- [Biome.CONSTRUCTION_SITE, [
-
- ]],
- [Biome.JUNGLE, [
-
- ]],
- [Biome.FAIRY_CAVE, [
-
- ]],
- [Biome.TEMPLE, [
-
- ]],
- [Biome.SLUM, [
-
- ]],
- [Biome.SNOWY_FOREST, [
-
- ]],
- [Biome.ISLAND, [
-
- ]],
- [Biome.LABORATORY, [
-
- ]]
-]);
-
-// Only add your MysterEncounter here if you want it to be in every biome.
-// We recommend designing biome-specific encounters for better flavor and variance
-export function initMysteryEncounters() {
- allMysteryEncounters[MysteryEncounterType.MYSTERIOUS_CHALLENGERS] = MysteriousChallengersEncounter;
- allMysteryEncounters[MysteryEncounterType.MYSTERIOUS_CHEST] = MysteriousChestEncounter;
- allMysteryEncounters[MysteryEncounterType.DARK_DEAL] = DarkDealEncounter;
- allMysteryEncounters[MysteryEncounterType.FIGHT_OR_FLIGHT] = FightOrFlightEncounter;
- allMysteryEncounters[MysteryEncounterType.TRAINING_SESSION] = TrainingSessionEncounter;
- allMysteryEncounters[MysteryEncounterType.SLEEPING_SNORLAX] = SleepingSnorlaxEncounter;
-
- // Append encounters that can occur in any biome to biome map
- const anyBiomeEncounters: MysteryEncounterType[] = Object.keys(MysteryEncounterType).filter(e => !isNaN(Number(e))).map(k => Number(k) as MysteryEncounterType);
- mysteryEncountersByBiome.forEach(biomeEncounters => {
- biomeEncounters.forEach(e => {
- if (anyBiomeEncounters.includes(e)) {
- anyBiomeEncounters.splice(anyBiomeEncounters.indexOf(e), 1);
- }
- });
- });
-
- mysteryEncountersByBiome.forEach(biomeEncounters => biomeEncounters.push(...anyBiomeEncounters));
-}
diff --git a/src/data/mystery-encounters/sleeping-snorlax.ts b/src/data/mystery-encounters/sleeping-snorlax.ts
deleted file mode 100644
index 56baa4ea1e7b..000000000000
--- a/src/data/mystery-encounters/sleeping-snorlax.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-import BattleScene from "../../battle-scene";
-import {
- EnemyPartyConfig,
- EnemyPokemonConfig,
- initBattleWithEnemyConfig,
- leaveEncounterWithoutBattle, queueEncounterMessage,
- setCustomEncounterRewards
-} from "./mystery-encounter-utils";
-import MysteryEncounter, {MysteryEncounterBuilder, MysteryEncounterTier} from "../mystery-encounter";
-import * as Utils from "../../utils";
-import {MysteryEncounterType} from "#enums/mystery-encounter-type";
-import {MoveRequirement, WaveCountRequirement} from "../mystery-encounter-requirements";
-import {MysteryEncounterOptionBuilder} from "../mystery-encounter-option";
-import {
- ModifierTypeGenerator,
- ModifierTypeOption,
- modifierTypes
-} from "#app/modifier/modifier-type";
-import { getPokemonSpecies } from "../pokemon-species";
-import { Species } from "#enums/species";
-import { Status, StatusEffect } from "../status-effect";
-import { Moves } from "#enums/moves";
-import { BerryType } from "#enums/berry-type";
-
-export const SleepingSnorlaxEncounter: MysteryEncounter = new MysteryEncounterBuilder()
- .withEncounterType(MysteryEncounterType.SLEEPING_SNORLAX)
- .withEncounterTier(MysteryEncounterTier.RARE)
- .withIntroSpriteConfigs([
- {
- spriteKey: Species.SNORLAX.toString(),
- fileRoot: "pokemon",
- hasShadow: true,
- tint: 0.25,
- repeat: true
- }
- ])
- .withSceneRequirement(new WaveCountRequirement([10, 180])) // waves 10 to 180
- .withCatchAllowed(true)
- .withHideWildIntroMessage(true)
- .withOnInit((scene: BattleScene) => {
- const encounter = scene.currentBattle.mysteryEncounter;
- console.log(encounter);
-
- // Calculate boss mon
- const bossSpecies = getPokemonSpecies(Species.SNORLAX);
- const pokemonConfig: EnemyPokemonConfig = {
- species: bossSpecies,
- isBoss: true,
- status: StatusEffect.SLEEP
- };
- const config: EnemyPartyConfig = {
- levelAdditiveMultiplier: 2,
- pokemonConfigs: [pokemonConfig]
- };
- encounter.enemyPartyConfigs = [config];
- return true;
- })
- .withOption(new MysteryEncounterOptionBuilder()
- .withOptionPhase(async (scene: BattleScene) => {
- // Pick battle
- // TODO: do we want special rewards for this?
- // setCustomEncounterRewards(scene, { guaranteedModifierTypeFuncs: [modifierTypes.LEFTOVERS], fillRemaining: true});
- await initBattleWithEnemyConfig(scene, scene.currentBattle.mysteryEncounter.enemyPartyConfigs[0]);
- })
- .build())
- .withOption(new MysteryEncounterOptionBuilder()
- .withOptionPhase(async (scene: BattleScene) => {
- const instance = scene.currentBattle.mysteryEncounter;
- let roll:integer;
- scene.executeWithSeedOffset(() => {
- roll = Utils.randSeedInt(16, 0);
- }, scene.currentBattle.waveIndex);
- console.log(roll);
- if (roll > 4) {
- // Fall asleep and get a sitrus berry (75%)
- const p = instance.primaryPokemon;
- p.status = new Status(StatusEffect.SLEEP, 0, 3);
- p.updateInfo(true);
- const sitrus = (modifierTypes.BERRY?.() as ModifierTypeGenerator).generateType(scene.getParty(), [BerryType.SITRUS]);
-
- setCustomEncounterRewards(scene, { guaranteedModifierTypeOptions: [new ModifierTypeOption(sitrus, 0)], fillRemaining: false});
- queueEncounterMessage(scene, "mysteryEncounter:sleeping_snorlax_option_2_bad_result");
- leaveEncounterWithoutBattle(scene);
- } else {
- // Heal to full (25%)
- for (const pokemon of scene.getParty()) {
- pokemon.hp = pokemon.getMaxHp();
- pokemon.resetStatus();
- for (const move of pokemon.moveset) {
- move.ppUsed = 0;
- }
- pokemon.updateInfo(true);
- }
-
- queueEncounterMessage(scene, "mysteryEncounter:sleeping_snorlax_option_2_good_result");
- leaveEncounterWithoutBattle(scene);
- }
- })
- .build())
- .withOption(new MysteryEncounterOptionBuilder()
- .withPrimaryPokemonRequirement(new MoveRequirement([Moves.PLUCK, Moves.COVET, Moves.KNOCK_OFF, Moves.THIEF, Moves.TRICK, Moves.SWITCHEROO]))
- .withOptionPhase(async (scene: BattleScene) => {
- // Leave encounter with no rewards or exp
- setCustomEncounterRewards(scene, { guaranteedModifierTypeFuncs: [modifierTypes.LEFTOVERS], fillRemaining: false});
- queueEncounterMessage(scene, "mysteryEncounter:sleeping_snorlax_option_3_good_result");
- leaveEncounterWithoutBattle(scene);
- })
- .build())
- .build();
diff --git a/src/data/mystery-encounters/training-session.ts b/src/data/mystery-encounters/training-session.ts
deleted file mode 100644
index 9866a2785a11..000000000000
--- a/src/data/mystery-encounters/training-session.ts
+++ /dev/null
@@ -1,306 +0,0 @@
-import BattleScene from "../../battle-scene";
-import {
- EnemyPartyConfig,
- getTextWithEncounterDialogueTokens,
- initBattleWithEnemyConfig,
- selectPokemonForOption,
- setCustomEncounterRewards
-} from "#app/data/mystery-encounters/mystery-encounter-utils";
-import {MysteryEncounterType} from "#enums/mystery-encounter-type";
-import MysteryEncounter, {MysteryEncounterBuilder, MysteryEncounterTier} from "../mystery-encounter";
-import {MysteryEncounterOptionBuilder} from "../mystery-encounter-option";
-import {WaveCountRequirement} from "../mystery-encounter-requirements";
-import {PlayerPokemon} from "#app/field/pokemon";
-import PokemonData from "#app/system/pokemon-data";
-import {randSeedShuffle} from "#app/utils";
-import {getNatureName, Nature} from "#app/data/nature";
-import {BattlerTagType} from "#enums/battler-tag-type";
-import {OptionSelectItem} from "#app/ui/abstact-option-select-ui-handler";
-import {PokemonHeldItemModifier} from "#app/modifier/modifier";
-import {PokemonHeldItemModifierType} from "#app/modifier/modifier-type";
-import {Ability, allAbilities} from "#app/data/ability";
-import {speciesStarters} from "#app/data/pokemon-species";
-import {AbilityAttr} from "#app/system/game-data";
-import {Stat} from "#app/data/pokemon-stat";
-import {pokemonInfo} from "#app/locales/en/pokemon-info";
-
-export const TrainingSessionEncounter: MysteryEncounter = new MysteryEncounterBuilder()
- .withEncounterType(MysteryEncounterType.TRAINING_SESSION)
- .withEncounterTier(MysteryEncounterTier.RARE)
- .withIntroSpriteConfigs([
- {
- spriteKey: "training_gear",
- fileRoot: "mystery-encounters",
- hasShadow: true,
- y: 3
- }
- ])
- .withSceneRequirement(new WaveCountRequirement([10, 180])) // waves 10 to 180
- .withHideWildIntroMessage(true)
- .withOption(new MysteryEncounterOptionBuilder()
- .withPreOptionPhase(async (scene: BattleScene): Promise => {
- const encounter = scene.currentBattle.mysteryEncounter;
- const onPokemonSelected = (pokemon: PlayerPokemon) => {
- encounter.misc = {
- playerPokemon: pokemon
- };
- };
-
- return selectPokemonForOption(scene, onPokemonSelected);
- })
- .withOptionPhase(async (scene: BattleScene) => {
- const encounter = scene.currentBattle.mysteryEncounter;
- const playerPokemon: PlayerPokemon = encounter.misc.playerPokemon;
-
- // Spawn light training session with chosen pokemon
- // Every 50 waves, add +1 boss segment, capping at 5
- const segments = Math.min(2 + Math.floor(scene.currentBattle.waveIndex / 50), 5);
- const modifiers = new ModifiersHolder();
- const config = getEnemyConfig(scene, playerPokemon, segments, modifiers);
- scene.removePokemonFromPlayerParty(playerPokemon, false);
-
- const getIvName = (index: number) => {
- switch (index) {
- case Stat.HP:
- return pokemonInfo.Stat["HPshortened"];
- case Stat.ATK:
- return pokemonInfo.Stat["ATKshortened"];
- case Stat.DEF:
- return pokemonInfo.Stat["DEFshortened"];
- case Stat.SPATK:
- return pokemonInfo.Stat["SPATKshortened"];
- case Stat.SPDEF:
- return pokemonInfo.Stat["SPDEFshortened"];
- case Stat.SPD:
- return pokemonInfo.Stat["SPDshortened"];
- }
- };
-
- const onBeforeRewardsPhase = () => {
- encounter.setDialogueToken("stat1", "-");
- encounter.setDialogueToken("stat2", "-");
- // Add the pokemon back to party with IV boost
- const ivIndexes = [];
- playerPokemon.ivs.forEach((iv, index) => {
- if (iv < 31) {
- ivIndexes.push({iv: iv, index: index});
- }
- });
-
- // Improves 2 random non-maxed IVs
- // +10 if IV is < 10, +5 if between 10-20, and +3 if > 20
- // A 0-4 starting IV will cap in 6 encounters (assuming you always rolled that IV)
- // 5-14 starting IV caps in 5 encounters
- // 15-19 starting IV caps in 4 encounters
- // 20-24 starting IV caps in 3 encounters
- // 25-27 starting IV caps in 2 encounters
- let improvedCount = 0;
- while (ivIndexes.length > 0 && improvedCount < 2) {
- randSeedShuffle(ivIndexes);
- const ivToChange = ivIndexes.pop();
- let newVal = ivToChange.iv;
- if (improvedCount === 0) {
- encounter.setDialogueToken("stat1", getIvName(ivToChange.index));
- } else {
- encounter.setDialogueToken("stat2", getIvName(ivToChange.index));
- }
-
- // Corrects required encounter breakpoints to be continuous for all IV values
- if (ivToChange.iv <= 21 && ivToChange.iv - 1 % 5 === 0) {
- newVal += 1;
- }
-
- newVal += ivToChange.iv <= 10 ? 10 : ivToChange.iv <= 20 ? 5 : 3;
- newVal = Math.min(newVal, 31);
- playerPokemon.ivs[ivToChange.index] = newVal;
- improvedCount++;
- }
-
- if (improvedCount > 0) {
- playerPokemon.calculateStats();
- scene.gameData.updateSpeciesDexIvs(playerPokemon.species.getRootSpeciesId(true), playerPokemon.ivs);
- scene.gameData.setPokemonCaught(playerPokemon, false);
- }
-
- // Add pokemon and mods back
- scene.getParty().push(playerPokemon);
- for (const mod of modifiers.value) {
- scene.addModifier(mod, true, false, false, true);
- }
- scene.updateModifiers(true);
- scene.queueMessage(getTextWithEncounterDialogueTokens(scene, "mysteryEncounter:training_session_battle_finished_1"), null, true);
- };
-
- setCustomEncounterRewards(scene, { fillRemaining: true }, null, onBeforeRewardsPhase);
-
- return initBattleWithEnemyConfig(scene, config);
- })
- .build())
- .withOption(new MysteryEncounterOptionBuilder()
- .withPreOptionPhase(async (scene: BattleScene): Promise => {
- // Open menu for selecting pokemon and Nature
- const encounter = scene.currentBattle.mysteryEncounter;
- const natures = new Array(25).fill(null).map((val, i) => i as Nature);
- const onPokemonSelected = (pokemon: PlayerPokemon) => {
- // Return the options for nature selection
- return natures.map((nature: Nature) => {
- const option: OptionSelectItem = {
- label: getNatureName(nature, true, true, true, scene.uiTheme),
- handler: () => {
- // Pokemon and second option selected
- encounter.setDialogueToken("nature", getNatureName(nature));
- encounter.misc = {
- playerPokemon: pokemon,
- chosenNature: nature
- };
- return true;
- }
- };
- return option;
- });
- };
-
- return selectPokemonForOption(scene, onPokemonSelected);
- })
- .withOptionPhase(async (scene: BattleScene) => {
- const encounter = scene.currentBattle.mysteryEncounter;
- const playerPokemon: PlayerPokemon = encounter.misc.playerPokemon;
-
- // Spawn medium training session with chosen pokemon
- // Every 40 waves, add +1 boss segment, capping at 6
- const segments = Math.min(2 + Math.floor(scene.currentBattle.waveIndex / 40), 6);
- const modifiers = new ModifiersHolder();
- const config = getEnemyConfig(scene, playerPokemon, segments, modifiers);
- scene.removePokemonFromPlayerParty(playerPokemon, false);
-
- const onBeforeRewardsPhase = () => {
- scene.queueMessage(getTextWithEncounterDialogueTokens(scene, "mysteryEncounter:training_session_battle_finished_2"), null, true);
- // Add the pokemon back to party with Nature change
- playerPokemon.setNature(encounter.misc.chosenNature);
- scene.gameData.setPokemonCaught(playerPokemon, false);
-
- // Add pokemon and mods back
- scene.getParty().push(playerPokemon);
- for (const mod of modifiers.value) {
- scene.addModifier(mod, true, false, false, true);
- }
- scene.updateModifiers(true);
- };
-
- setCustomEncounterRewards(scene, { fillRemaining: true }, null, onBeforeRewardsPhase);
-
- return initBattleWithEnemyConfig(scene, config);
- })
- .build())
- .withOption(new MysteryEncounterOptionBuilder()
- .withPreOptionPhase(async (scene: BattleScene): Promise => {
- // Open menu for selecting pokemon and ability to learn
- const encounter = scene.currentBattle.mysteryEncounter;
- const onPokemonSelected = (pokemon: PlayerPokemon) => {
- // Return the options for ability selection
- const speciesForm = !!pokemon.getFusionSpeciesForm() ? pokemon.getFusionSpeciesForm() : pokemon.getSpeciesForm();
- const abilityCount = speciesForm.getAbilityCount();
- const abilities = new Array(abilityCount).fill(null).map((val, i) => allAbilities[speciesForm.getAbility(i)]);
- return abilities.map((ability: Ability, index) => {
- const option: OptionSelectItem = {
- label: ability.name,
- handler: () => {
- // Pokemon and ability selected
- encounter.setDialogueToken("ability", ability.name);
- encounter.misc = {
- playerPokemon: pokemon,
- abilityIndex: index
- };
- return true;
- },
- onHover: () => {
- scene.ui.showText(ability.description);
- }
- };
- return option;
- });
- };
-
- return selectPokemonForOption(scene, onPokemonSelected);
- })
- .withOptionPhase(async (scene: BattleScene) => {
- const encounter = scene.currentBattle.mysteryEncounter;
- const playerPokemon: PlayerPokemon = encounter.misc.playerPokemon;
-
- // Spawn hard training session with chosen pokemon
- // Every 30 waves, add +1 boss segment, capping at 6
- // Also starts with +1 to all stats
- const segments = Math.min(2 + Math.floor(scene.currentBattle.waveIndex / 30), 6);
- const modifiers = new ModifiersHolder();
- const config = getEnemyConfig(scene, playerPokemon, segments, modifiers);
- config.pokemonConfigs[0].tags = [BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON];
- scene.removePokemonFromPlayerParty(playerPokemon, false);
-
- const onBeforeRewardsPhase = () => {
- scene.queueMessage(getTextWithEncounterDialogueTokens(scene, "mysteryEncounter:training_session_battle_finished_3"), null, true);
- // Add the pokemon back to party with ability change
- const abilityIndex = encounter.misc.abilityIndex;
- if (!!playerPokemon.getFusionSpeciesForm()) {
- playerPokemon.fusionAbilityIndex = abilityIndex;
- if (speciesStarters.hasOwnProperty(playerPokemon.fusionSpecies.speciesId)) {
- scene.gameData.starterData[playerPokemon.fusionSpecies.speciesId].abilityAttr |= abilityIndex !== 1 || playerPokemon.fusionSpecies.ability2
- ? Math.pow(2, playerPokemon.fusionAbilityIndex)
- : AbilityAttr.ABILITY_HIDDEN;
- }
- } else {
- playerPokemon.abilityIndex = abilityIndex;
- if (speciesStarters.hasOwnProperty(playerPokemon.species.speciesId)) {
- scene.gameData.starterData[playerPokemon.species.speciesId].abilityAttr |= abilityIndex !== 1 || playerPokemon.species.ability2
- ? Math.pow(2, playerPokemon.abilityIndex)
- : AbilityAttr.ABILITY_HIDDEN;
- }
- }
-
- playerPokemon.getAbility();
- playerPokemon.calculateStats();
- scene.gameData.setPokemonCaught(playerPokemon, false);
-
- // Add pokemon and mods back
- scene.getParty().push(playerPokemon);
- for (const mod of modifiers.value) {
- scene.addModifier(mod, true, false, false, true);
- }
- scene.updateModifiers(true);
- };
-
- setCustomEncounterRewards(scene, { fillRemaining: true }, null, onBeforeRewardsPhase);
-
- return initBattleWithEnemyConfig(scene, config);
- })
- .build())
- .build();
-
-function getEnemyConfig(scene: BattleScene, playerPokemon: PlayerPokemon, segments: number, modifiers: ModifiersHolder): EnemyPartyConfig {
- playerPokemon.resetSummonData();
-
- // Passes modifiers by reference
- modifiers.value = scene.findModifiers(m => m instanceof PokemonHeldItemModifier
- && (m as PokemonHeldItemModifier).pokemonId === playerPokemon.id) as PokemonHeldItemModifier[];
- const modifierTypes = modifiers.value.map(mod => mod.type) as PokemonHeldItemModifierType[];
-
- const data = new PokemonData(playerPokemon);
- return {
- pokemonConfigs: [
- {
- species: playerPokemon.species,
- isBoss: true,
- bossSegments: segments,
- formIndex: playerPokemon.formIndex,
- level: playerPokemon.level,
- dataSource: data,
- modifierTypes: modifierTypes
- }
- ]
- };
-}
-
-class ModifiersHolder {
- public value: PokemonHeldItemModifier[] = [];
-
- constructor() {}
-}
diff --git a/src/data/pokemon-evolutions.ts b/src/data/pokemon-evolutions.ts
index 1c2b903de75b..1fb1f7db5fd4 100644
--- a/src/data/pokemon-evolutions.ts
+++ b/src/data/pokemon-evolutions.ts
@@ -1145,11 +1145,6 @@ export const pokemonEvolutions: PokemonEvolutions = {
new SpeciesEvolution(Species.PAWMOT, 32, null, null)
],
[Species.TANDEMAUS]: [
- new SpeciesFormEvolution(Species.MAUSHOLD, "", "three", 25, null, new SpeciesEvolutionCondition(p => {
- let ret = false;
- p.scene.executeWithSeedOffset(() => ret = !Utils.randSeedInt(4), p.id);
- return ret;
- })),
new SpeciesEvolution(Species.MAUSHOLD, 25, null, null)
],
[Species.FIDOUGH]: [
diff --git a/src/data/pokemon-forms.ts b/src/data/pokemon-forms.ts
index b734abe190d9..ae1532f0be01 100644
--- a/src/data/pokemon-forms.ts
+++ b/src/data/pokemon-forms.ts
@@ -371,9 +371,6 @@ export function getSpeciesFormChangeMessage(pokemon: Pokemon, formChange: Specie
if (isRevert) {
return `${prefix}${pokemon.name} reverted\nto its original form!`;
}
- if (pokemon.species.speciesId === Species.MIMIKYU) {
- return "Its disguise served it as a decoy!";
- }
return `${prefix}${preName} changed form!`;
}
diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts
index a2eba88a5040..2b488f330c45 100644
--- a/src/data/pokemon-species.ts
+++ b/src/data/pokemon-species.ts
@@ -2431,8 +2431,8 @@ export function initSpecies() {
new PokemonSpecies(Species.PAWMOT, 9, false, false, false, "Hands-On Pokémon", Type.ELECTRIC, Type.FIGHTING, 0.9, 41, Abilities.VOLT_ABSORB, Abilities.NATURAL_CURE, Abilities.IRON_FIST, 490, 70, 115, 70, 70, 60, 105, 45, 50, 245, GrowthRate.MEDIUM_FAST, 50, false),
new PokemonSpecies(Species.TANDEMAUS, 9, false, false, false, "Couple Pokémon", Type.NORMAL, null, 0.3, 1.8, Abilities.RUN_AWAY, Abilities.PICKUP, Abilities.OWN_TEMPO, 305, 50, 50, 45, 40, 45, 75, 150, 50, 61, GrowthRate.FAST, null, false),
new PokemonSpecies(Species.MAUSHOLD, 9, false, false, false, "Family Pokémon", Type.NORMAL, null, 0.3, 2.3, Abilities.FRIEND_GUARD, Abilities.CHEEK_POUCH, Abilities.TECHNICIAN, 470, 74, 75, 70, 65, 75, 111, 75, 50, 165, GrowthRate.FAST, null, false, false,
- new PokemonForm("Family of Four", "four", Type.NORMAL, null, 0.3, 2.8, Abilities.FRIEND_GUARD, Abilities.CHEEK_POUCH, Abilities.TECHNICIAN, 470, 74, 75, 70, 65, 75, 111, 75, 50, 165),
- new PokemonForm("Family of Three", "three", Type.NORMAL, null, 0.3, 2.3, Abilities.FRIEND_GUARD, Abilities.CHEEK_POUCH, Abilities.TECHNICIAN, 470, 74, 75, 70, 65, 75, 111, 75, 50, 165),
+ new PokemonForm("Family of Four", "four", Type.NORMAL, null, 0.3, 2.3, Abilities.FRIEND_GUARD, Abilities.CHEEK_POUCH, Abilities.TECHNICIAN, 470, 74, 75, 70, 65, 75, 111, 75, 50, 165),
+ new PokemonForm("Family of Three", "three", Type.NORMAL, null, 0.3, 2.8, Abilities.FRIEND_GUARD, Abilities.CHEEK_POUCH, Abilities.TECHNICIAN, 470, 74, 75, 70, 65, 75, 111, 75, 50, 165),
),
new PokemonSpecies(Species.FIDOUGH, 9, false, false, false, "Puppy Pokémon", Type.FAIRY, null, 0.3, 10.9, Abilities.OWN_TEMPO, Abilities.NONE, Abilities.KLUTZ, 312, 37, 55, 70, 30, 55, 65, 190, 50, 62, GrowthRate.MEDIUM_SLOW, 50, false),
new PokemonSpecies(Species.DACHSBUN, 9, false, false, false, "Dog Pokémon", Type.FAIRY, null, 0.5, 14.9, Abilities.WELL_BAKED_BODY, Abilities.NONE, Abilities.AROMA_VEIL, 477, 57, 80, 115, 50, 80, 95, 90, 50, 167, GrowthRate.MEDIUM_SLOW, 50, false),
diff --git a/src/data/terrain.ts b/src/data/terrain.ts
index f7324c28b93b..e396c693c4ed 100644
--- a/src/data/terrain.ts
+++ b/src/data/terrain.ts
@@ -5,7 +5,6 @@ import * as Utils from "../utils";
import { IncrementMovePriorityAbAttr, applyAbAttrs } from "./ability";
import { ProtectAttr } from "./move";
import { BattlerIndex } from "#app/battle.js";
-import i18next from "i18next";
export enum TerrainType {
NONE,
@@ -68,22 +67,6 @@ export class Terrain {
}
}
-export function getTerrainName(terrainType: TerrainType): string {
- switch (terrainType) {
- case TerrainType.MISTY:
- return i18next.t("terrain:misty");
- case TerrainType.ELECTRIC:
- return i18next.t("terrain:electric");
- case TerrainType.GRASSY:
- return i18next.t("terrain:grassy");
- case TerrainType.PSYCHIC:
- return i18next.t("terrain:psychic");
- }
-
- return "";
-}
-
-
export function getTerrainColor(terrainType: TerrainType): [ integer, integer, integer ] {
switch (terrainType) {
case TerrainType.MISTY:
diff --git a/src/data/trainer-config.ts b/src/data/trainer-config.ts
index fa9d0fdd55ab..8a25406fc5af 100644
--- a/src/data/trainer-config.ts
+++ b/src/data/trainer-config.ts
@@ -810,63 +810,6 @@ export class TrainerConfig {
}
});
}
-
- copy(): TrainerConfig {
- let copy = new TrainerConfig(this.trainerType);
- copy = this.trainerTypeDouble ? copy.setDoubleTrainerType(this.trainerTypeDouble) : copy;
- copy = this.name ? copy.setName(this.name) : copy;
- copy = this.hasGenders ? copy.setHasGenders(this.nameFemale, this.femaleEncounterBgm) : copy;
- copy = this.hasDouble ? copy.setHasDouble(this.nameDouble, this.doubleEncounterBgm) : copy;
- copy = this.title ? copy.setTitle(this.title) : copy;
- copy = this.titleDouble ? copy.setDoubleTitle(this.titleDouble) : copy;
- copy = this.hasCharSprite ? copy.setHasCharSprite() : copy;
- copy = this.doubleOnly ? copy.setDoubleOnly() : copy;
- copy = this.moneyMultiplier ? copy.setMoneyMultiplier(this.moneyMultiplier) : copy;
- copy = this.isBoss ? copy.setBoss() : copy;
- copy = this.hasStaticParty ? copy.setStaticParty() : copy;
- copy = this.useSameSeedForAllMembers ? copy.setUseSameSeedForAllMembers() : copy;
- copy = this.battleBgm ? copy.setBattleBgm(this.battleBgm) : copy;
- copy = this.encounterBgm ? copy.setEncounterBgm(this.encounterBgm) : copy;
- copy = this.victoryBgm ? copy.setVictoryBgm(this.victoryBgm) : copy;
- copy = this.genModifiersFunc ? copy.setGenModifiersFunc(this.genModifiersFunc) : copy;
-
- if (this.modifierRewardFuncs) {
- // Clones array instead of passing ref
- copy.modifierRewardFuncs = this.modifierRewardFuncs.slice(0);
- }
-
- if (this.partyTemplates) {
- copy.partyTemplates = this.partyTemplates.slice(0);
- }
-
- copy = this.partyTemplateFunc ? copy.setPartyTemplateFunc(this.partyTemplateFunc) : copy;
-
- if (this.partyMemberFuncs) {
- Object.keys(this.partyMemberFuncs).forEach((index) => {
- copy = copy.setPartyMemberFunc(parseInt(index, 10), this.partyMemberFuncs[index]);
- });
- }
-
- copy = this.speciesPools ? copy.setSpeciesPools(this.speciesPools) : copy;
- copy = this.speciesFilter ? copy.setSpeciesFilter(this.speciesFilter) : copy;
- if (this.specialtyTypes) {
- copy.specialtyTypes = this.specialtyTypes.slice(0);
- }
-
- copy.encounterMessages = this.encounterMessages?.slice(0);
- copy.victoryMessages = this.victoryMessages?.slice(0);
- copy.defeatMessages = this.defeatMessages?.slice(0);
-
- copy.femaleEncounterMessages = this.femaleEncounterMessages?.slice(0);
- copy.femaleVictoryMessages = this.femaleVictoryMessages?.slice(0);
- copy.femaleDefeatMessages = this.femaleDefeatMessages?.slice(0);
-
- copy.doubleEncounterMessages = this.doubleEncounterMessages?.slice(0);
- copy.doubleVictoryMessages = this.doubleVictoryMessages?.slice(0);
- copy.doubleDefeatMessages = this.doubleDefeatMessages?.slice(0);
-
- return copy;
- }
}
let t = 0;
diff --git a/src/data/weather.ts b/src/data/weather.ts
index f671c7548730..425dd3724f63 100644
--- a/src/data/weather.ts
+++ b/src/data/weather.ts
@@ -1,12 +1,12 @@
import { Biome } from "#enums/biome";
-import { getPokemonNameWithAffix } from "../messages";
+import { getPokemonMessage, getPokemonNameWithAffix } from "../messages";
import Pokemon from "../field/pokemon";
import { Type } from "./type";
import Move, { AttackMove } from "./move";
import * as Utils from "../utils";
import BattleScene from "../battle-scene";
import { SuppressWeatherEffectAbAttr } from "./ability";
-import { TerrainType, getTerrainName } from "./terrain";
+import { TerrainType } from "./terrain";
import i18next from "i18next";
export enum WeatherType {
@@ -216,34 +216,34 @@ export function getWeatherClearMessage(weatherType: WeatherType): string {
export function getTerrainStartMessage(terrainType: TerrainType): string {
switch (terrainType) {
case TerrainType.MISTY:
- return i18next.t("terrain:mistyStartMessage");
+ return "Mist swirled around the battlefield!";
case TerrainType.ELECTRIC:
- return i18next.t("terrain:electricStartMessage");
+ return "An electric current ran across the battlefield!";
case TerrainType.GRASSY:
- return i18next.t("terrain:grassyStartMessage");
+ return "Grass grew to cover the battlefield!";
case TerrainType.PSYCHIC:
- return i18next.t("terrain:psychicStartMessage");
+ return "The battlefield got weird!";
}
}
export function getTerrainClearMessage(terrainType: TerrainType): string {
switch (terrainType) {
case TerrainType.MISTY:
- return i18next.t("terrain:mistyClearMessage");
+ return "The mist disappeared from the battlefield.";
case TerrainType.ELECTRIC:
- return i18next.t("terrain:electricClearMessage");
+ return "The electricity disappeared from the battlefield.";
case TerrainType.GRASSY:
- return i18next.t("terrain:grassyClearMessage");
+ return "The grass disappeared from the battlefield.";
case TerrainType.PSYCHIC:
- return i18next.t("terrain:psychicClearMessage");
+ return "The weirdness disappeared from the battlefield!";
}
}
export function getTerrainBlockMessage(pokemon: Pokemon, terrainType: TerrainType): string {
if (terrainType === TerrainType.MISTY) {
- return i18next.t("terrain:mistyBlockMessage", {pokemonNameWithAffix: getPokemonNameWithAffix(pokemon)});
+ return getPokemonMessage(pokemon, " surrounds itself with a protective mist!");
}
- return i18next.t("terrain:defaultBlockMessage", {pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), terrainName: getTerrainName(terrainType)});
+ return getPokemonMessage(pokemon, ` is protected by the ${Utils.toReadableString(TerrainType[terrainType])} Terrain!`);
}
interface WeatherPoolEntry {
diff --git a/src/enums/battler-tag-type.ts b/src/enums/battler-tag-type.ts
index 46faf1d1656b..5cdabfe78c23 100644
--- a/src/enums/battler-tag-type.ts
+++ b/src/enums/battler-tag-type.ts
@@ -59,9 +59,5 @@ export enum BattlerTagType {
MINIMIZED = "MINIMIZED",
DESTINY_BOND = "DESTINY_BOND",
CENTER_OF_ATTENTION = "CENTER_OF_ATTENTION",
- ICE_FACE = "ICE_FACE",
- RECEIVE_DOUBLE_DAMAGE = "TAKE_DOUBLE_DAMAGE",
- ALWAYS_GET_HIT = "ALWAYS_GET_HIT",
- DISGUISE = "DISGUISE",
- MYSTERY_ENCOUNTER_POST_SUMMON = "MYSTERY_ENCOUNTER_POST_SUMMON" // Provides effects on post-summon for MEs
+ ICE_FACE = "ICE_FACE"
}
diff --git a/src/enums/game-data-type.ts b/src/enums/game-data-type.ts
index 179817fe5be6..d672253794a4 100644
--- a/src/enums/game-data-type.ts
+++ b/src/enums/game-data-type.ts
@@ -6,5 +6,6 @@ export enum GameDataType {
SESSION,
SETTINGS,
TUTORIALS,
- SEEN_DIALOGUES
+ SEEN_DIALOGUES,
+ RUN_HISTORY
}
diff --git a/src/enums/mystery-encounter-type.ts b/src/enums/mystery-encounter-type.ts
deleted file mode 100644
index a29a409103d1..000000000000
--- a/src/enums/mystery-encounter-type.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export enum MysteryEncounterType {
- MYSTERIOUS_CHALLENGERS,
- MYSTERIOUS_CHEST,
- DARK_DEAL,
- FIGHT_OR_FLIGHT,
- SLEEPING_SNORLAX,
- TRAINING_SESSION
-}
diff --git a/src/field/arena.ts b/src/field/arena.ts
index 269003b54c70..2d20abeedd17 100644
--- a/src/field/arena.ts
+++ b/src/field/arena.ts
@@ -73,21 +73,21 @@ export class Arena {
}
}
- randomSpecies(waveIndex: integer, level: integer, attempt?: integer, luckValue?: integer, isBoss?: boolean): PokemonSpecies {
+ randomSpecies(waveIndex: integer, level: integer, attempt?: integer, luckValue?: integer): PokemonSpecies {
const overrideSpecies = this.scene.gameMode.getOverrideSpecies(waveIndex);
if (overrideSpecies) {
return overrideSpecies;
}
- const isBossSpecies = !!this.scene.getEncounterBossSegments(waveIndex, level) && !!this.pokemonPool[BiomePoolTier.BOSS].length
+ const isBoss = !!this.scene.getEncounterBossSegments(waveIndex, level) && !!this.pokemonPool[BiomePoolTier.BOSS].length
&& (this.biomeType !== Biome.END || this.scene.gameMode.isClassic || this.scene.gameMode.isWaveFinal(waveIndex));
- const randVal = isBossSpecies ? 64 : 512;
+ const randVal = isBoss ? 64 : 512;
// luck influences encounter rarity
let luckModifier = 0;
if (typeof luckValue !== "undefined") {
- luckModifier = luckValue * (isBossSpecies ? 0.5 : 2);
+ luckModifier = luckValue * (isBoss ? 0.5 : 2);
}
const tierValue = Utils.randSeedInt(randVal - luckModifier);
- let tier = !isBossSpecies
+ let tier = !isBoss
? tierValue >= 156 ? BiomePoolTier.COMMON : tierValue >= 32 ? BiomePoolTier.UNCOMMON : tierValue >= 6 ? BiomePoolTier.RARE : tierValue >= 1 ? BiomePoolTier.SUPER_RARE : BiomePoolTier.ULTRA_RARE
: tierValue >= 20 ? BiomePoolTier.BOSS : tierValue >= 6 ? BiomePoolTier.BOSS_RARE : tierValue >= 1 ? BiomePoolTier.BOSS_SUPER_RARE : BiomePoolTier.BOSS_ULTRA_RARE;
console.log(BiomePoolTier[tier]);
@@ -154,12 +154,12 @@ export class Arena {
return ret;
}
- randomTrainerType(waveIndex: integer, isBoss: boolean = false): TrainerType {
- const isTrainerBoss = !!this.trainerPool[BiomePoolTier.BOSS].length
- && (this.scene.gameMode.isTrainerBoss(waveIndex, this.biomeType, this.scene.offsetGym) || isBoss);
+ randomTrainerType(waveIndex: integer): TrainerType {
+ const isBoss = !!this.trainerPool[BiomePoolTier.BOSS].length
+ && this.scene.gameMode.isTrainerBoss(waveIndex, this.biomeType, this.scene.offsetGym);
console.log(isBoss, this.trainerPool);
- const tierValue = Utils.randSeedInt(!isTrainerBoss ? 512 : 64);
- let tier = !isTrainerBoss
+ const tierValue = Utils.randSeedInt(!isBoss ? 512 : 64);
+ let tier = !isBoss
? tierValue >= 156 ? BiomePoolTier.COMMON : tierValue >= 32 ? BiomePoolTier.UNCOMMON : tierValue >= 6 ? BiomePoolTier.RARE : tierValue >= 1 ? BiomePoolTier.SUPER_RARE : BiomePoolTier.ULTRA_RARE
: tierValue >= 20 ? BiomePoolTier.BOSS : tierValue >= 6 ? BiomePoolTier.BOSS_RARE : tierValue >= 1 ? BiomePoolTier.BOSS_SUPER_RARE : BiomePoolTier.BOSS_ULTRA_RARE;
console.log(BiomePoolTier[tier]);
diff --git a/src/field/mystery-encounter-intro.ts b/src/field/mystery-encounter-intro.ts
deleted file mode 100644
index 82e9bb49f890..000000000000
--- a/src/field/mystery-encounter-intro.ts
+++ /dev/null
@@ -1,311 +0,0 @@
-import { GameObjects } from "phaser";
-import BattleScene from "../battle-scene";
-import MysteryEncounter from "../data/mystery-encounter";
-
-export class MysteryEncounterSpriteConfig {
- spriteKey: string; // e.g. "ace_trainer_f"
- fileRoot: string; // "trainer" for trainer sprites, "pokemon" for pokemon, etc. Refer to /public/images directory for the folder name
- hasShadow?: boolean = false; // Spawns shadow underneath sprite
- disableAnimation?: boolean = false; // Animates frames or not
- repeat?: boolean = false; // Cycles animation
- tint?: number;
- x?: number; // X offset
- y?: number; // Y offset
- scale?: number;
- isItem?: boolean; // For item sprites, set to true
-}
-
-/**
- * When a mystery encounter spawns, there are visuals (mainly sprites) tied to the field for the new encounter to inform the player of the type of encounter
- * These slide in with the field as part of standard field change cycle, and will typically be hidden after the player has selected an option for the encounter
- * Note: intro visuals are not "Trainers" or any other specific game object, though they may contain trainer sprites
- */
-export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Container {
- public encounter: MysteryEncounter;
- public spriteConfigs: MysteryEncounterSpriteConfig[];
-
- constructor(scene: BattleScene, encounter: MysteryEncounter) {
- super(scene, -72, 76);
- this.encounter = encounter;
- // Shallow copy configs to allow visual config updates at runtime without dirtying master copy of Encounter
- this.spriteConfigs = encounter.spriteConfigs.map(config => {
- return {
- ...config
- };
- });
- if (!this.spriteConfigs) {
- return;
- }
-
- const getSprite = (spriteKey: string, hasShadow?: boolean) => {
- const ret = this.scene.addFieldSprite(0, 0, spriteKey);
- ret.setOrigin(0.5, 1);
- ret.setPipeline(this.scene.spritePipeline, {tone: [0.0, 0.0, 0.0, 0.0], hasShadow: !!hasShadow});
- return ret;
- };
-
- const getItemSprite = (spriteKey: string) => {
- const icon = this.scene.add.sprite(-19, 2, "items", spriteKey);
- icon.setOrigin(0.5, 1);
- return icon;
- };
-
- // Depending on number of sprites added, should space them to be on the circular field sprite
- const minX = -40;
- const maxX = 40;
- const origin = 4;
- let n = 0;
- // Sprites with custom X or Y defined will not count for normal spacing requirements
- const spacingValue = Math.round((maxX - minX) / Math.max(this.spriteConfigs.filter(s => !s.x && !s.y).length, 1));
-
- this.spriteConfigs?.forEach((config) => {
- let sprite: GameObjects.Sprite;
- let tintSprite: GameObjects.Sprite;
- if (!config.isItem) {
- sprite = getSprite(config.spriteKey, config.hasShadow);
- tintSprite = getSprite(config.spriteKey);
- } else {
- sprite = getItemSprite(config.spriteKey);
- tintSprite = getItemSprite(config.spriteKey);
- }
-
- tintSprite.setVisible(false);
-
- if (config.scale) {
- sprite.setScale(config.scale);
- tintSprite.setScale(config.scale);
- }
-
- // Sprite offset from origin
- if (config.x || config.y) {
- if (config.x) {
- sprite.x = origin + config.x;
- tintSprite.x = origin + config.x;
- }
- if (config.y) {
- sprite.y = origin + config.y;
- tintSprite.y = origin + config.y;
- }
- } else {
- // Single sprite
- if (this.spriteConfigs.length === 1) {
- sprite.x = origin;
- tintSprite.x = origin;
- } else {
- // Do standard sprite spacing (not including offset sprites)
- sprite.x = minX + (n + 0.5) * spacingValue + origin;
- tintSprite.x = minX + (n + 0.5) * spacingValue + origin;
- n++;
- }
- }
-
- this.add(sprite);
- this.add(tintSprite);
- });
- }
-
- loadAssets(): Promise {
- return new Promise(resolve => {
- if (!this.spriteConfigs) {
- resolve();
- }
-
- this.spriteConfigs.forEach((config) => {
- if (!config.isItem) {
- this.scene.loadAtlas(config.spriteKey, config.fileRoot);
- } else {
- this.scene.loadAtlas("items", "");
- }
- });
-
- this.scene.load.once(Phaser.Loader.Events.COMPLETE, () => {
- this.spriteConfigs.every((config) => {
- if (config.isItem) {
- return true;
- }
-
- const originalWarn = console.warn;
-
- // Ignore warnings for missing frames, because there will be a lot
- console.warn = () => {
- };
- const frameNames = this.scene.anims.generateFrameNames(config.spriteKey, { zeroPad: 4, suffix: ".png", start: 1, end: 128 });
-
- console.warn = originalWarn;
- if (!(this.scene.anims.exists(config.spriteKey))) {
- this.scene.anims.create({
- key: config.spriteKey,
- frames: frameNames,
- frameRate: 12,
- repeat: -1
- });
- }
-
- return true;
- });
-
- resolve();
- });
-
- if (!this.scene.load.isLoading()) {
- this.scene.load.start();
- }
- });
- }
-
- initSprite(): void {
- if (!this.spriteConfigs) {
- return;
- }
-
- this.getSprites().map((sprite, i) => {
- if (!this.spriteConfigs[i].isItem) {
- sprite.setTexture(this.spriteConfigs[i].spriteKey).setFrame(0);
- }
- });
- this.getTintSprites().map((tintSprite, i) => {
- if (!this.spriteConfigs[i].isItem) {
- tintSprite.setTexture(this.spriteConfigs[i].spriteKey).setFrame(0);
- }
- });
-
- this.spriteConfigs.every((config, i) => {
- if (!config.tint) {
- return true;
- }
-
- const tintSprite = this.getAt(i * 2 + 1);
- this.tint(tintSprite, 0, config.tint);
-
- return true;
- });
- }
-
- /**
- * Attempts to animate a given set of {@linkcode Phaser.GameObjects.Sprite}
- * @see {@linkcode Phaser.GameObjects.Sprite.play}
- * @param sprite {@linkcode Phaser.GameObjects.Sprite} to animate
- * @param tintSprite {@linkcode Phaser.GameObjects.Sprite} placed on top of the sprite to add a color tint
- * @param animConfig {@linkcode Phaser.Types.Animations.PlayAnimationConfig} to pass to {@linkcode Phaser.GameObjects.Sprite.play}
- * @returns true if the sprite was able to be animated
- */
- tryPlaySprite(sprite: Phaser.GameObjects.Sprite, tintSprite: Phaser.GameObjects.Sprite, animConfig: Phaser.Types.Animations.PlayAnimationConfig): boolean {
- // Show an error in the console if there isn't a texture loaded
- if (sprite.texture.key === "__MISSING") {
- console.error(`No texture found for '${animConfig.key}'!`);
-
- return false;
- }
- // Don't try to play an animation when there isn't one
- if (sprite.texture.frameTotal <= 1) {
- console.warn(`No animation found for '${animConfig.key}'. Is this intentional?`);
-
- return false;
- }
-
- sprite.play(animConfig);
- tintSprite.play(animConfig);
-
- return true;
- }
-
- playAnim(): void {
- if (!this.spriteConfigs) {
- return;
- }
-
- const sprites = this.getSprites();
- const tintSprites = this.getTintSprites();
- this.spriteConfigs.forEach((config, i) => {
- if (!config.disableAnimation) {
- const trainerAnimConfig = {
- key: config.spriteKey,
- repeat: config?.repeat ? -1 : 0,
- startFrame: 0
- };
-
- this.tryPlaySprite(sprites[i], tintSprites[i], trainerAnimConfig);
- }
- });
- }
-
- getSprites(): Phaser.GameObjects.Sprite[] {
- if (!this.spriteConfigs) {
- return;
- }
-
- const ret: Phaser.GameObjects.Sprite[] = [];
- this.spriteConfigs.forEach((config, i) => {
- ret.push(this.getAt(i * 2));
- });
- return ret;
- }
-
- getTintSprites(): Phaser.GameObjects.Sprite[] {
- if (!this.spriteConfigs) {
- return;
- }
-
- const ret: Phaser.GameObjects.Sprite[] = [];
- this.spriteConfigs.forEach((config, i) => {
- ret.push(this.getAt(i * 2 + 1));
- });
-
- return ret;
- }
-
- tint(sprite, color: number, alpha?: number, duration?: integer, ease?: string): void {
- // const tintSprites = this.getTintSprites();
- sprite.setTintFill(color);
- sprite.setVisible(true);
-
- if (duration) {
- sprite.setAlpha(0);
-
- this.scene.tweens.add({
- targets: sprite,
- alpha: alpha || 1,
- duration: duration,
- ease: ease || "Linear"
- });
- } else {
- sprite.setAlpha(alpha);
- }
- }
-
- tintAll(color: number, alpha?: number, duration?: integer, ease?: string): void {
- const tintSprites = this.getTintSprites();
- tintSprites.map(tintSprite => {
- this.tint(tintSprite, color, alpha, duration, ease);
- });
- }
-
- untint(sprite, duration: integer, ease?: string): void {
- if (duration) {
- this.scene.tweens.add({
- targets: sprite,
- alpha: 0,
- duration: duration,
- ease: ease || "Linear",
- onComplete: () => {
- sprite.setVisible(false);
- sprite.setAlpha(1);
- }
- });
- } else {
- sprite.setVisible(false);
- sprite.setAlpha(1);
- }
- }
-
- untintAll(duration: integer, ease?: string): void {
- const tintSprites = this.getTintSprites();
- tintSprites.map(tintSprite => {
- this.untint(tintSprite, duration, ease);
- });
- }
-}
-
-export default interface MysteryEncounterIntroVisuals {
- scene: BattleScene
-}
diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index 9fd67a66896e..0fb74d51304c 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -23,7 +23,7 @@ import { BattlerTag, BattlerTagLapseType, EncoreTag, GroundedTag, HelpingHandTag
import { WeatherType } from "../data/weather";
import { TempBattleStat } from "../data/temp-battle-stat";
import { ArenaTagSide, WeakenMoveScreenTag, WeakenMoveTypeTag } from "../data/arena-tag";
-import { Ability, AbAttr, BattleStatMultiplierAbAttr, BlockCritAbAttr, BonusCritAbAttr, BypassBurnDamageReductionAbAttr, FieldPriorityMoveImmunityAbAttr, IgnoreOpponentStatChangesAbAttr, MoveImmunityAbAttr, MoveTypeChangeAttr, PreDefendFullHpEndureAbAttr, ReceivedMoveDamageMultiplierAbAttr, ReduceStatusEffectDurationAbAttr, StabBoostAbAttr, StatusEffectImmunityAbAttr, TypeImmunityAbAttr, VariableMovePowerAbAttr, WeightMultiplierAbAttr, allAbilities, applyAbAttrs, applyBattleStatMultiplierAbAttrs, applyPreApplyBattlerTagAbAttrs, applyPreAttackAbAttrs, applyPreDefendAbAttrs, applyPreSetStatusAbAttrs, UnsuppressableAbilityAbAttr, SuppressFieldAbilitiesAbAttr, NoFusionAbilityAbAttr, MultCritAbAttr, IgnoreTypeImmunityAbAttr, DamageBoostAbAttr, IgnoreTypeStatusEffectImmunityAbAttr, ConditionalCritAbAttr, applyFieldBattleStatMultiplierAbAttrs, FieldMultiplyBattleStatAbAttr, AllyMoveCategoryPowerBoostAbAttr, FieldMoveTypePowerBoostAbAttr, AddSecondStrikeAbAttr, UserFieldMoveTypePowerBoostAbAttr, UserFieldStatusEffectImmunityAbAttr, UserFieldBattlerTagImmunityAbAttr, BattlerTagImmunityAbAttr } from "../data/ability";
+import { Ability, AbAttr, BattleStatMultiplierAbAttr, BlockCritAbAttr, BonusCritAbAttr, BypassBurnDamageReductionAbAttr, FieldPriorityMoveImmunityAbAttr, IgnoreOpponentStatChangesAbAttr, MoveImmunityAbAttr, MoveTypeChangeAttr, PreApplyBattlerTagAbAttr, PreDefendFullHpEndureAbAttr, ReceivedMoveDamageMultiplierAbAttr, ReduceStatusEffectDurationAbAttr, StabBoostAbAttr, StatusEffectImmunityAbAttr, TypeImmunityAbAttr, VariableMovePowerAbAttr, WeightMultiplierAbAttr, allAbilities, applyAbAttrs, applyBattleStatMultiplierAbAttrs, applyPreApplyBattlerTagAbAttrs, applyPreAttackAbAttrs, applyPreDefendAbAttrs, applyPreSetStatusAbAttrs, UnsuppressableAbilityAbAttr, SuppressFieldAbilitiesAbAttr, NoFusionAbilityAbAttr, MultCritAbAttr, IgnoreTypeImmunityAbAttr, DamageBoostAbAttr, IgnoreTypeStatusEffectImmunityAbAttr, ConditionalCritAbAttr, applyFieldBattleStatMultiplierAbAttrs, FieldMultiplyBattleStatAbAttr, AllyMoveCategoryPowerBoostAbAttr, FieldMoveTypePowerBoostAbAttr, AddSecondStrikeAbAttr, UserFieldMoveTypePowerBoostAbAttr } from "../data/ability";
import PokemonData from "../system/pokemon-data";
import { BattlerIndex } from "../battle";
import { Mode } from "../ui/ui";
@@ -1733,15 +1733,6 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
return (this.isPlayer() ? this.scene.getPlayerField() : this.scene.getEnemyField())[this.getFieldIndex() ? 0 : 1];
}
- /**
- * Gets the Pokémon on the allied field.
- *
- * @returns An array of Pokémon on the allied field.
- */
- getAlliedField(): Pokemon[] {
- return this instanceof PlayerPokemon ? this.scene.getPlayerField() : this.scene.getEnemyField();
- }
-
apply(source: Pokemon, move: Move): HitResult {
let result: HitResult;
const damage = new Utils.NumberHolder(0);
@@ -1844,10 +1835,6 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
if (source.getTag(HelpingHandTag)) {
power.value *= 1.5;
}
- const glaiveRushModifier = new Utils.IntegerHolder(1);
- if (this.getTag(BattlerTagType.RECEIVE_DOUBLE_DAMAGE)) {
- glaiveRushModifier.value = 2;
- }
let isCritical: boolean;
const critOnly = new Utils.BooleanHolder(false);
const critAlways = source.getTag(BattlerTagType.ALWAYS_CRIT);
@@ -1917,7 +1904,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
applyPreAttackAbAttrs(AddSecondStrikeAbAttr, source, this, move, numTargets, new Utils.IntegerHolder(0), twoStrikeMultiplier);
if (!isTypeImmune) {
- damage.value = Math.ceil(((((2 * source.level / 5 + 2) * power.value * sourceAtk.value / targetDef.value) / 50) + 2) * stabMultiplier.value * typeMultiplier.value * arenaAttackTypeMultiplier.value * screenMultiplier.value * twoStrikeMultiplier.value * glaiveRushModifier.value * criticalMultiplier.value * ((this.scene.randBattleSeedInt(15) + 85) / 100));
+ damage.value = Math.ceil(((((2 * source.level / 5 + 2) * power.value * sourceAtk.value / targetDef.value) / 50) + 2) * stabMultiplier.value * typeMultiplier.value * arenaAttackTypeMultiplier.value * screenMultiplier.value * twoStrikeMultiplier.value * ((this.scene.randBattleSeedInt(15) + 85) / 100) * criticalMultiplier.value);
if (isPhysical && source.status && source.status.effect === StatusEffect.BURN) {
if (!move.hasAttr(BypassBurnDamageReductionAttr)) {
const burnDamageReductionCancelled = new Utils.BooleanHolder(false);
@@ -2001,13 +1988,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
}
/**
- * We explicitly require to ignore the faint phase here, as we want to show the messages
- * about the critical hit and the super effective/not very effective messages before the faint phase.
- */
+ * We explicitly require to ignore the faint phase here, as we want to show the messages
+ * about the critical hit and the super effective/not very effective messages before the faint phase.
+ */
damage.value = this.damageAndUpdate(damage.value, result as DamageResult, isCritical, oneHitKo, oneHitKo, true);
this.turnData.damageTaken += damage.value;
-
- // queue critical message before effectiveness
if (isCritical) {
this.scene.queueMessage(i18next.t("battle:hitResultCriticalHit"));
}
@@ -2020,7 +2005,6 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
source.turnData.damageDealt += damage.value;
source.turnData.currDamageDealt = damage.value;
this.battleData.hitCount++;
- // create attack result and push to turnData
const attackResult = { move: move.id, result: result as DamageResult, damage: damage.value, critical: isCritical, sourceId: source.id };
this.turnData.attacksReceived.unshift(attackResult);
if (source.isPlayer() && !this.isPlayer()) {
@@ -2028,8 +2012,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
}
}
- // want to include is.Fainted() in case multi hit move ends early, still want to render message
- if (source.turnData.hitsLeft === 1 || this.isFainted()) {
+ if (source.turnData.hitsLeft === 1) {
switch (result) {
case HitResult.SUPER_EFFECTIVE:
this.scene.queueMessage(i18next.t("battle:hitResultSuperEffective"));
@@ -2050,13 +2033,13 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
}
if (this.isFainted()) {
- // set splice index here, so future scene queues happen before FaintedPhase
- this.scene.setPhaseQueueSplice();
this.scene.unshiftPhase(new FaintPhase(this.scene, this.getBattlerIndex(), oneHitKo));
this.resetSummonData();
}
if (damage) {
+ this.scene.clearPhaseQueueSplice();
+
const attacker = this.scene.getPokemonById(source.id);
destinyTag?.lapse(attacker, BattlerTagLapseType.CUSTOM);
}
@@ -2080,14 +2063,6 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
return result;
}
- /**
- * called by damageAndUpdate()
- * @param damage integer
- * @param ignoreSegments boolean, not currently used
- * @param preventEndure used to update damage if endure or sturdy
- * @param ignoreFaintPhase flag on wheter to add FaintPhase if pokemon after applying damage faints
- * @returns integer representing damage
- */
damage(damage: integer, ignoreSegments: boolean = false, preventEndure: boolean = false, ignoreFaintPhase: boolean = false): integer {
if (this.isFainted()) {
return 0;
@@ -2109,16 +2084,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
}
damage = Math.min(damage, this.hp);
+
this.hp = this.hp - damage;
if (this.isFainted() && !ignoreFaintPhase) {
- /**
- * when adding the FaintPhase, want to toggle future unshiftPhase() and queueMessage() calls
- * to appear before the FaintPhase (as FaintPhase will potentially end the encounter and add Phases such as
- * GameOverPhase, VictoryPhase, etc.. that will interfere with anything else that happens during this MoveEffectPhase)
- *
- * once the MoveEffectPhase is over (and calls it's .end() function, shiftPhase() will reset the PhaseQueueSplice via clearPhaseQueueSplice() )
- */
- this.scene.setPhaseQueueSplice();
this.scene.unshiftPhase(new FaintPhase(this.scene, this.getBattlerIndex(), preventEndure));
this.resetSummonData();
}
@@ -2126,16 +2094,6 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
return damage;
}
- /**
- * Called by apply(), given the damage, adds a new DamagePhase and actually updates HP values, etc.
- * @param damage integer - passed to damage()
- * @param result an enum if it's super effective, not very, etc.
- * @param critical boolean if move is a critical hit
- * @param ignoreSegments boolean, passed to damage() and not used currently
- * @param preventEndure boolean, ignore endure properties of pokemon, passed to damage()
- * @param ignoreFaintPhase boolean to ignore adding a FaintPhase, passsed to damage()
- * @returns integer of damage done
- */
damageAndUpdate(damage: integer, result?: DamageResult, critical: boolean = false, ignoreSegments: boolean = false, preventEndure: boolean = false, ignoreFaintPhase: boolean = false): integer {
const damagePhase = new DamagePhase(this.scene, this.getBattlerIndex(), damage, result as DamageResult, critical);
this.scene.unshiftPhase(damagePhase);
@@ -2170,9 +2128,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
const newTag = getBattlerTag(tagType, turnCount, sourceMove, sourceId);
const cancelled = new Utils.BooleanHolder(false);
- applyPreApplyBattlerTagAbAttrs(BattlerTagImmunityAbAttr, this, newTag, cancelled);
-
- this.getAlliedField().forEach(p => applyPreApplyBattlerTagAbAttrs(UserFieldBattlerTagImmunityAbAttr, p, newTag, cancelled));
+ applyPreApplyBattlerTagAbAttrs(PreApplyBattlerTagAbAttr, this, newTag, cancelled);
if (!cancelled.value && newTag.canAdd(this)) {
this.summonData.tags.push(newTag);
@@ -2586,8 +2542,6 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
const cancelled = new Utils.BooleanHolder(false);
applyPreSetStatusAbAttrs(StatusEffectImmunityAbAttr, this, effect, cancelled, quiet);
- this.getAlliedField().forEach(pokemon => applyPreSetStatusAbAttrs(UserFieldStatusEffectImmunityAbAttr, pokemon, effect, cancelled, quiet));
-
if (cancelled.value) {
return false;
}
@@ -3959,7 +3913,6 @@ export class PokemonSummonData {
public moveset: PokemonMove[];
// If not initialized this value will not be populated from save data.
public types: Type[] = null;
- public mysteryEncounterBattleEffects: (pokemon: Pokemon) => void = null;
}
export class PokemonBattleData {
diff --git a/src/field/trainer.ts b/src/field/trainer.ts
index d43a2025723e..3e78afeae831 100644
--- a/src/field/trainer.ts
+++ b/src/field/trainer.ts
@@ -35,16 +35,11 @@ export default class Trainer extends Phaser.GameObjects.Container {
public name: string;
public partnerName: string;
- constructor(scene: BattleScene, trainerType: TrainerType, variant: TrainerVariant, partyTemplateIndex?: integer, name?: string, partnerName?: string, trainerConfigOverride?: TrainerConfig) {
+ constructor(scene: BattleScene, trainerType: TrainerType, variant: TrainerVariant, partyTemplateIndex?: integer, name?: string, partnerName?: string) {
super(scene, -72, 80);
this.config = trainerConfigs.hasOwnProperty(trainerType)
? trainerConfigs[trainerType]
: trainerConfigs[TrainerType.ACE_TRAINER];
-
- if (trainerConfigOverride) {
- this.config = trainerConfigOverride;
- }
-
this.variant = variant;
this.partyTemplateIndex = Math.min(partyTemplateIndex !== undefined ? partyTemplateIndex : Utils.randSeedWeightedItem(this.config.partyTemplates.map((_, i) => i)),
this.config.partyTemplates.length - 1);
diff --git a/src/form-change-phase.ts b/src/form-change-phase.ts
index 62331ec13897..ebf91c635fd7 100644
--- a/src/form-change-phase.ts
+++ b/src/form-change-phase.ts
@@ -8,9 +8,8 @@ import Pokemon, { EnemyPokemon, PlayerPokemon } from "./field/pokemon";
import { Mode } from "./ui/ui";
import PartyUiHandler from "./ui/party-ui-handler";
import { BattleSpec } from "#enums/battle-spec";
-import { MovePhase, PokemonHealPhase } from "./phases";
+import { BattlePhase, MovePhase, PokemonHealPhase } from "./phases";
import { getTypeRgb } from "./data/type";
-import {BattlePhase} from "#app/phases/battle-phase";
export class FormChangePhase extends EvolutionPhase {
private formChange: SpeciesFormChange;
diff --git a/src/game-mode.ts b/src/game-mode.ts
index 3e8c832c544b..0a472e223e30 100644
--- a/src/game-mode.ts
+++ b/src/game-mode.ts
@@ -28,7 +28,6 @@ interface GameModeConfig {
hasRandomBosses?: boolean;
isSplicedOnly?: boolean;
isChallenge?: boolean;
- hasMysteryEncounters?: boolean;
}
export class GameMode implements GameModeConfig {
@@ -45,7 +44,6 @@ export class GameMode implements GameModeConfig {
public isChallenge: boolean;
public challenges: Challenge[];
public battleConfig: FixedBattleConfigs;
- public hasMysteryEncounters: boolean;
constructor(modeId: GameModes, config: GameModeConfig, battleConfig?: FixedBattleConfigs) {
this.modeId = modeId;
@@ -303,7 +301,7 @@ export class GameMode implements GameModeConfig {
export function getGameMode(gameMode: GameModes): GameMode {
switch (gameMode) {
case GameModes.CLASSIC:
- return new GameMode(GameModes.CLASSIC, { isClassic: true, hasTrainers: true, hasMysteryEncounters: true }, classicFixedBattles);
+ return new GameMode(GameModes.CLASSIC, { isClassic: true, hasTrainers: true }, classicFixedBattles);
case GameModes.ENDLESS:
return new GameMode(GameModes.ENDLESS, { isEndless: true, hasShortBiomes: true, hasRandomBosses: true });
case GameModes.SPLICED_ENDLESS:
@@ -311,6 +309,6 @@ export function getGameMode(gameMode: GameModes): GameMode {
case GameModes.DAILY:
return new GameMode(GameModes.DAILY, { isDaily: true, hasTrainers: true, hasNoShop: true });
case GameModes.CHALLENGE:
- return new GameMode(GameModes.CHALLENGE, { isClassic: true, hasTrainers: true, isChallenge: true, hasMysteryEncounters: true }, classicFixedBattles);
+ return new GameMode(GameModes.CHALLENGE, { isClassic: true, hasTrainers: true, isChallenge: true }, classicFixedBattles);
}
}
diff --git a/src/loading-scene.ts b/src/loading-scene.ts
index fdb9f5f6610d..15cd295d23c8 100644
--- a/src/loading-scene.ts
+++ b/src/loading-scene.ts
@@ -22,8 +22,6 @@ import { initStatsKeys } from "./ui/game-stats-ui-handler";
import { initVouchers } from "./system/voucher";
import { Biome } from "#enums/biome";
import { TrainerType } from "#enums/trainer-type";
-import {initMysteryEncounterDialogue} from "#app/data/mystery-encounters/dialogue/mystery-encounter-dialogue";
-import {initMysteryEncounters} from "#app/data/mystery-encounters/mystery-encounters";
export class LoadingScene extends SceneBase {
readonly LOAD_EVENTS = Phaser.Loader.Events;
@@ -346,8 +344,6 @@ export class LoadingScene extends SceneBase {
initMoves();
initAbilities();
initChallenges();
- initMysteryEncounterDialogue();
- initMysteryEncounters();
}
loadLoadingScreen() {
diff --git a/src/locales/de/ability-trigger.ts b/src/locales/de/ability-trigger.ts
index 9c572302c095..4e69db202314 100644
--- a/src/locales/de/ability-trigger.ts
+++ b/src/locales/de/ability-trigger.ts
@@ -7,6 +7,5 @@ export const abilityTriggers: SimpleTranslationEntries = {
"iceFaceAvoidedDamage": "{{pokemonName}} wehrt Schaden mit {{abilityName}} ab!",
"trace": "{{pokemonName}} kopiert {{abilityName}} von {{targetName}}!",
"windPowerCharged": "Der Treffer durch {{moveName}} läd die Stärke von {{pokemonName}} auf!",
- "disguiseAvoidedDamage" : "{{pokemonName}}'s disguise was busted!",
"quickDraw": "Durch Schnellschuss kann {{pokemonName}} schneller handeln als sonst!",
} as const;
diff --git a/src/locales/de/battle.ts b/src/locales/de/battle.ts
index d3da08445750..099020d46d56 100644
--- a/src/locales/de/battle.ts
+++ b/src/locales/de/battle.ts
@@ -68,8 +68,6 @@ export const battle: SimpleTranslationEntries = {
"regainHealth": "KP von {{pokemonName}} wurden wieder aufgefrischt!",
"stealEatBerry": "{{pokemonName}} stole and ate\n{{targetName}}'s {{berryName}}!",
"fainted": "{{pokemonNameWithAffix}} wurde besiegt!",
- "statsAnd": "und",
- "stats": "Werte",
"statRose": "{{stats}} von {{pokemonNameWithAffix}} steigt!",
"statSharplyRose": "{{stats}} von {{pokemonNameWithAffix}} steigt stark!",
"statRoseDrastically": "{{stats}} von {{pokemonNameWithAffix}} steigt drastisch!",
@@ -78,14 +76,6 @@ export const battle: SimpleTranslationEntries = {
"statHarshlyFell": "{{stats}} von {{pokemonNameWithAffix}} sinkt stark!",
"statSeverelyFell": "{{stats}} von {{pokemonNameWithAffix}} sinkt drastisch!",
"statWontGoAnyLower": "{{stats}} von {{pokemonNameWithAffix}} kann nicht weiter sinken!",
- "statRoseMultiple": "{{stats}} von {{pokemonNameWithAffix}} steigen!",
- "statSharplyRoseMultiple": "{{stats}} von {{pokemonNameWithAffix}} steigen stark!",
- "statRoseDrasticallyMultiple": "{{stats}} von {{pokemonNameWithAffix}} steigen drastisch!",
- "statWontGoAnyHigherMultiple": "{{stats}} von {{pokemonNameWithAffix}} können nicht weiter erhöht werden!",
- "statFellMultiple": "{{stats}} von {{pokemonNameWithAffix}} sinken!",
- "statHarshlyFellMultiple": "{{stats}} von {{pokemonNameWithAffix}} sinken stark!",
- "statSeverelyFellMultiple": "{{stats}} von {{pokemonNameWithAffix}} sinken drastisch!",
- "statWontGoAnyLowerMultiple": "{{stats}} von {{pokemonNameWithAffix}} können nicht weiter sinken!",
"ppReduced": "{{moveName}} von {{targetName}} wird um {{reduction}} AP reduziert!",
"battlerTagsRechargingLapse": "{{pokemonNameWithAffix}} kann sich wegen des Rückstoßes durch den Angriff nicht bewegen!",
"battlerTagsTrappedOnAdd": "{{pokemonNameWithAffix}} kann nicht mehr fliehen!",
diff --git a/src/locales/de/config.ts b/src/locales/de/config.ts
index 3c16f81270d8..92544d87ea3c 100644
--- a/src/locales/de/config.ts
+++ b/src/locales/de/config.ts
@@ -39,7 +39,7 @@ import { statusEffect } from "./status-effect";
import { titles, trainerClasses, trainerNames } from "./trainers";
import { tutorial } from "./tutorial";
import { voucher } from "./voucher";
-import { terrain, weather } from "./weather";
+import { weather } from "./weather";
import { partyUiHandler } from "./party-ui-handler";
import { settings } from "./settings.js";
import { common } from "./common.js";
@@ -85,7 +85,6 @@ export const deConfig = {
splashMessages: splashMessages,
starterSelectUiHandler: starterSelectUiHandler,
statusEffect: statusEffect,
- terrain: terrain,
titles: titles,
trainerClasses: trainerClasses,
trainerNames: trainerNames,
diff --git a/src/locales/de/run-history-ui-handler.ts b/src/locales/de/run-history-ui-handler.ts
new file mode 100644
index 000000000000..d0f622599e2f
--- /dev/null
+++ b/src/locales/de/run-history-ui-handler.ts
@@ -0,0 +1,31 @@
+import { SimpleTranslationEntries } from "#app/interfaces/locales";
+
+export const runHistory: SimpleTranslationEntries = {
+ "victory": "Victory!",
+ "defeatedWild": "Defeated by ",
+ "defeatedTrainer": "Defeated by ",
+ "defeatedTrainerDouble": "Defeated by Duo",
+ "defeatedRival": "Defeated by Rival",
+ "defeated":"Defeated",
+ "luck":"Luck",
+ "score":"Score",
+ "mode":"Mode",
+ "challengeRules":"Rule(s)",
+ "challengeMonoGen1":"Gen I",
+ "challengeMonoGen2":"Gen II",
+ "challengeMonoGen3":"Gen III",
+ "challengeMonoGen4":"Gen IV",
+ "challengeMonoGen5":"Gen V",
+ "challengeMonoGen6":"Gen VI",
+ "challengeMonoGen7":"Gen VII",
+ "challengeMonoGen8":"Gen VIII",
+ "challengeMonoGen9":"Gen IX",
+ "playerItems":"Player Items",
+ "personalBest":"Personal Best!",
+ "SPDshortened":"Vel.",
+ "runInfo":"Run Info",
+ "money":"Money",
+} as const;
+
+//Mode Information found in game-mode.ts
+//Wave / Lv found in save-slot-select-ui-handler.ts
diff --git a/src/locales/de/settings.ts b/src/locales/de/settings.ts
index efd0420ff7e5..85f8645d69f9 100644
--- a/src/locales/de/settings.ts
+++ b/src/locales/de/settings.ts
@@ -96,5 +96,4 @@ export const settings: SimpleTranslationEntries = {
"controller": "Controller",
"gamepadSupport": "Controllerunterstützung",
"showBgmBar": "Musiknamen anzeigen",
- "shopOverlayOpacity": "Shop Overlay Opacity"
} as const;
diff --git a/src/locales/de/weather.ts b/src/locales/de/weather.ts
index 8a820f3d549c..305fd7e78270 100644
--- a/src/locales/de/weather.ts
+++ b/src/locales/de/weather.ts
@@ -43,24 +43,3 @@ export const weather: SimpleTranslationEntries = {
"strongWindsEffectMessage": "Rätselhafte Luftströmungen haben den Angriff abgeschwächt!",
"strongWindsClearMessage": "Die rätselhafte Luftströmung hat sich wieder geleget.",
};
-
-export const terrain: SimpleTranslationEntries = {
- "misty": "Nebelfeld",
- "mistyStartMessage": "Am Boden breitet sich dichter Nebel aus!",
- "mistyClearMessage": "Das Nebelfeld ist wieder verschwunden!",
- "mistyBlockMessage": "{{pokemonNameWithAffix}} wird vom Nebelfeld geschützt!",
-
- "electric": "Elektrofeld",
- "electricStartMessage": "Elektrische Energie fließt durch den Boden!",
- "electricClearMessage": "Das Elektrofeld ist wieder verschwunden!",
-
- "grassy": "Grasfeld",
- "grassyStartMessage": "Dichtes Gras schießt aus dem Boden!",
- "grassyClearMessage": "Das Grasfeld ist wieder verschwunden!",
-
- "psychic": "Psychofeld",
- "psychicStartMessage": "Der Boden fühlt sich seltsam an!",
- "psychicClearMessage": "Das Psychofeld ist wieder verschwunden!",
-
- "defaultBlockMessage": "{{pokemonNameWithAffix}} wird vom {{terrainName}} geschützt!"
-};
diff --git a/src/locales/en/ability-trigger.ts b/src/locales/en/ability-trigger.ts
index df4589695150..b516bc8dde03 100644
--- a/src/locales/en/ability-trigger.ts
+++ b/src/locales/en/ability-trigger.ts
@@ -10,5 +10,4 @@ export const abilityTriggers: SimpleTranslationEntries = {
"trace": "{{pokemonName}} copied {{targetName}}'s\n{{abilityName}}!",
"windPowerCharged": "Being hit by {{moveName}} charged {{pokemonName}} with power!",
"quickDraw": "{{pokemonName}} can act faster than normal, thanks to its Quick Draw!",
- "disguiseAvoidedDamage" : "{{pokemonName}}'s disguise was busted!",
} as const;
diff --git a/src/locales/en/battle.ts b/src/locales/en/battle.ts
index 55afe22450e8..a42743ef2541 100644
--- a/src/locales/en/battle.ts
+++ b/src/locales/en/battle.ts
@@ -48,7 +48,6 @@ export const battle: SimpleTranslationEntries = {
"noPokeballTrainer": "You can't catch\nanother trainer's Pokémon!",
"noPokeballMulti": "You can only throw a Poké Ball\nwhen there is one Pokémon remaining!",
"noPokeballStrong": "The target Pokémon is too strong to be caught!\nYou need to weaken it first!",
- "noPokeballMysteryEncounter": "You aren't able to\ncatch this Pokémon!",
"noEscapeForce": "An unseen force\nprevents escape.",
"noEscapeTrainer": "You can't run\nfrom a trainer battle!",
"noEscapePokemon": "{{pokemonName}}'s {{moveName}}\nprevents {{escapeVerb}}!",
@@ -69,8 +68,6 @@ export const battle: SimpleTranslationEntries = {
"regainHealth": "{{pokemonName}} regained\nhealth!",
"stealEatBerry": "{{pokemonName}} stole and ate\n{{targetName}}'s {{berryName}}!",
"fainted": "{{pokemonNameWithAffix}} fainted!",
- "statsAnd": "and",
- "stats": "Stats",
"statRose": "{{pokemonNameWithAffix}}'s {{stats}} rose!",
"statSharplyRose": "{{pokemonNameWithAffix}}'s {{stats}} sharply rose!",
"statRoseDrastically": "{{pokemonNameWithAffix}}'s {{stats}} rose drastically!",
@@ -79,14 +76,6 @@ export const battle: SimpleTranslationEntries = {
"statHarshlyFell": "{{pokemonNameWithAffix}}'s {{stats}} harshly fell!",
"statSeverelyFell": "{{pokemonNameWithAffix}}'s {{stats}} severely fell!",
"statWontGoAnyLower": "{{pokemonNameWithAffix}}'s {{stats}} won't go any lower!",
- "statRoseMultiple": "{{pokemonNameWithAffix}}'s {{stats}} rose!",
- "statSharplyRoseMultiple": "{{pokemonNameWithAffix}}'s {{stats}} sharply rose!",
- "statRoseDrasticallyMultiple": "{{pokemonNameWithAffix}}'s {{stats}} rose drastically!",
- "statWontGoAnyHigherMultiple": "{{pokemonNameWithAffix}}'s {{stats}} won't go any higher!",
- "statFellMultiple": "{{pokemonNameWithAffix}}'s {{stats}} fell!",
- "statHarshlyFellMultiple": "{{pokemonNameWithAffix}}'s {{stats}} harshly fell!",
- "statSeverelyFellMultiple": "{{pokemonNameWithAffix}}'s {{stats}} severely fell!",
- "statWontGoAnyLowerMultiple": "{{pokemonNameWithAffix}}'s {{stats}} won't go any lower!",
"ppReduced": "It reduced the PP of {{targetName}}'s\n{{moveName}} by {{reduction}}!",
"battlerTagsRechargingLapse": "{{pokemonNameWithAffix}} must\nrecharge!",
"battlerTagsTrappedOnAdd": "{{pokemonNameWithAffix}} can no\nlonger escape!",
@@ -144,6 +133,5 @@ export const battle: SimpleTranslationEntries = {
"battlerTagsSaltCuredOnAdd": "{{pokemonNameWithAffix}} is being salt cured!",
"battlerTagsSaltCuredLapse": "{{pokemonNameWithAffix}} is hurt by {{moveName}}!",
"battlerTagsCursedOnAdd": "{{pokemonNameWithAffix}} cut its own HP and put a curse on the {{pokemonName}}!",
- "battlerTagsCursedLapse": "{{pokemonNameWithAffix}} is afflicted by the Curse!",
- "mysteryEncounterAppeared": "What's this?"
+ "battlerTagsCursedLapse": "{{pokemonNameWithAffix}} is afflicted by the Curse!"
} as const;
diff --git a/src/locales/en/config.ts b/src/locales/en/config.ts
index c47c7f4cdc26..19daabb6144a 100644
--- a/src/locales/en/config.ts
+++ b/src/locales/en/config.ts
@@ -29,7 +29,6 @@ import { menu } from "./menu";
import { menuUiHandler } from "./menu-ui-handler";
import { modifierType } from "./modifier-type";
import { move } from "./move";
-import { mysteryEncounter } from "./mystery-encounter";
import { nature } from "./nature";
import { partyUiHandler } from "./party-ui-handler";
import { pokeball } from "./pokeball";
@@ -43,8 +42,9 @@ import { statusEffect } from "./status-effect";
import { titles, trainerClasses, trainerNames } from "./trainers";
import { tutorial } from "./tutorial";
import { voucher } from "./voucher";
-import { terrain, weather } from "./weather";
+import { weather } from "./weather";
import { modifierSelectUiHandler } from "./modifier-select-ui-handler";
+import { runHistory } from "./run-history-ui-handler";
export const enConfig = {
ability: ability,
@@ -76,8 +76,8 @@ export const enConfig = {
menuUiHandler: menuUiHandler,
modifierType: modifierType,
move: move,
- mysteryEncounter: mysteryEncounter,
nature: nature,
+ partyUiHandler: partyUiHandler,
pokeball: pokeball,
pokemon: pokemon,
pokemonInfo: pokemonInfo,
@@ -87,13 +87,12 @@ export const enConfig = {
splashMessages: splashMessages,
starterSelectUiHandler: starterSelectUiHandler,
statusEffect: statusEffect,
- terrain: terrain,
titles: titles,
trainerClasses: trainerClasses,
trainerNames: trainerNames,
tutorial: tutorial,
voucher: voucher,
weather: weather,
- partyUiHandler: partyUiHandler,
- modifierSelectUiHandler: modifierSelectUiHandler
+ modifierSelectUiHandler: modifierSelectUiHandler,
+ runHistory: runHistory,
};
diff --git a/src/locales/en/menu-ui-handler.ts b/src/locales/en/menu-ui-handler.ts
index 97d6e38a0998..b784593d742c 100644
--- a/src/locales/en/menu-ui-handler.ts
+++ b/src/locales/en/menu-ui-handler.ts
@@ -3,6 +3,7 @@ import { SimpleTranslationEntries } from "#app/interfaces/locales";
export const menuUiHandler: SimpleTranslationEntries = {
"GAME_SETTINGS": "Game Settings",
"ACHIEVEMENTS": "Achievements",
+ "RUN_HISTORY": "Run History",
"STATS": "Stats",
"VOUCHERS": "Vouchers",
"EGG_LIST": "Egg List",
diff --git a/src/locales/en/modifier-type.ts b/src/locales/en/modifier-type.ts
index f466b73c7590..09d9baea6fb2 100644
--- a/src/locales/en/modifier-type.ts
+++ b/src/locales/en/modifier-type.ts
@@ -152,7 +152,6 @@ export const modifierType: ModifierTypeTranslationEntries = {
"SACRED_ASH": { name: "Sacred Ash" },
"REVIVER_SEED": { name: "Reviver Seed", description: "Revives the holder for 1/2 HP upon fainting." },
- "WHITE_HERB": { name: "White Herb", description: "An item to be held by a Pokémon. It will restore any lowered stat in battle." },
"ETHER": { name: "Ether" },
"MAX_ETHER": { name: "Max Ether" },
diff --git a/src/locales/en/mystery-encounter.ts b/src/locales/en/mystery-encounter.ts
deleted file mode 100644
index b928fa38f54a..000000000000
--- a/src/locales/en/mystery-encounter.ts
+++ /dev/null
@@ -1,125 +0,0 @@
-import {SimpleTranslationEntries} from "#app/interfaces/locales";
-
-export const mysteryEncounter: SimpleTranslationEntries = {
-
- // Mysterious Encounters -- Common Tier
-
- "mysterious_chest_intro_message": "You found...@d{32} a chest?",
- "mysterious_chest_title": "The Mysterious Chest",
- "mysterious_chest_description": "A beautifully ornamented chest stands on the ground. There must be something good inside... right?",
- "mysterious_chest_query": "Will you open it?",
- "mysterious_chest_option_1_label": "Open it",
- "mysterious_chest_option_1_tooltip": "(35%) Something terrible\n(40%) Okay Rewards\n(20%) Good Rewards\n(4%) Great Rewards\n(1%) Amazing Rewards",
- "mysterious_chest_option_2_label": "It's too risky, leave",
- "mysterious_chest_option_2_tooltip": "(-) No Rewards",
- "mysterious_chest_option_1_selected_message": "You open the chest to find...",
- "mysterious_chest_option_2_selected_message": "You hurry along your way,\nwith a slight feeling of regret.",
- "mysterious_chest_option_1_normal_result": "Just some normal tools and items.",
- "mysterious_chest_option_1_good_result": "Some pretty nice tools and items.",
- "mysterious_chest_option_1_great_result": "A couple great tools and items!",
- "mysterious_chest_option_1_amazing_result": "Whoa! An amazing item!",
- "mysterious_chest_option_1_bad_result": `Oh no!@d{32}\nThe chest was trapped!
- $Your @ec{pokeName} jumps in front of you\nbut is KOed in the process.`,
-
- "fight_or_flight_intro_message": "Something shiny is sparkling\non the ground near that Pokémon!",
- "fight_or_flight_title": "Fight or Flight",
- "fight_or_flight_description": "It looks like there's a strong Pokémon guarding an item. Battling is the straightforward approach, but this Pokémon looks strong. You could also try to sneak around, though the Pokémon might catch you.",
- "fight_or_flight_query": "What will you do?",
- "fight_or_flight_option_1_label": "Battle it",
- "fight_or_flight_option_1_tooltip": "(+) Hard Battle\n(+) New Item",
- "fight_or_flight_option_2_label": "Sneak around",
- "fight_or_flight_option_2_tooltip": "(35%) Steal Item\n(65%) Harder Battle",
- "fight_or_flight_option_3_label": "Leave",
- "fight_or_flight_option_3_tooltip": "(-) No Rewards",
- "fight_or_flight_option_1_selected_message": "You approach the\nPokémon without fear.",
- "fight_or_flight_option_2_good_result": `.@d{32}.@d{32}.@d{32}
- $You manage to sneak your way\npast and grab the item!`,
- "fight_or_flight_option_2_bad_result": `.@d{32}.@d{32}.@d{32}
- $The Pokémon catches you\nas you try to sneak around!`,
- "fight_or_flight_boss_enraged": "The opposing @ec{enemyPokemon} has become enraged!",
- "fight_or_flight_option_3_selected": "You leave the strong Pokémon\nwith its prize and continue on.",
-
- // Mysterious Encounters -- Uncommon Tier
-
- "mysterious_challengers_intro_message": "Mysterious challengers have appeared!",
- "mysterious_challengers_title": "Mysterious Challengers",
- "mysterious_challengers_description": "If you defeat a challenger, you might impress them enough to receive a boon. But some look tough, are you up to the challenge?",
- "mysterious_challengers_query": "Who will you battle?",
- "mysterious_challengers_option_1_label": "A clever, mindful foe",
- "mysterious_challengers_option_1_tooltip": "(+) Standard Battle\n(+) Move Item Rewards",
- "mysterious_challengers_option_2_label": "A strong foe",
- "mysterious_challengers_option_2_tooltip": "(+) Hard Battle\n(+) Good Rewards",
- "mysterious_challengers_option_3_label": "The mightiest foe",
- "mysterious_challengers_option_3_tooltip": "(+) Brutal Battle\n(+) Great Rewards",
- "mysterious_challengers_option_selected_message": "The trainer steps forward...",
- "mysterious_challengers_outro_win": "The mysterious challenger was defeated!",
-
- // Mysterious Encounters -- Rare Tier
- "training_session_intro_message": "You've come across some\ntraining tools and supplies.",
- "training_session_title": "Training Session",
- "training_session_description": "These supplies look like they could be used to train a member of your party! There are a few ways you could train your Pokémon, by battling against it with the rest of your team.",
- "training_session_query": "How should you train?",
- "training_session_option_1_label": "Light Training",
- "training_session_option_1_tooltip": "(-) Light Battle\n(+) Improve 2 Random IVs of Pokémon",
- "training_session_option_2_label": "Moderate Training",
- "training_session_option_2_tooltip": "(-) Moderate Battle\n(+) Change Pokémon's Nature",
- "training_session_option_2_select_prompt": "Select a new nature\nto train your Pokémon in.",
- "training_session_option_3_label": "Heavy Training",
- "training_session_option_3_tooltip": "(-) Harsh Battle\n(+) Change Pokémon's Ability",
- "training_session_option_3_select_prompt": "Select a new ability\nto train your Pokémon in.",
- "training_session_option_selected_message": "@ec{selectedPokemon} moves across\nthe clearing to face you...",
- "training_session_battle_finished_1": `@ec{selectedPokemon} returns, feeling\nworn out but accomplished!
- $Its @ec{stat1} and @ec{stat2} IVs were improved!`,
- "training_session_battle_finished_2": `@ec{selectedPokemon} returns, feeling\nworn out but accomplished!
- $Its nature was changed to @ec{nature}!`,
- "training_session_battle_finished_3": `@ec{selectedPokemon} returns, feeling\nworn out but accomplished!
- $Its ability was changed to @ec{ability}!`,
- "training_session_outro_win": "That was a successful training session!",
-
- // Mysterious Encounters -- Super Rare Tier
-
- "dark_deal_intro_message": "A strange man in a tattered coat\nstands in your way...",
- "dark_deal_speaker": "Shady Guy",
- "dark_deal_intro_dialogue": `Hey, you!
- $I've been working on a new device\nto bring out a Pokémon's latent power!
- $It completely rebinds the Pokémon's atoms\nat a molecular level into a far more powerful form.
- $Hehe...@d{64} I just need some sac-@d{32}\nErr, test subjects, to prove it works.`,
- "dark_deal_title": "Dark Deal",
- "dark_deal_description": "The disturbing fellow holds up some Pokéballs.\n\"I'll make it worth your while! You can have these strong Pokéballs as payment, All I need is a Pokémon from your team! Hehe...\"",
- "dark_deal_query": "What will you do?",
- "dark_deal_option_1_label": "Accept", // Give player 10 rogue balls. Remove a random Pokémon from player's party. Fight a legendary Pokémon as a boss
- "dark_deal_option_1_tooltip": "(+) 5 Rogue Balls\n(?) Enhance a Random Pokémon", // Give player 10 rogue balls. Remove a random Pokémon from player's party. Fight a legendary Pokémon as a boss
- "dark_deal_option_2_label": "Refuse",
- "dark_deal_option_2_tooltip": "(-) No Rewards",
- "dark_deal_option_1_selected": `Let's see, that @ec{pokeName} will do nicely!
- $Remember, I'm not responsible\nif anything bad happens!@d{32} Hehe...`,
- "dark_deal_option_1_selected_message": `The man hands you 5 Rogue Balls.
- $@ec{pokeName} hops into the strange machine...
- $Flashing lights and weird noises\nstart coming from the machine!
- $...@d{96} Something emerges\nfrom the device, raging wildly!`,
- "dark_deal_option_2_selected": "Not gonna help a poor fellow out?\nPah!",
- "dark_deal_outro": "After the harrowing encounter,\nyou collect yourself and depart.",
-
- "sleeping_snorlax_intro_message": `As you walk down a narrow pathway, you see a towering silhouette blocking your path.
- $You get closer to see a Snorlax sleeping peacefully.\nIt seems like there's no way around it.`,
- "sleeping_snorlax_title": "Sleeping Snorlax",
- "sleeping_snorlax_description": "You could attack it to try and get it to move, or simply wait for it to wake up.",
- "sleeping_snorlax_query": "What will you do?",
- "sleeping_snorlax_option_1_label": "Fight it",
- "sleeping_snorlax_option_1_tooltip": "(+) Fight Sleeping Snorlax",
- "sleeping_snorlax_option_2_label": "Wait for it to move",
- "sleeping_snorlax_option_2_tooltip": "(75%) Wait a short time\n(25%) Wait a long time",
- "sleeping_snorlax_option_3_label": "Steal",
- "sleeping_snorlax_option_3_tooltip": "(+) Leftovers",
- "sleeping_snorlax_option_3_disabled_tooltip": "Your Pokémon need to know certain moves to choose this",
- "sleeping_snorlax_option_1_selected_message": "You approach the\nPokémon without fear.",
- "sleeping_snorlax_option_2_selected_message": `.@d{32}.@d{32}.@d{32}
- $You wait for a time, but the Snorlax's yawns make your party sleepy.`,
- "sleeping_snorlax_option_2_good_result": "When you all awaken, the Snorlax is no where to be found - but your Pokémon are all healed!",
- "sleeping_snorlax_option_2_bad_result": `Your @ec{primaryName} is still asleep...
- $But on the bright side, the Snorlax left something behind...
- $@s{item_fanfare}You gained a Berry!`,
- "sleeping_snorlax_option_3_good_result": "Your @ec{option3PrimaryName} uses @ec{option3PrimaryMove}! @s{item_fanfare}It steals Leftovers off the sleeping Snorlax and you make out like bandits!",
- // "sleeping_snorlax_outro_win": "The mysterious challengers were defeated!",
-
-} as const;
diff --git a/src/locales/en/party-ui-handler.ts b/src/locales/en/party-ui-handler.ts
index 37343cfa8920..78fdcc14dbe9 100644
--- a/src/locales/en/party-ui-handler.ts
+++ b/src/locales/en/party-ui-handler.ts
@@ -16,7 +16,6 @@ export const partyUiHandler: SimpleTranslationEntries = {
"PASS_BATON": "Pass Baton",
"UNPAUSE_EVOLUTION": "Unpause Evolution",
"REVIVE": "Revive",
- "SELECT": "Select",
"choosePokemon": "Choose a Pokémon.",
"doWhatWithThisPokemon": "Do what with this Pokémon?",
diff --git a/src/locales/en/pokemon-info.ts b/src/locales/en/pokemon-info.ts
index 70a06294c761..f31fdac69ab5 100644
--- a/src/locales/en/pokemon-info.ts
+++ b/src/locales/en/pokemon-info.ts
@@ -15,8 +15,7 @@ export const pokemonInfo: PokemonInfoTranslationEntries = {
"SPD": "Speed",
"SPDshortened": "Spd",
"ACC": "Accuracy",
- "EVA": "Evasiveness",
- "HPStat": "HP"
+ "EVA": "Evasiveness"
},
Type: {
diff --git a/src/locales/en/run-history-ui-handler.ts b/src/locales/en/run-history-ui-handler.ts
new file mode 100644
index 000000000000..d0f622599e2f
--- /dev/null
+++ b/src/locales/en/run-history-ui-handler.ts
@@ -0,0 +1,31 @@
+import { SimpleTranslationEntries } from "#app/interfaces/locales";
+
+export const runHistory: SimpleTranslationEntries = {
+ "victory": "Victory!",
+ "defeatedWild": "Defeated by ",
+ "defeatedTrainer": "Defeated by ",
+ "defeatedTrainerDouble": "Defeated by Duo",
+ "defeatedRival": "Defeated by Rival",
+ "defeated":"Defeated",
+ "luck":"Luck",
+ "score":"Score",
+ "mode":"Mode",
+ "challengeRules":"Rule(s)",
+ "challengeMonoGen1":"Gen I",
+ "challengeMonoGen2":"Gen II",
+ "challengeMonoGen3":"Gen III",
+ "challengeMonoGen4":"Gen IV",
+ "challengeMonoGen5":"Gen V",
+ "challengeMonoGen6":"Gen VI",
+ "challengeMonoGen7":"Gen VII",
+ "challengeMonoGen8":"Gen VIII",
+ "challengeMonoGen9":"Gen IX",
+ "playerItems":"Player Items",
+ "personalBest":"Personal Best!",
+ "SPDshortened":"Vel.",
+ "runInfo":"Run Info",
+ "money":"Money",
+} as const;
+
+//Mode Information found in game-mode.ts
+//Wave / Lv found in save-slot-select-ui-handler.ts
diff --git a/src/locales/en/settings.ts b/src/locales/en/settings.ts
index 0b88f5e82c8e..f68a649269f7 100644
--- a/src/locales/en/settings.ts
+++ b/src/locales/en/settings.ts
@@ -15,7 +15,6 @@ export const settings: SimpleTranslationEntries = {
"skipSeenDialogues": "Skip Seen Dialogues",
"battleStyle": "Battle Style",
"enableRetries": "Enable Retries",
- "hideIvs": "Hide IV scanner",
"tutorials": "Tutorials",
"touchControls": "Touch Controls",
"vibrations": "Vibrations",
@@ -97,5 +96,4 @@ export const settings: SimpleTranslationEntries = {
"controller": "Controller",
"gamepadSupport": "Gamepad Support",
"showBgmBar": "Show Music Names",
- "shopOverlayOpacity": "Shop Overlay Opacity"
} as const;
diff --git a/src/locales/en/starter-select-ui-handler.ts b/src/locales/en/starter-select-ui-handler.ts
index 6d7b7f7cfb20..ac59785bab72 100644
--- a/src/locales/en/starter-select-ui-handler.ts
+++ b/src/locales/en/starter-select-ui-handler.ts
@@ -6,8 +6,7 @@ import { SimpleTranslationEntries } from "#app/interfaces/locales";
* account interactions, descriptive text, etc.
*/
export const starterSelectUiHandler: SimpleTranslationEntries = {
- "confirmStartTeam": "Begin with these Pokémon?",
- "invalidParty": "This is not a valid starting party!",
+ "confirmStartTeam":"Begin with these Pokémon?",
"gen1": "I",
"gen2": "II",
"gen3": "III",
@@ -23,7 +22,6 @@ export const starterSelectUiHandler: SimpleTranslationEntries = {
"nature": "Nature:",
"eggMoves": "Egg Moves",
"addToParty": "Add to Party",
- "removeFromParty": "Remove from Party",
"toggleIVs": "Toggle IVs",
"manageMoves": "Manage Moves",
"manageNature": "Manage Nature",
diff --git a/src/locales/en/weather.ts b/src/locales/en/weather.ts
index 96985ca25fb0..c7b2963ccd81 100644
--- a/src/locales/en/weather.ts
+++ b/src/locales/en/weather.ts
@@ -43,17 +43,3 @@ export const weather: SimpleTranslationEntries = {
"strongWindsEffectMessage": "The mysterious air current weakened the attack!",
"strongWindsClearMessage": "The heavy wind stopped."
};
-
-export const terrain: SimpleTranslationEntries = {
- "mistyStartMessage": "Mist swirled around the battlefield!",
- "mistyClearMessage": "The mist disappeared from the battlefield.",
-
- "electricStartMessage": "An electric current ran across the battlefield!",
- "electricClearMessage": "The electricity disappeared from the battlefield.",
-
- "grassyStartMessage": "Grass grew to cover the battlefield!",
- "grassyClearMessage": "The grass disappeared from the battlefield.",
-
- "psychicStartMessage": "The battlefield got weird!",
- "psychicClearMessage": "The weirdness disappeared from the battlefield!",
-};
diff --git a/src/locales/es/ability-trigger.ts b/src/locales/es/ability-trigger.ts
index fe0d9aadc7fe..5c09c3832c04 100644
--- a/src/locales/es/ability-trigger.ts
+++ b/src/locales/es/ability-trigger.ts
@@ -8,5 +8,4 @@ export const abilityTriggers: SimpleTranslationEntries = {
"trace": "{{pokemonName}} copied {{targetName}}'s\n{{abilityName}}!",
"windPowerCharged": "¡{{pokemonName}} se ha cargado de electricidad gracias a {{moveName}}!",
"quickDraw": "{{pokemonName}} can act faster than normal, thanks to its Quick Draw!",
- "disguiseAvoidedDamage" : "{{pokemonName}}'s disguise was busted!",
} as const;
diff --git a/src/locales/es/battle.ts b/src/locales/es/battle.ts
index c5dbb79c307b..ddba5fab9a83 100644
--- a/src/locales/es/battle.ts
+++ b/src/locales/es/battle.ts
@@ -68,8 +68,6 @@ export const battle: SimpleTranslationEntries = {
"regainHealth": "¡{{pokemonName}} recuperó\nPS!",
"stealEatBerry": "¡{{pokemonName}} robó la {{berryName}}\nde {{targetName}} y se la comió!",
"fainted": "¡{{pokemonNameWithAffix}} se debilitó!",
- "statsAnd": "and",
- "stats": "Stats",
"statRose": "¡El {{stats}} de {{pokemonNameWithAffix}} ha subido!",
"statSharplyRose": "¡El {{stats}} de {{pokemonNameWithAffix}} ha subido mucho!",
"statRoseDrastically": "¡El {{stats}} de {{pokemonNameWithAffix}} ha subido muchísimo!",
@@ -78,14 +76,6 @@ export const battle: SimpleTranslationEntries = {
"statHarshlyFell": "¡El {{stats}} de {{pokemonNameWithAffix}}} ha bajado mucho!",
"statSeverelyFell": "¡El {{stats}} de {{pokemonNameWithAffix}} ha bajado muchísimo!",
"statWontGoAnyLower": "¡El {{stats}} de {{pokemonNameWithAffix}} no puede bajar más!",
- "statRoseMultiple": "{{pokemonNameWithAffix}}'s {{stats}} rose!",
- "statSharplyRoseMultiple": "{{pokemonNameWithAffix}}'s {{stats}} sharply rose!",
- "statRoseDrasticallyMultiple": "{{pokemonNameWithAffix}}'s {{stats}} rose drastically!",
- "statWontGoAnyHigherMultiple": "{{pokemonNameWithAffix}}'s {{stats}} won't go any higher!",
- "statFellMultiple": "{{pokemonNameWithAffix}}'s {{stats}} fell!",
- "statHarshlyFellMultiple": "{{pokemonNameWithAffix}}'s {{stats}} harshly fell!",
- "statSeverelyFellMultiple": "{{pokemonNameWithAffix}}'s {{stats}} severely fell!",
- "statWontGoAnyLowerMultiple": "{{pokemonNameWithAffix}}'s {{stats}} won't go any lower!",
"ppReduced": "It reduced the PP of {{targetName}}'s\n{{moveName}} by {{reduction}}!",
"battlerTagsRechargingLapse": "{{pokemonNameWithAffix}} must\nrecharge!",
"battlerTagsTrappedOnAdd": "{{pokemonNameWithAffix}} can no\nlonger escape!",
diff --git a/src/locales/es/config.ts b/src/locales/es/config.ts
index c37f96a2aa5d..bedd53dcc293 100644
--- a/src/locales/es/config.ts
+++ b/src/locales/es/config.ts
@@ -39,7 +39,7 @@ import { statusEffect } from "./status-effect";
import { titles, trainerClasses, trainerNames } from "./trainers";
import { tutorial } from "./tutorial";
import { voucher } from "./voucher";
-import { terrain, weather } from "./weather";
+import { weather } from "./weather";
import { partyUiHandler } from "./party-ui-handler";
import { settings } from "./settings.js";
import { common } from "./common.js";
@@ -85,7 +85,6 @@ export const esConfig = {
splashMessages: splashMessages,
starterSelectUiHandler: starterSelectUiHandler,
statusEffect: statusEffect,
- terrain: terrain,
titles: titles,
trainerClasses: trainerClasses,
trainerNames: trainerNames,
diff --git a/src/locales/es/run-history-ui-handler.ts b/src/locales/es/run-history-ui-handler.ts
new file mode 100644
index 000000000000..9b666a2e1a4e
--- /dev/null
+++ b/src/locales/es/run-history-ui-handler.ts
@@ -0,0 +1,30 @@
+import { SimpleTranslationEntries } from "#app/interfaces/locales";
+
+export const runHistory: SimpleTranslationEntries = {
+ "victory": "Victory!",
+ "defeatedWild": "Defeated by ",
+ "defeatedTrainer": "Defeated by ",
+ "defeatedTrainerDouble": "Defeated by Duo",
+ "defeatedRival": "Defeated by Rival",
+ "defeated":"Defeated",
+ "luck":"Luck",
+ "score":"Score",
+ "mode":"Mode",
+ "challengeRules":"Rule(s)",
+ "challengeMonoGen1":"Gen I",
+ "challengeMonoGen2":"Gen II",
+ "challengeMonoGen3":"Gen III",
+ "challengeMonoGen4":"Gen IV",
+ "challengeMonoGen5":"Gen V",
+ "challengeMonoGen6":"Gen VI",
+ "challengeMonoGen7":"Gen VII",
+ "challengeMonoGen8":"Gen VIII",
+ "challengeMonoGen9":"Gen IX",
+ "playerItems":"Player Items",
+ "SPDshortened":"Vel.",
+ "runInfo":"Run Info",
+ "money":"Money",
+} as const;
+
+//Mode Information found in game-mode.ts
+//Wave / Lv found in save-slot-select-ui-handler.ts
diff --git a/src/locales/es/settings.ts b/src/locales/es/settings.ts
index 407bfab602f7..dfd6f0972424 100644
--- a/src/locales/es/settings.ts
+++ b/src/locales/es/settings.ts
@@ -96,5 +96,4 @@ export const settings: SimpleTranslationEntries = {
"controller": "Controller",
"gamepadSupport": "Gamepad Support",
"showBgmBar": "Show Music Names",
- "shopOverlayOpacity": "Opacidad de la fase de compra"
} as const;
diff --git a/src/locales/es/weather.ts b/src/locales/es/weather.ts
index 1129443d71bd..37f574878dc0 100644
--- a/src/locales/es/weather.ts
+++ b/src/locales/es/weather.ts
@@ -43,24 +43,3 @@ export const weather: SimpleTranslationEntries = {
"strongWindsEffectMessage": "¡Las misteriosas turbulencias atenúan el ataque!",
"strongWindsClearMessage": "El fuerte viento cesó."
};
-
-export const terrain: SimpleTranslationEntries = {
- "misty": "Misty",
- "mistyStartMessage": "Mist swirled around the battlefield!",
- "mistyClearMessage": "The mist disappeared from the battlefield.",
- "mistyBlockMessage": "{{pokemonNameWithAffix}} surrounds itself with a protective mist!",
-
- "electric": "Electric",
- "electricStartMessage": "An electric current ran across the battlefield!",
- "electricClearMessage": "The electricity disappeared from the battlefield.",
-
- "grassy": "Grassy",
- "grassyStartMessage": "Grass grew to cover the battlefield!",
- "grassyClearMessage": "The grass disappeared from the battlefield.",
-
- "psychic": "Psychic",
- "psychicStartMessage": "The battlefield got weird!",
- "psychicClearMessage": "The weirdness disappeared from the battlefield!",
-
- "defaultBlockMessage": "{{pokemonNameWithAffix}} is protected by the {{terrainName}} Terrain!"
-};
diff --git a/src/locales/fr/ability-trigger.ts b/src/locales/fr/ability-trigger.ts
index e595a501cb62..f99ff15c26fb 100644
--- a/src/locales/fr/ability-trigger.ts
+++ b/src/locales/fr/ability-trigger.ts
@@ -10,5 +10,4 @@ export const abilityTriggers: SimpleTranslationEntries = {
"trace": "{{pokemonName}} copie le talent {{abilityName}}\nde {{targetName}} !",
"windPowerCharged": "{{pokemonName}} a été touché par la capacité {{moveName}} et se charge en électricité !",
"quickDraw": "{{pokemonName}} can act faster than normal, thanks to its Quick Draw!",
- "disguiseAvoidedDamage" : "{{pokemonName}}'s disguise was busted!",
} as const;
diff --git a/src/locales/fr/battle.ts b/src/locales/fr/battle.ts
index c8baecc84c3e..5bcf0763ef0c 100644
--- a/src/locales/fr/battle.ts
+++ b/src/locales/fr/battle.ts
@@ -68,8 +68,6 @@ export const battle: SimpleTranslationEntries = {
"drainMessage": "L’énergie de {{pokemonName}}\nest drainée !",
"regainHealth": "{{pokemonName}} récupère\ndes PV !",
"fainted": "{{pokemonNameWithAffix}}\nest K.O. !",
- "statsAnd": "and",
- "stats": "Stats",
"statRose": "{{stats}} de {{pokemonNameWithAffix}}\naugmente !",
"statSharplyRose": "{{stats}} de {{pokemonNameWithAffix}}\naugmente beaucoup !",
"statRoseDrastically": "{{stats}} de {{pokemonNameWithAffix}}\naugmente énormément !",
@@ -78,14 +76,6 @@ export const battle: SimpleTranslationEntries = {
"statHarshlyFell": "{{stats}} de {{pokemonNameWithAffix}}\nbaisse beaucoup !",
"statSeverelyFell": "{{stats}} de {{pokemonNameWithAffix}}\nbaisse énormément !",
"statWontGoAnyLower": "{{stats}} de {{pokemonNameWithAffix}}\nne peut plus baisser !",
- "statRoseMultiple": "{{pokemonNameWithAffix}}'s {{stats}} rose!",
- "statSharplyRoseMultiple": "{{pokemonNameWithAffix}}'s {{stats}} sharply rose!",
- "statRoseDrasticallyMultiple": "{{pokemonNameWithAffix}}'s {{stats}} rose drastically!",
- "statWontGoAnyHigherMultiple": "{{pokemonNameWithAffix}}'s {{stats}} won't go any higher!",
- "statFellMultiple": "{{pokemonNameWithAffix}}'s {{stats}} fell!",
- "statHarshlyFellMultiple": "{{pokemonNameWithAffix}}'s {{stats}} harshly fell!",
- "statSeverelyFellMultiple": "{{pokemonNameWithAffix}}'s {{stats}} severely fell!",
- "statWontGoAnyLowerMultiple": "{{pokemonNameWithAffix}}'s {{stats}} won't go any lower!",
"ppReduced": "Les PP de la capacité {{moveName}}\nde {{targetName}} baissent de {{reduction}} !",
"battlerTagsRechargingLapse": "Le contrecoup empêche {{pokemonNameWithAffix}}\n de bouger !",
"battlerTagsTrappedOnAdd": "{{pokemonNameWithAffix}}\nne peut plus s’échapper !",
diff --git a/src/locales/fr/config.ts b/src/locales/fr/config.ts
index af18aab34005..55eae8c1dd5f 100644
--- a/src/locales/fr/config.ts
+++ b/src/locales/fr/config.ts
@@ -39,7 +39,7 @@ import { statusEffect } from "./status-effect";
import { titles, trainerClasses, trainerNames } from "./trainers";
import { tutorial } from "./tutorial";
import { voucher } from "./voucher";
-import { terrain, weather } from "./weather";
+import { weather } from "./weather";
import { partyUiHandler } from "./party-ui-handler";
import { settings } from "./settings.js";
import { common } from "./common.js";
@@ -85,7 +85,6 @@ export const frConfig = {
splashMessages: splashMessages,
starterSelectUiHandler: starterSelectUiHandler,
statusEffect: statusEffect,
- terrain: terrain,
titles: titles,
trainerClasses: trainerClasses,
trainerNames: trainerNames,
diff --git a/src/locales/fr/run-history-ui-handler.ts b/src/locales/fr/run-history-ui-handler.ts
new file mode 100644
index 000000000000..d0f622599e2f
--- /dev/null
+++ b/src/locales/fr/run-history-ui-handler.ts
@@ -0,0 +1,31 @@
+import { SimpleTranslationEntries } from "#app/interfaces/locales";
+
+export const runHistory: SimpleTranslationEntries = {
+ "victory": "Victory!",
+ "defeatedWild": "Defeated by ",
+ "defeatedTrainer": "Defeated by ",
+ "defeatedTrainerDouble": "Defeated by Duo",
+ "defeatedRival": "Defeated by Rival",
+ "defeated":"Defeated",
+ "luck":"Luck",
+ "score":"Score",
+ "mode":"Mode",
+ "challengeRules":"Rule(s)",
+ "challengeMonoGen1":"Gen I",
+ "challengeMonoGen2":"Gen II",
+ "challengeMonoGen3":"Gen III",
+ "challengeMonoGen4":"Gen IV",
+ "challengeMonoGen5":"Gen V",
+ "challengeMonoGen6":"Gen VI",
+ "challengeMonoGen7":"Gen VII",
+ "challengeMonoGen8":"Gen VIII",
+ "challengeMonoGen9":"Gen IX",
+ "playerItems":"Player Items",
+ "personalBest":"Personal Best!",
+ "SPDshortened":"Vel.",
+ "runInfo":"Run Info",
+ "money":"Money",
+} as const;
+
+//Mode Information found in game-mode.ts
+//Wave / Lv found in save-slot-select-ui-handler.ts
diff --git a/src/locales/fr/settings.ts b/src/locales/fr/settings.ts
index 9e3bd04923ad..cd85b0f8cb9e 100644
--- a/src/locales/fr/settings.ts
+++ b/src/locales/fr/settings.ts
@@ -95,6 +95,5 @@ export const settings: SimpleTranslationEntries = {
"mute": "Muet",
"controller": "Controller",
"gamepadSupport": "Gamepad Support",
- "showBgmBar": "Titre de la musique",
- "shopOverlayOpacity": "Opacité boutique"
+ "showBgmBar": "Montrer titre de la musique",
} as const;
diff --git a/src/locales/fr/weather.ts b/src/locales/fr/weather.ts
index 3427748480e5..3df8d0e20c9d 100644
--- a/src/locales/fr/weather.ts
+++ b/src/locales/fr/weather.ts
@@ -43,24 +43,3 @@ export const weather: SimpleTranslationEntries = {
"strongWindsEffectMessage": "Le courant aérien mystérieux affaiblit l’attaque !",
"strongWindsClearMessage": "Le vent mystérieux s’est dissipé…"
};
-
-export const terrain: SimpleTranslationEntries = {
- "misty": "Brumeux",
- "mistyStartMessage": "La brume recouvre le terrain !",
- "mistyClearMessage": "La brume qui recouvrait le terrain se dissipe…",
- "mistyBlockMessage": "La brume enveloppe {{pokemonNameWithAffix}} !",
-
- "electric": "Électrifié",
- "electricStartMessage": "De l’électricité parcourt le terrain !",
- "electricClearMessage": "L’électricité parcourant le terrain s’est dissipée…",
-
- "grassy": "Herbu",
- "grassyStartMessage": "Un beau gazon pousse sur le terrain !",
- "grassyClearMessage": "Le gazon disparait…",
-
- "psychic": "Psychique",
- "psychicStartMessage": "Le sol se met à réagir de façon bizarre…",
- "psychicClearMessage": "Le sol redevient normal !",
-
- "defaultBlockMessage": "{{pokemonNameWithAffix}} est protégé\npar le Champ {{terrainName}} !"
-};
diff --git a/src/locales/it/ability-trigger.ts b/src/locales/it/ability-trigger.ts
index 46839a32778f..1f6fcfb12580 100644
--- a/src/locales/it/ability-trigger.ts
+++ b/src/locales/it/ability-trigger.ts
@@ -8,5 +8,4 @@ export const abilityTriggers: SimpleTranslationEntries = {
"trace": "{{pokemonName}} copied {{targetName}}'s\n{{abilityName}}!",
"windPowerCharged": "Venire colpito da {{moveName}} ha caricato {{pokemonName}}!",
"quickDraw":"{{pokemonName}} can act faster than normal, thanks to its Quick Draw!",
- "disguiseAvoidedDamage" : "{{pokemonName}}'s disguise was busted!",
} as const;
diff --git a/src/locales/it/battle.ts b/src/locales/it/battle.ts
index e0407de6ad02..f44ca8e493c5 100644
--- a/src/locales/it/battle.ts
+++ b/src/locales/it/battle.ts
@@ -68,8 +68,6 @@ export const battle: SimpleTranslationEntries = {
"drainMessage": "Viene prelevata energia\n da{{pokemonName}}!",
"regainHealth": "{{pokemonName}} ha rigenerato\npunti salute!",
"fainted": "{{pokemonNameWithAffix}} non è più in\ngrado di combattere!",
- "statsAnd": "and",
- "stats": "Stats",
"statRose": "{{pokemonNameWithAffix}}'s {{stats}} è aumentato/a!",
"statSharplyRose": "{{pokemonNameWithAffix}}'s {{stats}} è aumentato/a molto!",
"statRoseDrastically": "{{pokemonNameWithAffix}}'s {{stats}} è aumentato/a drasticamente!",
@@ -78,14 +76,6 @@ export const battle: SimpleTranslationEntries = {
"statHarshlyFell": "{{pokemonNameWithAffix}}'s {{stats}} è diminuito/a molto!",
"statSeverelyFell": "{{pokemonNameWithAffix}}'s {{stats}} è diminuito/a drasticamente!",
"statWontGoAnyLower": "{{pokemonNameWithAffix}}'s {{stats}} non può diminuire più di così!",
- "statRoseMultiple": "{{pokemonNameWithAffix}}'s {{stats}} rose!",
- "statSharplyRoseMultiple": "{{pokemonNameWithAffix}}'s {{stats}} sharply rose!",
- "statRoseDrasticallyMultiple": "{{pokemonNameWithAffix}}'s {{stats}} rose drastically!",
- "statWontGoAnyHigherMultiple": "{{pokemonNameWithAffix}}'s {{stats}} won't go any higher!",
- "statFellMultiple": "{{pokemonNameWithAffix}}'s {{stats}} fell!",
- "statHarshlyFellMultiple": "{{pokemonNameWithAffix}}'s {{stats}} harshly fell!",
- "statSeverelyFellMultiple": "{{pokemonNameWithAffix}}'s {{stats}} severely fell!",
- "statWontGoAnyLowerMultiple": "{{pokemonNameWithAffix}}'s {{stats}} won't go any lower!",
"ppReduced": "It reduced the PP of {{targetName}}'s\n{{moveName}} by {{reduction}}!",
"battlerTagsRechargingLapse": "{{pokemonNameWithAffix}} deve\nricaricarsi!",
"battlerTagsTrappedOnAdd": "{{pokemonNameWithAffix}} non può\npiù fuggire!",
diff --git a/src/locales/it/config.ts b/src/locales/it/config.ts
index ac77e8146239..9175d40b97f7 100644
--- a/src/locales/it/config.ts
+++ b/src/locales/it/config.ts
@@ -39,7 +39,7 @@ import { statusEffect } from "./status-effect";
import { titles, trainerClasses, trainerNames } from "./trainers";
import { tutorial } from "./tutorial";
import { voucher } from "./voucher";
-import { terrain, weather } from "./weather";
+import { weather } from "./weather";
import { partyUiHandler } from "./party-ui-handler";
import { settings } from "./settings.js";
import { common } from "./common.js";
@@ -85,7 +85,6 @@ export const itConfig = {
splashMessages: splashMessages,
starterSelectUiHandler: starterSelectUiHandler,
statusEffect: statusEffect,
- terrain: terrain,
titles: titles,
trainerClasses: trainerClasses,
trainerNames: trainerNames,
diff --git a/src/locales/it/run-history-ui-handler.ts b/src/locales/it/run-history-ui-handler.ts
new file mode 100644
index 000000000000..d0f622599e2f
--- /dev/null
+++ b/src/locales/it/run-history-ui-handler.ts
@@ -0,0 +1,31 @@
+import { SimpleTranslationEntries } from "#app/interfaces/locales";
+
+export const runHistory: SimpleTranslationEntries = {
+ "victory": "Victory!",
+ "defeatedWild": "Defeated by ",
+ "defeatedTrainer": "Defeated by ",
+ "defeatedTrainerDouble": "Defeated by Duo",
+ "defeatedRival": "Defeated by Rival",
+ "defeated":"Defeated",
+ "luck":"Luck",
+ "score":"Score",
+ "mode":"Mode",
+ "challengeRules":"Rule(s)",
+ "challengeMonoGen1":"Gen I",
+ "challengeMonoGen2":"Gen II",
+ "challengeMonoGen3":"Gen III",
+ "challengeMonoGen4":"Gen IV",
+ "challengeMonoGen5":"Gen V",
+ "challengeMonoGen6":"Gen VI",
+ "challengeMonoGen7":"Gen VII",
+ "challengeMonoGen8":"Gen VIII",
+ "challengeMonoGen9":"Gen IX",
+ "playerItems":"Player Items",
+ "personalBest":"Personal Best!",
+ "SPDshortened":"Vel.",
+ "runInfo":"Run Info",
+ "money":"Money",
+} as const;
+
+//Mode Information found in game-mode.ts
+//Wave / Lv found in save-slot-select-ui-handler.ts
diff --git a/src/locales/it/settings.ts b/src/locales/it/settings.ts
index 07cbe6b7f46a..af48368aeebd 100644
--- a/src/locales/it/settings.ts
+++ b/src/locales/it/settings.ts
@@ -3,7 +3,7 @@ import { SimpleTranslationEntries } from "#app/interfaces/locales.js";
export const settings: SimpleTranslationEntries = {
"boy": "Ragazzo",
"girl": "Ragazza",
- "general": "Generale",
+ "general": "General",
"display": "Display",
"audio": "Audio",
"gamepad": "Gamepad",
@@ -94,7 +94,6 @@ export const settings: SimpleTranslationEntries = {
"alt": " (Alt)",
"mute": "Mute",
"controller": "Controller",
- "gamepadSupport": "Supporto Gamepad",
- "showBgmBar": "Mostra Nomi Musica",
- "shopOverlayOpacity": "Opacità Finestra Negozio"
+ "gamepadSupport": "Gamepad Support",
+ "showBgmBar": "Show Music Names",
} as const;
diff --git a/src/locales/it/weather.ts b/src/locales/it/weather.ts
index 604108435c3e..f5d8e3b9397f 100644
--- a/src/locales/it/weather.ts
+++ b/src/locales/it/weather.ts
@@ -43,24 +43,3 @@ export const weather: SimpleTranslationEntries = {
"strongWindsEffectMessage": "La corrente misteriosa indebolisce l’attacco!",
"strongWindsClearMessage": "La corrente d'aria è cessata."
};
-
-export const terrain: SimpleTranslationEntries = {
- "misty": "Misty",
- "mistyStartMessage": "Mist swirled around the battlefield!",
- "mistyClearMessage": "The mist disappeared from the battlefield.",
- "mistyBlockMessage": "{{pokemonNameWithAffix}} surrounds itself with a protective mist!",
-
- "electric": "Electric",
- "electricStartMessage": "An electric current ran across the battlefield!",
- "electricClearMessage": "The electricity disappeared from the battlefield.",
-
- "grassy": "Grassy",
- "grassyStartMessage": "Grass grew to cover the battlefield!",
- "grassyClearMessage": "The grass disappeared from the battlefield.",
-
- "psychic": "Psychic",
- "psychicStartMessage": "The battlefield got weird!",
- "psychicClearMessage": "The weirdness disappeared from the battlefield!",
-
- "defaultBlockMessage": "{{pokemonNameWithAffix}} is protected by the {{terrainName}} Terrain!"
-};
diff --git a/src/locales/ko/ability-trigger.ts b/src/locales/ko/ability-trigger.ts
index e49dafe6bb82..58ba7bf9aa6e 100644
--- a/src/locales/ko/ability-trigger.ts
+++ b/src/locales/ko/ability-trigger.ts
@@ -10,5 +10,4 @@ export const abilityTriggers: SimpleTranslationEntries = {
"trace": "{{pokemonName}} copied {{targetName}}'s\n{{abilityName}}!",
"windPowerCharged": "{{pokemonName}}[[는]]\n{{moveName}}에 맞아 충전되었다!",
"quickDraw": "{{pokemonName}}[[는]]\n퀵드로에 의해 행동이 빨라졌다!",
- "disguiseAvoidedDamage" : "{{pokemonName}}'s disguise was busted!",
} as const;
diff --git a/src/locales/ko/battle.ts b/src/locales/ko/battle.ts
index 02693cb5f1ac..25ff106946b9 100644
--- a/src/locales/ko/battle.ts
+++ b/src/locales/ko/battle.ts
@@ -68,8 +68,6 @@ export const battle: SimpleTranslationEntries = {
"stealEatBerry": "{{pokemonName}}[[가]]\n{{targetName}}의 {{berryName}}[[를]] 빼앗아 먹었다!",
"regainHealth": "{{pokemonName}}[[는]]\n체력을 회복했다!",
"fainted": "{{pokemonNameWithAffix}}[[는]] 쓰러졌다!",
- "statsAnd": "and",
- "stats": "Stats",
"statRose": "{{pokemonNameWithAffix}}의\n{{stats}}[[가]] 올라갔다!",
"statSharplyRose": "{{pokemonNameWithAffix}}의\n{{stats}}[[가]] 크게 올라갔다!",
"statRoseDrastically": "{{pokemonNameWithAffix}}의\n{{stats}}[[가]] 매우 크게 올라갔다!",
@@ -78,14 +76,6 @@ export const battle: SimpleTranslationEntries = {
"statHarshlyFell": "{{pokemonNameWithAffix}}의\n{{stats}}[[가]] 크게 떨어졌다!",
"statSeverelyFell": "{{pokemonNameWithAffix}}의\n{{stats}}[[가]] 매우 크게 떨어졌다!",
"statWontGoAnyLower": "{{pokemonNameWithAffix}}의\n{{stats}}[[는]] 더 떨어지지 않는다!",
- "statRoseMultiple": "{{pokemonNameWithAffix}}'s {{stats}} rose!",
- "statSharplyRoseMultiple": "{{pokemonNameWithAffix}}'s {{stats}} sharply rose!",
- "statRoseDrasticallyMultiple": "{{pokemonNameWithAffix}}'s {{stats}} rose drastically!",
- "statWontGoAnyHigherMultiple": "{{pokemonNameWithAffix}}'s {{stats}} won't go any higher!",
- "statFellMultiple": "{{pokemonNameWithAffix}}'s {{stats}} fell!",
- "statHarshlyFellMultiple": "{{pokemonNameWithAffix}}'s {{stats}} harshly fell!",
- "statSeverelyFellMultiple": "{{pokemonNameWithAffix}}'s {{stats}} severely fell!",
- "statWontGoAnyLowerMultiple": "{{pokemonNameWithAffix}}'s {{stats}} won't go any lower!",
"ppReduced": "{{targetName}}의\n{{moveName}}[[를]] {{reduction}} 깎았다!",
"battlerTagsRechargingLapse": "공격의 반동으로\n{{pokemonNameWithAffix}}[[는]] 움직일 수 없다!",
"battlerTagsTrappedOnAdd": "{{pokemonNameWithAffix}}[[는]]\n이제 도망칠 수 없다!",
diff --git a/src/locales/ko/config.ts b/src/locales/ko/config.ts
index fa81dee55abf..dc64e12356ad 100644
--- a/src/locales/ko/config.ts
+++ b/src/locales/ko/config.ts
@@ -39,7 +39,7 @@ import { statusEffect } from "./status-effect";
import { titles, trainerClasses, trainerNames } from "./trainers";
import { tutorial } from "./tutorial";
import { voucher } from "./voucher";
-import { terrain, weather } from "./weather";
+import { weather } from "./weather";
import { partyUiHandler } from "./party-ui-handler";
import { settings } from "./settings.js";
import { common } from "./common.js";
@@ -85,7 +85,6 @@ export const koConfig = {
splashMessages: splashMessages,
starterSelectUiHandler: starterSelectUiHandler,
statusEffect: statusEffect,
- terrain: terrain,
titles: titles,
trainerClasses: trainerClasses,
trainerNames: trainerNames,
diff --git a/src/locales/ko/run-history-ui-handler.ts b/src/locales/ko/run-history-ui-handler.ts
new file mode 100644
index 000000000000..d0f622599e2f
--- /dev/null
+++ b/src/locales/ko/run-history-ui-handler.ts
@@ -0,0 +1,31 @@
+import { SimpleTranslationEntries } from "#app/interfaces/locales";
+
+export const runHistory: SimpleTranslationEntries = {
+ "victory": "Victory!",
+ "defeatedWild": "Defeated by ",
+ "defeatedTrainer": "Defeated by ",
+ "defeatedTrainerDouble": "Defeated by Duo",
+ "defeatedRival": "Defeated by Rival",
+ "defeated":"Defeated",
+ "luck":"Luck",
+ "score":"Score",
+ "mode":"Mode",
+ "challengeRules":"Rule(s)",
+ "challengeMonoGen1":"Gen I",
+ "challengeMonoGen2":"Gen II",
+ "challengeMonoGen3":"Gen III",
+ "challengeMonoGen4":"Gen IV",
+ "challengeMonoGen5":"Gen V",
+ "challengeMonoGen6":"Gen VI",
+ "challengeMonoGen7":"Gen VII",
+ "challengeMonoGen8":"Gen VIII",
+ "challengeMonoGen9":"Gen IX",
+ "playerItems":"Player Items",
+ "personalBest":"Personal Best!",
+ "SPDshortened":"Vel.",
+ "runInfo":"Run Info",
+ "money":"Money",
+} as const;
+
+//Mode Information found in game-mode.ts
+//Wave / Lv found in save-slot-select-ui-handler.ts
diff --git a/src/locales/ko/settings.ts b/src/locales/ko/settings.ts
index e1ee3b4e01c4..ef1469fc8cbc 100644
--- a/src/locales/ko/settings.ts
+++ b/src/locales/ko/settings.ts
@@ -96,5 +96,4 @@ export const settings: SimpleTranslationEntries = {
"controller": "컨트롤러",
"gamepadSupport": "게임패드 지원",
"showBgmBar": "BGM 제목 보여주기",
- "shopOverlayOpacity": "상점 오버레이 투명도"
} as const;
diff --git a/src/locales/ko/weather.ts b/src/locales/ko/weather.ts
index c89cc335859a..9aca57c49d2e 100644
--- a/src/locales/ko/weather.ts
+++ b/src/locales/ko/weather.ts
@@ -44,24 +44,3 @@ export const weather: SimpleTranslationEntries = {
"strongWindsEffectMessage": "수수께끼의 난기류가 공격을 약하게 만들었다!",
"strongWindsClearMessage": "수수께끼의 난기류가 멈췄다!" // 임의번역
};
-
-export const terrain: SimpleTranslationEntries = {
- "misty": "미스트필드",
- "mistyStartMessage": "발밑이 안개로 자욱해졌다!",
- "mistyClearMessage": "발밑의 안개가 사라졌다!",
- "mistyBlockMessage": "{{pokemonNameWithAffix}}[[를]]\n미스트필드가 지켜주고 있다!",
-
- "electric": "일렉트릭필드",
- "electricStartMessage": "발밑에 전기가 흐르기 시작했다!",
- "electricClearMessage": "발밑의 전기가 사라졌다!",
-
- "grassy": "그래스필드",
- "grassyStartMessage": "발밑에 풀이 무성해졌다!",
- "grassyClearMessage": "발밑의 풀이 사라졌다!",
-
- "psychic": "사이코필드",
- "psychicStartMessage": "발밑에서 이상한 느낌이 든다!",
- "psychicClearMessage": "발밑의 이상한 느낌이 사라졌다!",
-
- "defaultBlockMessage": "{{pokemonNameWithAffix}}[[를]]\n{{terrainName}}[[가]] 지켜주고 있다!"
-};
diff --git a/src/locales/pt_BR/ability-trigger.ts b/src/locales/pt_BR/ability-trigger.ts
index eb7e6e615cb6..526c6def80d6 100644
--- a/src/locales/pt_BR/ability-trigger.ts
+++ b/src/locales/pt_BR/ability-trigger.ts
@@ -9,6 +9,5 @@ export const abilityTriggers: SimpleTranslationEntries = {
"poisonHeal": "{{abilityName}} de {{pokemonName}}\nrestaurou seus PS um pouco!",
"trace": "{{pokemonName}} copiou {{abilityName}}\nde {{targetName}}!",
"windPowerCharged": "Ser atingido por {{moveName}} carregou {{pokemonName}} com poder!",
- "disguiseAvoidedDamage" : "{{pokemonName}}'s disguise was busted!",
"quickDraw":"{{pokemonName}} pode agir mais rápido que o normal\ngraças ao seu Quick Draw!",
} as const;
diff --git a/src/locales/pt_BR/battle.ts b/src/locales/pt_BR/battle.ts
index 97746674a3e2..b63a03b25cf4 100644
--- a/src/locales/pt_BR/battle.ts
+++ b/src/locales/pt_BR/battle.ts
@@ -68,8 +68,6 @@ export const battle: SimpleTranslationEntries = {
"regainHealth": "{{pokemonName}} recuperou\npontos de saúde!",
"stealEatBerry": "{{pokemonName}} stole and ate\n{{targetName}}'s {{berryName}}!",
"fainted": "{{pokemonNameWithAffix}} desmaiou!",
- "statsAnd": "and",
- "stats": "Stats",
"statRose": "{{stats}} de {{pokemonNameWithAffix}} aumentou!",
"statSharplyRose": "{{stats}} de {{pokemonNameWithAffix}} aumentou bruscamente!",
"statRoseDrastically": "{{stats}} de {{pokemonNameWithAffix}} aumentou drasticamente!",
@@ -78,14 +76,6 @@ export const battle: SimpleTranslationEntries = {
"statHarshlyFell": "{{stats}} de {{pokemonNameWithAffix}} diminuiu duramente!",
"statSeverelyFell": "{{stats}} de {{pokemonNameWithAffix}} diminuiu severamente!",
"statWontGoAnyLower": "{{stats}} de {{pokemonNameWithAffix}} não vai mais diminuir!",
- "statRoseMultiple": "{{pokemonNameWithAffix}}'s {{stats}} rose!",
- "statSharplyRoseMultiple": "{{pokemonNameWithAffix}}'s {{stats}} sharply rose!",
- "statRoseDrasticallyMultiple": "{{pokemonNameWithAffix}}'s {{stats}} rose drastically!",
- "statWontGoAnyHigherMultiple": "{{pokemonNameWithAffix}}'s {{stats}} won't go any higher!",
- "statFellMultiple": "{{pokemonNameWithAffix}}'s {{stats}} fell!",
- "statHarshlyFellMultiple": "{{pokemonNameWithAffix}}'s {{stats}} harshly fell!",
- "statSeverelyFellMultiple": "{{pokemonNameWithAffix}}'s {{stats}} severely fell!",
- "statWontGoAnyLowerMultiple": "{{pokemonNameWithAffix}}'s {{stats}} won't go any lower!",
"ppReduced": "O PP do movimento {{moveName}} de\n{{targetName}} foi reduzido em {{reduction}}!",
"battlerTagsRechargingLapse": "{{pokemonNameWithAffix}} precisa\nrecarregar!",
"battlerTagsTrappedOnAdd": "{{pokemonNameWithAffix}} não pode\nmais escapar!",
diff --git a/src/locales/pt_BR/config.ts b/src/locales/pt_BR/config.ts
index 4b3649f96ada..5a571815c972 100644
--- a/src/locales/pt_BR/config.ts
+++ b/src/locales/pt_BR/config.ts
@@ -39,7 +39,7 @@ import { statusEffect } from "./status-effect";
import { titles, trainerClasses, trainerNames } from "./trainers";
import { tutorial } from "./tutorial";
import { voucher } from "./voucher";
-import { terrain, weather } from "./weather";
+import { weather } from "./weather";
import { partyUiHandler } from "./party-ui-handler";
import { settings } from "./settings.js";
import { common } from "./common.js";
@@ -76,13 +76,13 @@ export const ptBrConfig = {
modifierType: modifierType,
move: move,
nature: nature,
+ partyUiHandler: partyUiHandler,
pokeball: pokeball,
pokemon: pokemon,
pokemonInfo: pokemonInfo,
pokemonInfoContainer: pokemonInfoContainer,
saveSlotSelectUiHandler: saveSlotSelectUiHandler,
statusEffect: statusEffect,
- terrain: terrain,
settings: settings,
splashMessages: splashMessages,
starterSelectUiHandler: starterSelectUiHandler,
@@ -92,6 +92,5 @@ export const ptBrConfig = {
tutorial: tutorial,
voucher: voucher,
weather: weather,
- partyUiHandler: partyUiHandler,
modifierSelectUiHandler: modifierSelectUiHandler
};
diff --git a/src/locales/pt_BR/run-history-ui-handler.ts b/src/locales/pt_BR/run-history-ui-handler.ts
new file mode 100644
index 000000000000..d0f622599e2f
--- /dev/null
+++ b/src/locales/pt_BR/run-history-ui-handler.ts
@@ -0,0 +1,31 @@
+import { SimpleTranslationEntries } from "#app/interfaces/locales";
+
+export const runHistory: SimpleTranslationEntries = {
+ "victory": "Victory!",
+ "defeatedWild": "Defeated by ",
+ "defeatedTrainer": "Defeated by ",
+ "defeatedTrainerDouble": "Defeated by Duo",
+ "defeatedRival": "Defeated by Rival",
+ "defeated":"Defeated",
+ "luck":"Luck",
+ "score":"Score",
+ "mode":"Mode",
+ "challengeRules":"Rule(s)",
+ "challengeMonoGen1":"Gen I",
+ "challengeMonoGen2":"Gen II",
+ "challengeMonoGen3":"Gen III",
+ "challengeMonoGen4":"Gen IV",
+ "challengeMonoGen5":"Gen V",
+ "challengeMonoGen6":"Gen VI",
+ "challengeMonoGen7":"Gen VII",
+ "challengeMonoGen8":"Gen VIII",
+ "challengeMonoGen9":"Gen IX",
+ "playerItems":"Player Items",
+ "personalBest":"Personal Best!",
+ "SPDshortened":"Vel.",
+ "runInfo":"Run Info",
+ "money":"Money",
+} as const;
+
+//Mode Information found in game-mode.ts
+//Wave / Lv found in save-slot-select-ui-handler.ts
diff --git a/src/locales/pt_BR/settings.ts b/src/locales/pt_BR/settings.ts
index b6a48143435d..9d336cf07574 100644
--- a/src/locales/pt_BR/settings.ts
+++ b/src/locales/pt_BR/settings.ts
@@ -96,5 +96,4 @@ export const settings: SimpleTranslationEntries = {
"controller": "Controle",
"gamepadSupport": "Suporte para Controle",
"showBgmBar": "Show Music Names",
- "shopOverlayOpacity": "Opacidade da Loja"
} as const;
diff --git a/src/locales/pt_BR/weather.ts b/src/locales/pt_BR/weather.ts
index 31e35657c7f3..0787b32e4162 100644
--- a/src/locales/pt_BR/weather.ts
+++ b/src/locales/pt_BR/weather.ts
@@ -43,24 +43,3 @@ export const weather: SimpleTranslationEntries = {
"strongWindsEffectMessage": "The mysterious air current weakened the attack!",
"strongWindsClearMessage": "Os ventos fortes diminuíram.",
};
-
-export const terrain: SimpleTranslationEntries = {
- "misty": "Enevoado",
- "mistyStartMessage": "Uma névoa se espalhou pelo campo de batalha!",
- "mistyClearMessage": "A névou sumiu do campo de batalha.",
- "mistyBlockMessage": "{{pokemonNameWithAffix}} se envolveu com uma névoa protetora!",
-
- "electric": "Elétrico",
- "electricStartMessage": "Uma corrente elétrica se espalhou pelo campo de batalha!",
- "electricClearMessage": "A eletricidade sumiu do campo de batalha.",
-
- "grassy": "de Plantas",
- "grassyStartMessage": "Grama cresceu para cobrir o campo de batalha!",
- "grassyClearMessage": "A grama sumiu do campo de batalha.",
-
- "psychic": "Psíquico",
- "psychicStartMessage": "O campo de batalha ficou esquisito!",
- "psychicClearMessage": "A esquisitice sumiu do campo de batalha",
-
- "defaultBlockMessage": "{{pokemonNameWithAffix}} está protegido pelo Terreno {{terrainName}}!"
-};
diff --git a/src/locales/zh_CN/ability-trigger.ts b/src/locales/zh_CN/ability-trigger.ts
index 9f02975afadf..a9d7fa5b2023 100644
--- a/src/locales/zh_CN/ability-trigger.ts
+++ b/src/locales/zh_CN/ability-trigger.ts
@@ -8,5 +8,4 @@ export const abilityTriggers: SimpleTranslationEntries = {
"trace": "{{pokemonName}}复制了{{targetName}}的\n{{abilityName}}！",
"windPowerCharged": "受{{moveName}}的影响，{{pokemonName}}提升了能力！",
"quickDraw":"因为速击效果发动，\n{{pokemonName}}比平常出招更快了！",
- "disguiseAvoidedDamage" : "{{pokemonName}}'s disguise was busted!",
} as const;
diff --git a/src/locales/zh_CN/battle.ts b/src/locales/zh_CN/battle.ts
index 2e7fd23eac84..d8388064bd74 100644
--- a/src/locales/zh_CN/battle.ts
+++ b/src/locales/zh_CN/battle.ts
@@ -68,8 +68,6 @@ export const battle: SimpleTranslationEntries = {
"drainMessage": "{{pokemonName}}\n吸取了体力！",
"regainHealth": "{{pokemonName}}\n回复了体力！",
"fainted": "{{pokemonNameWithAffix}}\n倒下了！",
- "statsAnd": "and",
- "stats": "Stats",
"statRose": "{{pokemonNameWithAffix}}\n的{{stats}}提高了！",
"statSharplyRose": "{{pokemonNameWithAffix}}\n的{{stats}}大幅提高了！",
"statRoseDrastically": "{{pokemonNameWithAffix}}\n的{{stats}}极大幅提高了！",
@@ -78,14 +76,6 @@ export const battle: SimpleTranslationEntries = {
"statHarshlyFell": "{{pokemonNameWithAffix}}\n的{{stats}}大幅降低了！",
"statSeverelyFell": "{{pokemonNameWithAffix}}\n的{{stats}}极大幅降低了！",
"statWontGoAnyLower": "{{pokemonNameWithAffix}}\n的{{stats}}已经无法再降低了！",
- "statRoseMultiple": "{{pokemonNameWithAffix}}'s {{stats}} rose!",
- "statSharplyRoseMultiple": "{{pokemonNameWithAffix}}'s {{stats}} sharply rose!",
- "statRoseDrasticallyMultiple": "{{pokemonNameWithAffix}}'s {{stats}} rose drastically!",
- "statWontGoAnyHigherMultiple": "{{pokemonNameWithAffix}}'s {{stats}} won't go any higher!",
- "statFellMultiple": "{{pokemonNameWithAffix}}'s {{stats}} fell!",
- "statHarshlyFellMultiple": "{{pokemonNameWithAffix}}'s {{stats}} harshly fell!",
- "statSeverelyFellMultiple": "{{pokemonNameWithAffix}}'s {{stats}} severely fell!",
- "statWontGoAnyLowerMultiple": "{{pokemonNameWithAffix}}'s {{stats}} won't go any lower!",
"ppReduced": "降低了{{targetName}}的\n{{moveName}}的PP{{reduction}}点！",
"battlerTagsRechargingLapse": "{{pokemonNameWithAffix}}\n因攻击的反作用力而无法动弹！",
"battlerTagsTrappedOnAdd": "{{pokemonNameWithAffix}}不能逃跑！",
diff --git a/src/locales/zh_CN/config.ts b/src/locales/zh_CN/config.ts
index b55b2aa865c1..8f654b56d9ab 100644
--- a/src/locales/zh_CN/config.ts
+++ b/src/locales/zh_CN/config.ts
@@ -39,7 +39,7 @@ import { statusEffect } from "./status-effect";
import { titles, trainerClasses, trainerNames } from "./trainers";
import { tutorial } from "./tutorial";
import { voucher } from "./voucher";
-import { terrain, weather } from "./weather";
+import { weather } from "./weather";
import { partyUiHandler } from "./party-ui-handler";
import { settings } from "./settings.js";
import { common } from "./common.js";
@@ -85,7 +85,6 @@ export const zhCnConfig = {
splashMessages: splashMessages,
starterSelectUiHandler: starterSelectUiHandler,
statusEffect: statusEffect,
- terrain: terrain,
titles: titles,
trainerClasses: trainerClasses,
trainerNames: trainerNames,
diff --git a/src/locales/zh_CN/run-history-ui-handler.ts b/src/locales/zh_CN/run-history-ui-handler.ts
new file mode 100644
index 000000000000..d0f622599e2f
--- /dev/null
+++ b/src/locales/zh_CN/run-history-ui-handler.ts
@@ -0,0 +1,31 @@
+import { SimpleTranslationEntries } from "#app/interfaces/locales";
+
+export const runHistory: SimpleTranslationEntries = {
+ "victory": "Victory!",
+ "defeatedWild": "Defeated by ",
+ "defeatedTrainer": "Defeated by ",
+ "defeatedTrainerDouble": "Defeated by Duo",
+ "defeatedRival": "Defeated by Rival",
+ "defeated":"Defeated",
+ "luck":"Luck",
+ "score":"Score",
+ "mode":"Mode",
+ "challengeRules":"Rule(s)",
+ "challengeMonoGen1":"Gen I",
+ "challengeMonoGen2":"Gen II",
+ "challengeMonoGen3":"Gen III",
+ "challengeMonoGen4":"Gen IV",
+ "challengeMonoGen5":"Gen V",
+ "challengeMonoGen6":"Gen VI",
+ "challengeMonoGen7":"Gen VII",
+ "challengeMonoGen8":"Gen VIII",
+ "challengeMonoGen9":"Gen IX",
+ "playerItems":"Player Items",
+ "personalBest":"Personal Best!",
+ "SPDshortened":"Vel.",
+ "runInfo":"Run Info",
+ "money":"Money",
+} as const;
+
+//Mode Information found in game-mode.ts
+//Wave / Lv found in save-slot-select-ui-handler.ts
diff --git a/src/locales/zh_CN/settings.ts b/src/locales/zh_CN/settings.ts
index 92372deec422..3ca6cb435c6b 100644
--- a/src/locales/zh_CN/settings.ts
+++ b/src/locales/zh_CN/settings.ts
@@ -96,5 +96,4 @@ export const settings: SimpleTranslationEntries = {
"controller": "控制器",
"gamepadSupport": "手柄支持",
"showBgmBar": "显示音乐名称",
- "shopOverlayOpacity": "商店显示不透明度"
} as const;
diff --git a/src/locales/zh_CN/weather.ts b/src/locales/zh_CN/weather.ts
index ea4deffbd559..d280dfccb95f 100644
--- a/src/locales/zh_CN/weather.ts
+++ b/src/locales/zh_CN/weather.ts
@@ -43,24 +43,3 @@ export const weather: SimpleTranslationEntries = {
"strongWindsEffectMessage": "The mysterious air current weakened the attack!",
"strongWindsClearMessage": "神秘的乱流停止了。"
};
-
-export const terrain: SimpleTranslationEntries = {
- "misty": "薄雾",
- "mistyStartMessage": "脚下雾气缭绕！",
- "mistyClearMessage": "脚下的雾气消失不见了！",
- "mistyBlockMessage": "{{pokemonNameWithAffix}}正受到薄雾场地的保护！",
-
- "electric": "电气",
- "electricStartMessage": "脚下电光飞闪！",
- "electricClearMessage": "脚下的电光消失不见了！",
-
- "grassy": "青草",
- "grassyStartMessage": "脚下青草如茵！",
- "grassyClearMessage": "脚下的青草消失不见了！",
-
- "psychic": "精神",
- "psychicStartMessage": "脚下传来了奇妙的感觉！",
- "psychicClearMessage": "脚下的奇妙感觉消失了！",
-
- "defaultBlockMessage": "{{pokemonNameWithAffix}}正受到{{terrainName}}的的保护！"
-};
diff --git a/src/locales/zh_TW/ability-trigger.ts b/src/locales/zh_TW/ability-trigger.ts
index 888212c306f8..c436e5021f7b 100644
--- a/src/locales/zh_TW/ability-trigger.ts
+++ b/src/locales/zh_TW/ability-trigger.ts
@@ -8,5 +8,4 @@ export const abilityTriggers: SimpleTranslationEntries = {
"trace": "{{pokemonName}} 複製了 {{targetName}} 的\n{{abilityName}}!",
"windPowerCharged": "受 {{moveName}} 的影響， {{pokemonName}} 提升了能力！",
"quickDraw":"{{pokemonName}} can act faster than normal, thanks to its Quick Draw!",
- "disguiseAvoidedDamage" : "{{pokemonName}}'s disguise was busted!",
} as const;
diff --git a/src/locales/zh_TW/battle.ts b/src/locales/zh_TW/battle.ts
index a39218e9c913..bfd3885ca313 100644
--- a/src/locales/zh_TW/battle.ts
+++ b/src/locales/zh_TW/battle.ts
@@ -65,8 +65,6 @@ export const battle: SimpleTranslationEntries = {
"drainMessage": "{{pokemonName}} 吸取了體力！",
"regainHealth": "{{pokemonName}} 回復了體力！",
"fainted": "{{pokemonNameWithAffix}} 倒下了！",
- "statsAnd": "and",
- "stats": "Stats",
"statRose": "{{pokemonNameWithAffix}} 的 {{stats}} 提高了！",
"statSharplyRose": "{{pokemonNameWithAffix}} 的 {{stats}} 大幅提高了！",
"statRoseDrastically": "{{pokemonNameWithAffix}} 的 {{stats}} 極大幅提高了！",
@@ -75,14 +73,6 @@ export const battle: SimpleTranslationEntries = {
"statHarshlyFell": "{{pokemonNameWithAffix}} 的 {{stats}} 大幅降低了！",
"statSeverelyFell": "{{pokemonNameWithAffix}} 的 {{stats}} 極大幅降低了！",
"statWontGoAnyLower": "{{pokemonNameWithAffix}} 的 {{stats}} 已經無法再降低了！",
- "statRoseMultiple": "{{pokemonNameWithAffix}}'s {{stats}} rose!",
- "statSharplyRoseMultiple": "{{pokemonNameWithAffix}}'s {{stats}} sharply rose!",
- "statRoseDrasticallyMultiple": "{{pokemonNameWithAffix}}'s {{stats}} rose drastically!",
- "statWontGoAnyHigherMultiple": "{{pokemonNameWithAffix}}'s {{stats}} won't go any higher!",
- "statFellMultiple": "{{pokemonNameWithAffix}}'s {{stats}} fell!",
- "statHarshlyFellMultiple": "{{pokemonNameWithAffix}}'s {{stats}} harshly fell!",
- "statSeverelyFellMultiple": "{{pokemonNameWithAffix}}'s {{stats}} severely fell!",
- "statWontGoAnyLowerMultiple": "{{pokemonNameWithAffix}}'s {{stats}} won't go any lower!",
"ppReduced": "降低了 {{targetName}} 的\n{{moveName}} 的PP{{reduction}}點！",
"battlerTagsRechargingLapse": "{{pokemonNameWithAffix}}因攻擊的反作用力而無法動彈！",
"battlerTagsTrappedOnAdd": "{{pokemonNameWithAffix}}不能逃跑！",
diff --git a/src/locales/zh_TW/config.ts b/src/locales/zh_TW/config.ts
index 6886a750d62a..e4dfafdd43ed 100644
--- a/src/locales/zh_TW/config.ts
+++ b/src/locales/zh_TW/config.ts
@@ -39,7 +39,7 @@ import { statusEffect } from "./status-effect";
import { titles, trainerClasses, trainerNames } from "./trainers";
import { tutorial } from "./tutorial";
import { voucher } from "./voucher";
-import { terrain, weather } from "./weather";
+import { weather } from "./weather";
import { partyUiHandler } from "./party-ui-handler";
import { settings } from "./settings.js";
import { common } from "./common.js";
@@ -85,7 +85,6 @@ export const zhTwConfig = {
splashMessages: splashMessages,
starterSelectUiHandler: starterSelectUiHandler,
statusEffect: statusEffect,
- terrain: terrain,
titles: titles,
trainerClasses: trainerClasses,
trainerNames: trainerNames,
diff --git a/src/locales/zh_TW/run-history-ui-handler.ts b/src/locales/zh_TW/run-history-ui-handler.ts
new file mode 100644
index 000000000000..d0f622599e2f
--- /dev/null
+++ b/src/locales/zh_TW/run-history-ui-handler.ts
@@ -0,0 +1,31 @@
+import { SimpleTranslationEntries } from "#app/interfaces/locales";
+
+export const runHistory: SimpleTranslationEntries = {
+ "victory": "Victory!",
+ "defeatedWild": "Defeated by ",
+ "defeatedTrainer": "Defeated by ",
+ "defeatedTrainerDouble": "Defeated by Duo",
+ "defeatedRival": "Defeated by Rival",
+ "defeated":"Defeated",
+ "luck":"Luck",
+ "score":"Score",
+ "mode":"Mode",
+ "challengeRules":"Rule(s)",
+ "challengeMonoGen1":"Gen I",
+ "challengeMonoGen2":"Gen II",
+ "challengeMonoGen3":"Gen III",
+ "challengeMonoGen4":"Gen IV",
+ "challengeMonoGen5":"Gen V",
+ "challengeMonoGen6":"Gen VI",
+ "challengeMonoGen7":"Gen VII",
+ "challengeMonoGen8":"Gen VIII",
+ "challengeMonoGen9":"Gen IX",
+ "playerItems":"Player Items",
+ "personalBest":"Personal Best!",
+ "SPDshortened":"Vel.",
+ "runInfo":"Run Info",
+ "money":"Money",
+} as const;
+
+//Mode Information found in game-mode.ts
+//Wave / Lv found in save-slot-select-ui-handler.ts
diff --git a/src/locales/zh_TW/settings.ts b/src/locales/zh_TW/settings.ts
index c6c055ed4d2d..dcb87fafe35c 100644
--- a/src/locales/zh_TW/settings.ts
+++ b/src/locales/zh_TW/settings.ts
@@ -96,5 +96,4 @@ export const settings: SimpleTranslationEntries = {
"controller": "控制器",
"gamepadSupport": "手柄支持",
"showBgmBar": "Show Music Names",
- "shopOverlayOpacity": "Shop Overlay Opacity"
} as const;
diff --git a/src/locales/zh_TW/weather.ts b/src/locales/zh_TW/weather.ts
index bfc5e0998dcb..ae0646ce33df 100644
--- a/src/locales/zh_TW/weather.ts
+++ b/src/locales/zh_TW/weather.ts
@@ -43,24 +43,3 @@ export const weather: SimpleTranslationEntries = {
"strongWindsEffectMessage": "The mysterious air current weakened the attack!",
"strongWindsClearMessage": "神秘的亂流停止了。"
};
-
-export const terrain: SimpleTranslationEntries = {
- "misty": "薄霧",
- "mistyStartMessage": "腳下霧氣繚繞！",
- "mistyClearMessage": "腳下的霧氣消失不見了！",
- "mistyBlockMessage": "{{pokemonNameWithAffix}}正受到薄霧場地的保護！",
-
- "electric": "電氣",
- "electricStartMessage": "腳下電流飛閃！",
- "electricClearMessage": "腳下的電流消失了！",
-
- "grassy": "青草",
- "grassyStartMessage": "腳下青草如茵！",
- "grassyClearMessage": "腳下的青草消失不見了！",
-
- "psychic": "精神",
- "psychicStartMessage": "腳下傳來了奇妙的感覺！",
- "psychicClearMessage": "腳下的奇妙感覺消失了！",
-
- "defaultBlockMessage": "{{pokemonNameWithAffix}}正受到{{terrainName}}的保護！"
-};
diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts
index 10acd57779cb..d8ec0072bd4c 100644
--- a/src/modifier/modifier-type.ts
+++ b/src/modifier/modifier-type.ts
@@ -1,5 +1,5 @@
import * as Modifiers from "./modifier";
-import { AttackMove, allMoves, selfStatLowerMoves } from "../data/move";
+import { AttackMove, allMoves } from "../data/move";
import { MAX_PER_TYPE_POKEBALLS, PokeballType, getPokeballCatchMultiplier, getPokeballName } from "../data/pokeball";
import Pokemon, { EnemyPokemon, PlayerPokemon, PokemonMove } from "../field/pokemon";
import { EvolutionItem, pokemonEvolutions } from "../data/pokemon-evolutions";
@@ -143,7 +143,7 @@ export interface GeneratedPersistentModifierType {
getPregenArgs(): any[];
}
-export class AddPokeballModifierType extends ModifierType {
+class AddPokeballModifierType extends ModifierType {
private pokeballType: PokeballType;
private count: integer;
@@ -1188,7 +1188,6 @@ export const modifierTypes = {
SACRED_ASH: () => new AllPokemonFullReviveModifierType("modifierType:ModifierType.SACRED_ASH", "sacred_ash"),
REVIVER_SEED: () => new PokemonHeldItemModifierType("modifierType:ModifierType.REVIVER_SEED", "reviver_seed", (type, args) => new Modifiers.PokemonInstantReviveModifier(type, (args[0] as Pokemon).id)),
- WHITE_HERB: () => new PokemonHeldItemModifierType("modifierType:ModifierType.WHITE_HERB", "white_herb", (type, args) => new Modifiers.PokemonResetNegativeStatStageModifier(type, (args[0] as Pokemon).id)),
ETHER: () => new PokemonPpRestoreModifierType("modifierType:ModifierType.ETHER", "ether", 10),
MAX_ETHER: () => new PokemonPpRestoreModifierType("modifierType:ModifierType.MAX_ETHER", "max_ether", -1),
@@ -1491,14 +1490,6 @@ const modifierPool: ModifierPool = {
// 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 => 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];
- const weightMultiplier = party.filter(
- p => !p.getHeldItems().some(i => i instanceof Modifiers.PokemonResetNegativeStatStageModifier && i.stackCount >= i.getMaxHeldItemCount(p)) &&
- (checkedAbilities.some(a => p.hasAbility(a, false, true)) || p.getMoveset(true).some(m => selfStatLowerMoves.includes(m.moveId)))).length;
- // If a party member has one of the above moves or abilities and doesn't have max herbs, the herb will appear more frequently
- return 3*(weightMultiplier? 2: 1)+(weightMultiplier? weightMultiplier-1: 0);
- }, 10),
new WeightedModifierType(modifierTypes.REVIVER_SEED, 4),
new WeightedModifierType(modifierTypes.CANDY_JAR, 5),
new WeightedModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, 9),
@@ -1564,7 +1555,6 @@ const wildModifierPool: ModifierPool = {
}),
[ModifierTier.ULTRA]: [
new WeightedModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, 10),
- new WeightedModifierType(modifierTypes.WHITE_HERB, 2)
].map(m => {
m.setTier(ModifierTier.ULTRA); return m;
}),
@@ -1593,8 +1583,7 @@ const trainerModifierPool: ModifierPool = {
m.setTier(ModifierTier.GREAT); return m;
}),
[ModifierTier.ULTRA]: [
- new WeightedModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, 5),
- new WeightedModifierType(modifierTypes.WHITE_HERB, 1),
+ new WeightedModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, 1),
].map(m => {
m.setTier(ModifierTier.ULTRA); return m;
}),
@@ -1812,74 +1801,21 @@ export function regenerateModifierPoolThresholds(party: Pokemon[], poolType: Mod
}
}
-export interface CustomModifierSettings {
- guaranteedModifierTiers?: ModifierTier[];
- guaranteedModifierTypeOptions?: ModifierTypeOption[];
- guaranteedModifierTypeFuncs?: ModifierTypeFunc[];
- fillRemaining?: boolean;
- rerollMultiplier?: number;
-}
-
export function getModifierTypeFuncById(id: string): ModifierTypeFunc {
return modifierTypes[id];
}
-export function getPlayerModifierTypeOptions(count: integer, party: PlayerPokemon[], modifierTiers?: ModifierTier[], customModifierSettings?: CustomModifierSettings): ModifierTypeOption[] {
+export function getPlayerModifierTypeOptions(count: integer, party: PlayerPokemon[], modifierTiers?: ModifierTier[]): ModifierTypeOption[] {
const options: ModifierTypeOption[] = [];
const retryCount = Math.min(count * 5, 50);
- if (!customModifierSettings) {
- new Array(count).fill(0).map((_, i) => {
- options.push(getModifierTypeOptionWithRetry(options, retryCount, party, modifierTiers?.length > i ? modifierTiers[i] : undefined));
- });
- } else {
- // Guaranteed mods first
- if (customModifierSettings?.guaranteedModifierTypeOptions?.length) {
- customModifierSettings?.guaranteedModifierTypeOptions.forEach((option) => {
- options.push(option);
- });
- }
-
- // Guaranteed mod funcs second
- if (customModifierSettings?.guaranteedModifierTypeFuncs?.length) {
- customModifierSettings?.guaranteedModifierTypeFuncs.forEach((mod, i) => {
- const modifierId = Object.keys(modifierTypes).find(k => modifierTypes[k] === mod);
- let guaranteedMod: ModifierType = modifierTypes[modifierId]?.();
-
- // Gets tier of item by checking player item pool
- Object.keys(modifierPool).every(modifierTier => {
- const modType = modifierPool[modifierTier].find(m => {
- if (m.modifierType.id === modifierId) {
- return m;
- }
- });
- if (modType) {
- guaranteedMod = modType.modifierType;
- return false;
- }
- return true;
- });
-
- const modType = guaranteedMod instanceof ModifierTypeGenerator ? guaranteedMod.generateType(party) : guaranteedMod;
- const option = new ModifierTypeOption(modType, 0);
- options.push(option);
- });
+ new Array(count).fill(0).map((_, i) => {
+ let candidate = getNewModifierTypeOption(party, ModifierPoolType.PLAYER, modifierTiers?.length > i ? modifierTiers[i] : undefined);
+ let r = 0;
+ while (options.length && ++r < retryCount && options.filter(o => o.type.name === candidate.type.name || o.type.group === candidate.type.group).length) {
+ candidate = getNewModifierTypeOption(party, ModifierPoolType.PLAYER, candidate.type.tier, candidate.upgradeCount);
}
-
- // Guaranteed tiers third
- if (customModifierSettings?.guaranteedModifierTiers?.length) {
- customModifierSettings?.guaranteedModifierTiers.forEach((tier) => {
- options.push(getModifierTypeOptionWithRetry(options, retryCount, party, tier));
- });
- }
-
- // Fill remaining
- if (options.length < count && customModifierSettings.fillRemaining) {
- while (options.length < count) {
- options.push(getModifierTypeOptionWithRetry(options, retryCount, party, undefined));
- }
- }
- }
-
+ options.push(candidate);
+ });
// OVERRIDE IF NECESSARY
if (Overrides.ITEM_REWARD_OVERRIDE?.length) {
options.forEach((mod, i) => {
@@ -1891,15 +1827,6 @@ export function getPlayerModifierTypeOptions(count: integer, party: PlayerPokemo
return options;
}
-function getModifierTypeOptionWithRetry(existingOptions: ModifierTypeOption[], retryCount: integer, party: PlayerPokemon[], tier?: ModifierTier): ModifierTypeOption {
- let candidate = getNewModifierTypeOption(party, ModifierPoolType.PLAYER, tier);
- let r = 0;
- while (existingOptions.length && ++r < retryCount && existingOptions.filter(o => o.type.name === candidate.type.name || o.type.group === candidate.type.group).length) {
- candidate = getNewModifierTypeOption(party, ModifierPoolType.PLAYER, candidate.type.tier, candidate.upgradeCount);
- }
- return candidate;
-}
-
export function getPlayerShopModifierTypeOptionsForWave(waveIndex: integer, baseCost: integer): ModifierTypeOption[] {
if (!(waveIndex % 10)) {
return [];
diff --git a/src/modifier/modifier.ts b/src/modifier/modifier.ts
index c3c62be746f0..0b339906cc54 100644
--- a/src/modifier/modifier.ts
+++ b/src/modifier/modifier.ts
@@ -1307,47 +1307,6 @@ export class PokemonInstantReviveModifier extends PokemonHeldItemModifier {
}
}
-/**
- * Modifier used for White Herb, which resets negative {@linkcode Stat} changes
- * @extends PokemonHeldItemModifier
- * @see {@linkcode apply}
- */
-export class PokemonResetNegativeStatStageModifier extends PokemonHeldItemModifier {
- constructor(type: ModifierType, pokemonId: integer, stackCount?: integer) {
- super(type, pokemonId, stackCount);
- }
-
- matchType(modifier: Modifier) {
- return modifier instanceof PokemonResetNegativeStatStageModifier;
- }
-
- clone() {
- return new PokemonResetNegativeStatStageModifier(this.type, this.pokemonId, this.stackCount);
- }
-
- /**
- * Restores any negative stat stages of the mon to 0
- * @param args args[0] is the {@linkcode Pokemon} whose stat stages are being checked
- * @returns true if any stat changes were applied (item was used), false otherwise
- */
- apply(args: any[]): boolean {
- const pokemon = args[0] as Pokemon;
- const loweredStats = pokemon.summonData.battleStats.filter(s => s < 0);
- if (loweredStats.length) {
- for (let s = 0; s < pokemon.summonData.battleStats.length; s++) {
- pokemon.summonData.battleStats[s] = Math.max(0, pokemon.summonData.battleStats[s]);
- }
- pokemon.scene.queueMessage(getPokemonMessage(pokemon, `'s lowered stats were'\nrestored by its ${this.type.name}!`));
- return true;
- }
- return false;
- }
-
- getMaxHeldItemCount(pokemon: Pokemon): integer {
- return 2;
- }
-}
-
export abstract class ConsumablePokemonModifier extends ConsumableModifier {
public pokemonId: integer;
diff --git a/src/overrides.ts b/src/overrides.ts
index 710c94572b13..3e8949678935 100644
--- a/src/overrides.ts
+++ b/src/overrides.ts
@@ -1,24 +1,23 @@
-import {WeatherType} from "./data/weather";
-import {Variant} from "./data/variant";
-import {TempBattleStat} from "./data/temp-battle-stat";
-import {Nature} from "./data/nature";
-import {Type} from "./data/type";
-import {Stat} from "./data/pokemon-stat";
-import {PokeballCounts} from "./battle-scene";
-import {PokeballType} from "./data/pokeball";
-import {Gender} from "./data/gender";
-import {StatusEffect} from "./data/status-effect";
-import {modifierTypes, SpeciesStatBoosterItem} from "./modifier/modifier-type";
-import {VariantTier} from "./enums/variant-tiers";
-import {EggTier} from "#enums/egg-type";
-import {Abilities} from "#enums/abilities";
-import {BerryType} from "#enums/berry-type";
-import {Biome} from "#enums/biome";
-import {Moves} from "#enums/moves";
-import {Species} from "#enums/species";
-import {TimeOfDay} from "#enums/time-of-day";
-import {MysteryEncounterType} from "#enums/mystery-encounter-type"; // eslint-disable-line @typescript-eslint/no-unused-vars
-import {MysteryEncounterTier} from "#app/data/mystery-encounter"; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { WeatherType } from "./data/weather";
+import { Variant } from "./data/variant";
+import { TempBattleStat } from "./data/temp-battle-stat";
+import { Nature } from "./data/nature";
+import { Type } from "./data/type";
+import { Stat } from "./data/pokemon-stat";
+import { PokeballCounts } from "./battle-scene";
+import { PokeballType } from "./data/pokeball";
+import { Gender } from "./data/gender";
+import { StatusEffect } from "./data/status-effect";
+import { SpeciesStatBoosterItem, modifierTypes } from "./modifier/modifier-type";
+import { VariantTier } from "./enums/variant-tiers";
+import { EggTier } from "#enums/egg-type";
+import { allSpecies } from "./data/pokemon-species"; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { Abilities } from "#enums/abilities";
+import { BerryType } from "#enums/berry-type";
+import { Biome } from "#enums/biome";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { TimeOfDay } from "#enums/time-of-day";
/**
* Overrides for testing different in game situations
@@ -112,15 +111,6 @@ export const EGG_VARIANT_OVERRIDE: VariantTier = null;
export const EGG_FREE_GACHA_PULLS_OVERRIDE: boolean = false;
export const EGG_GACHA_PULL_COUNT_OVERRIDE: number = 0;
-/**
- * MYSTERY ENCOUNTER OVERRIDES
- */
-
-// 1 to 256, set to null to ignore
-export const MYSTERY_ENCOUNTER_RATE_OVERRIDE: number = null;
-export const MYSTERY_ENCOUNTER_TIER_OVERRIDE: MysteryEncounterTier = null;
-export const MYSTERY_ENCOUNTER_OVERRIDE: MysteryEncounterType = null;
-
/**
* MODIFIER / ITEM OVERRIDES
* if count is not provided, it will default to 1
diff --git a/src/phases.ts b/src/phases.ts
index 4b54fc8d289a..40084520c9c1 100644
--- a/src/phases.ts
+++ b/src/phases.ts
@@ -1,11 +1,11 @@
import BattleScene, { bypassLogin } from "./battle-scene";
import { default as Pokemon, PlayerPokemon, EnemyPokemon, PokemonMove, MoveResult, DamageResult, FieldPosition, HitResult, TurnMove } from "./field/pokemon";
import * as Utils from "./utils";
-import { allMoves, applyMoveAttrs, BypassSleepAttr, ChargeAttr, applyFilteredMoveAttrs, HitsTagAttr, MissEffectAttr, MoveAttr, MoveEffectAttr, MoveFlags, MultiHitAttr, OverrideMoveEffectAttr, VariableAccuracyAttr, MoveTarget, getMoveTargets, MoveTargetSet, MoveEffectTrigger, CopyMoveAttr, AttackMove, SelfStatusMove, PreMoveMessageAttr, HealStatusEffectAttr, IgnoreOpponentStatChangesAttr, NoEffectAttr, BypassRedirectAttr, FixedDamageAttr, PostVictoryStatChangeAttr, OneHitKOAccuracyAttr, ForceSwitchOutAttr, VariableTargetAttr, IncrementMovePriorityAttr, MoveHeaderAttr } from "./data/move";
+import { allMoves, applyMoveAttrs, BypassSleepAttr, ChargeAttr, applyFilteredMoveAttrs, HitsTagAttr, MissEffectAttr, MoveAttr, MoveEffectAttr, MoveFlags, MultiHitAttr, OverrideMoveEffectAttr, VariableAccuracyAttr, MoveTarget, getMoveTargets, MoveTargetSet, MoveEffectTrigger, CopyMoveAttr, AttackMove, SelfStatusMove, PreMoveMessageAttr, HealStatusEffectAttr, IgnoreOpponentStatChangesAttr, NoEffectAttr, BypassRedirectAttr, FixedDamageAttr, PostVictoryStatChangeAttr, OneHitKOAccuracyAttr, ForceSwitchOutAttr, VariableTargetAttr, IncrementMovePriorityAttr } from "./data/move";
import { Mode } from "./ui/ui";
import { Command } from "./ui/command-ui-handler";
import { Stat } from "./data/pokemon-stat";
-import { BerryModifier, ContactHeldItemTransferChanceModifier, EnemyAttackStatusEffectChanceModifier, EnemyPersistentModifier, EnemyStatusEffectHealChanceModifier, EnemyTurnHealModifier, ExpBalanceModifier, ExpBoosterModifier, ExpShareModifier, FlinchChanceModifier, HealingBoosterModifier, HitHealModifier, LapsingPersistentModifier, MapModifier, Modifier, MultipleParticipantExpBonusModifier, PersistentModifier, PokemonExpBoosterModifier, PokemonHeldItemModifier, PokemonInstantReviveModifier, SwitchEffectTransferModifier, TempBattleStatBoosterModifier, TurnHealModifier, TurnHeldItemTransferModifier, MoneyMultiplierModifier, MoneyInterestModifier, IvScannerModifier, LapsingPokemonHeldItemModifier, PokemonMultiHitModifier, PokemonMoveAccuracyBoosterModifier, overrideModifiers, overrideHeldItems, BypassSpeedChanceModifier, TurnStatusEffectModifier, PokemonResetNegativeStatStageModifier } from "./modifier/modifier";
+import { BerryModifier, ContactHeldItemTransferChanceModifier, EnemyAttackStatusEffectChanceModifier, EnemyPersistentModifier, EnemyStatusEffectHealChanceModifier, EnemyTurnHealModifier, ExpBalanceModifier, ExpBoosterModifier, ExpShareModifier, ExtraModifierModifier, FlinchChanceModifier, HealingBoosterModifier, HitHealModifier, LapsingPersistentModifier, MapModifier, Modifier, MultipleParticipantExpBonusModifier, PersistentModifier, PokemonExpBoosterModifier, PokemonHeldItemModifier, PokemonInstantReviveModifier, SwitchEffectTransferModifier, TempBattleStatBoosterModifier, TurnHealModifier, TurnHeldItemTransferModifier, MoneyMultiplierModifier, MoneyInterestModifier, IvScannerModifier, LapsingPokemonHeldItemModifier, PokemonMultiHitModifier, PokemonMoveAccuracyBoosterModifier, overrideModifiers, overrideHeldItems, BypassSpeedChanceModifier, TurnStatusEffectModifier } from "./modifier/modifier";
import PartyUiHandler, { PartyOption, PartyUiMode } from "./ui/party-ui-handler";
import { doPokeballBounceAnim, getPokeballAtlasKey, getPokeballCatchMultiplier, getPokeballTintColor, PokeballType } from "./data/pokeball";
import { CommonAnim, CommonBattleAnim, MoveAnim, initMoveAnim, loadMoveAnimAssets } from "./data/battle-anims";
@@ -17,9 +17,9 @@ import { Phase } from "./phase";
import { BattleStat, getBattleStatLevelChangeDescription, getBattleStatName } from "./data/battle-stat";
import { biomeLinks, getBiomeName } from "./data/biomes";
import { ModifierTier } from "./modifier/modifier-tier";
-import { ModifierPoolType, ModifierType, ModifierTypeFunc, getDailyRunStarterModifiers, getEnemyBuffModifierForWave, getModifierType, modifierTypes, regenerateModifierPoolThresholds } from "./modifier/modifier-type";
+import { FusePokemonModifierType, ModifierPoolType, ModifierType, ModifierTypeFunc, ModifierTypeOption, PokemonModifierType, PokemonMoveModifierType, PokemonPpRestoreModifierType, PokemonPpUpModifierType, RememberMoveModifierType, TmModifierType, getDailyRunStarterModifiers, getEnemyBuffModifierForWave, getModifierType, getPlayerModifierTypeOptions, getPlayerShopModifierTypeOptionsForWave, modifierTypes, regenerateModifierPoolThresholds } from "./modifier/modifier-type";
import SoundFade from "phaser3-rex-plugins/plugins/soundfade";
-import { BattlerTagLapseType, CenterOfAttentionTag, EncoreTag, ProtectedTag, SemiInvulnerableTag, TrappedTag, MysteryEncounterPostSummonTag } from "./data/battler-tags";
+import { BattlerTagLapseType, CenterOfAttentionTag, EncoreTag, ProtectedTag, SemiInvulnerableTag, TrappedTag } from "./data/battler-tags";
import { getPokemonMessage, getPokemonNameWithAffix } from "./messages";
import { Starter } from "./ui/starter-select-ui-handler";
import { Gender } from "./data/gender";
@@ -40,6 +40,7 @@ import { SessionSaveData } from "./system/game-data";
import { addPokeballCaptureStars, addPokeballOpenParticles } from "./field/anims";
import { SpeciesFormChangeActiveTrigger, SpeciesFormChangeManualTrigger, SpeciesFormChangeMoveLearnedTrigger, SpeciesFormChangePostMoveTrigger, SpeciesFormChangePreMoveTrigger } from "./data/pokemon-forms";
import { battleSpecDialogue, getCharVariantFromDialogue, miscDialogue } from "./data/dialogue";
+import ModifierSelectUiHandler, { SHOP_OPTIONS_ROW_LIMIT } from "./ui/modifier-select-ui-handler";
import { SettingKeys } from "./system/settings/settings";
import { Tutorial, handleTutorial } from "./tutorial";
import { TerrainType } from "./data/terrain";
@@ -50,7 +51,7 @@ import { GameMode, GameModes, getGameMode } from "./game-mode";
import PokemonSpecies, { getPokemonSpecies, speciesStarters } from "./data/pokemon-species";
import i18next from "./plugins/i18n";
import * as Overrides from "./overrides";
-import { TextStyle, addTextObject, getTextColor } from "./ui/text";
+import { TextStyle, addTextObject } from "./ui/text";
import { Type } from "./data/type";
import { BerryUsedEvent, EncounterPhaseEvent, MoveUsedEvent, TurnEndEvent, TurnInitEvent } from "./events/battle-scene";
import { Abilities } from "#enums/abilities";
@@ -64,11 +65,6 @@ import { Moves } from "#enums/moves";
import { PlayerGender } from "#enums/player-gender";
import { Species } from "#enums/species";
import { TrainerType } from "#enums/trainer-type";
-import {BattlePhase} from "#app/phases/battle-phase";
-import {MysteryEncounterVariant} from "#app/data/mystery-encounter";
-import {MysteryEncounterPhase} from "#app/phases/mystery-encounter-phase";
-import {handleMysteryEncounterVictory} from "#app/data/mystery-encounters/mystery-encounter-utils";
-import {SelectModifierPhase} from "#app/phases/select-modifier-phase";
const { t } = i18next;
@@ -640,6 +636,50 @@ export class SelectStarterPhase extends Phase {
}
}
+export class BattlePhase extends Phase {
+ constructor(scene: BattleScene) {
+ super(scene);
+ }
+
+ showEnemyTrainer(trainerSlot: TrainerSlot = TrainerSlot.NONE): void {
+ const sprites = this.scene.currentBattle.trainer.getSprites();
+ const tintSprites = this.scene.currentBattle.trainer.getTintSprites();
+ for (let i = 0; i < sprites.length; i++) {
+ const visible = !trainerSlot || !i === (trainerSlot === TrainerSlot.TRAINER) || sprites.length < 2;
+ [sprites[i], tintSprites[i]].map(sprite => {
+ if (visible) {
+ sprite.x = trainerSlot || sprites.length < 2 ? 0 : i ? 16 : -16;
+ }
+ sprite.setVisible(visible);
+ sprite.clearTint();
+ });
+ sprites[i].setVisible(visible);
+ tintSprites[i].setVisible(visible);
+ sprites[i].clearTint();
+ tintSprites[i].clearTint();
+ }
+ this.scene.tweens.add({
+ targets: this.scene.currentBattle.trainer,
+ x: "-=16",
+ y: "+=16",
+ alpha: 1,
+ ease: "Sine.easeInOut",
+ duration: 750
+ });
+ }
+
+ hideEnemyTrainer(): void {
+ this.scene.tweens.add({
+ targets: this.scene.currentBattle.trainer,
+ x: "+=16",
+ y: "-=16",
+ alpha: 0,
+ ease: "Sine.easeInOut",
+ duration: 750
+ });
+ }
+}
+
type PokemonFunc = (pokemon: Pokemon) => void;
export abstract class FieldPhase extends BattlePhase {
@@ -774,24 +814,6 @@ export class EncounterPhase extends BattlePhase {
const battle = this.scene.currentBattle;
- // Init Mystery Encounter if there is one
- const mysteryEncounter = battle.mysteryEncounter;
- if (mysteryEncounter) {
- // If ME has an onInit() function, call it
- // Usually used for calculating rand data before initializing anything visual
- // Also prepopulates any dialogue tokens from encounter/option requirements
- this.scene.executeWithSeedOffset(() => {
- if (mysteryEncounter.onInit) {
- mysteryEncounter.onInit(this.scene);
- }
- mysteryEncounter.populateDialogueTokensFromRequirements();
- }, this.scene.currentBattle.waveIndex);
-
- // Add intro visuals for mystery encounter
- mysteryEncounter.initIntroVisuals(this.scene);
- this.scene.field.add(mysteryEncounter.introVisuals);
- }
-
let totalBst = 0;
battle.enemyLevels.forEach((level, e) => {
@@ -816,7 +838,7 @@ export class EncounterPhase extends BattlePhase {
}
if (!this.loaded) {
- this.scene.gameData.setPokemonSeen(enemyPokemon, true, battle.battleType === BattleType.TRAINER || battle?.mysteryEncounter?.encounterVariant === MysteryEncounterVariant.TRAINER_BATTLE);
+ this.scene.gameData.setPokemonSeen(enemyPokemon, true, battle.battleType === BattleType.TRAINER);
}
if (enemyPokemon.species.speciesId === Species.ETERNATUS) {
@@ -845,12 +867,6 @@ export class EncounterPhase extends BattlePhase {
if (battle.battleType === BattleType.TRAINER) {
loadEnemyAssets.push(battle.trainer.loadAssets().then(() => battle.trainer.initSprite()));
- } else if (battle.battleType === BattleType.MYSTERY_ENCOUNTER) {
- if (!battle.mysteryEncounter) {
- const newEncounter = this.scene.getMysteryEncounter(mysteryEncounter);
- battle.mysteryEncounter = newEncounter;
- }
- loadEnemyAssets.push(battle.mysteryEncounter.introVisuals.loadAssets().then(() => battle.mysteryEncounter.introVisuals.initSprite()));
} else {
// This block only applies for double battles to init the boss segments (idk why it's split up like this)
if (battle.enemyParty.filter(p => p.isBoss()).length > 1) {
@@ -878,9 +894,6 @@ export class EncounterPhase extends BattlePhase {
} else if (battle.battleType === BattleType.TRAINER) {
enemyPokemon.setVisible(false);
this.scene.currentBattle.trainer.tint(0, 0.5);
- } else if (battle.battleType === BattleType.MYSTERY_ENCOUNTER) {
- enemyPokemon.setVisible(false);
- this.scene.currentBattle?.trainer?.tint(0, 0.5);
}
if (battle.double) {
enemyPokemon.setFieldPosition(e ? FieldPosition.RIGHT : FieldPosition.LEFT);
@@ -932,8 +945,8 @@ export class EncounterPhase extends BattlePhase {
const enemyField = this.scene.getEnemyField();
this.scene.tweens.add({
- targets: [this.scene.arenaEnemy, this.scene.currentBattle.trainer, enemyField, this.scene.currentBattle?.mysteryEncounter?.introVisuals, this.scene.arenaPlayer, this.scene.trainer].flat(),
- x: (_target, _key, value, fieldIndex: integer) => fieldIndex < 3 + (enemyField.length) ? value + 300 : value - 300,
+ targets: [this.scene.arenaEnemy, this.scene.currentBattle.trainer, enemyField, this.scene.arenaPlayer, this.scene.trainer].flat(),
+ x: (_target, _key, value, fieldIndex: integer) => fieldIndex < 2 + (enemyField.length) ? value + 300 : value - 300,
duration: 2000,
onComplete: () => {
if (!this.tryOverrideForBattleSpec()) {
@@ -1027,54 +1040,6 @@ export class EncounterPhase extends BattlePhase {
showDialogueAndSummon();
}
}
- } else if (this.scene.currentBattle.battleType === BattleType.MYSTERY_ENCOUNTER) {
- const introVisuals = this.scene.currentBattle.mysteryEncounter.introVisuals;
- introVisuals.playAnim();
-
- const doEncounter = () => {
- this.scene.playBgm(undefined);
-
- const doShowEncounterOptions = () => {
- this.scene.ui.clearText();
- this.scene.ui.getMessageHandler().hideNameText();
- this.scene.unshiftPhase(new MysteryEncounterPhase(this.scene));
-
- this.end();
- };
-
- if (showEncounterMessage) {
- const introDialogue = this.scene.currentBattle.mysteryEncounter.dialogue.intro;
- let i = 0;
- const showNextDialogue = () => {
- const nextAction = i === introDialogue.length - 1 ? doShowEncounterOptions : showNextDialogue;
- const dialogue = introDialogue[i];
- const title = dialogue.speaker;
- const text = dialogue.text;
- if (title) {
- this.scene.ui.showDialogue(i18next.t(text), i18next.t(title), null, nextAction, 0, i === 0 ? 750 : 0);
- } else {
- this.scene.ui.showText(i18next.t(text), null, nextAction, i === 0 ? 750 : 0, true);
- }
- i++;
- };
-
- if (introDialogue.length > 0) {
- showNextDialogue();
- }
- } else {
- doShowEncounterOptions();
- }
- };
-
- const encounterMessage = i18next.t("battle:mysteryEncounterAppeared");
-
- if (!encounterMessage) {
- doEncounter();
- } else {
- this.scene.ui.showDialogue(encounterMessage, "???", null, () => {
- this.scene.charSprite.hide().then(() => this.scene.hideFieldOverlay(250).then(() => doEncounter()));
- });
- }
}
}
@@ -1087,7 +1052,7 @@ export class EncounterPhase extends BattlePhase {
}
});
- if (this.scene.currentBattle.battleType !== BattleType.TRAINER && this.scene.currentBattle.battleType !== BattleType.MYSTERY_ENCOUNTER) {
+ if (this.scene.currentBattle.battleType !== BattleType.TRAINER) {
enemyField.map(p => this.scene.pushConditionalPhase(new PostSummonPhase(this.scene, p.getBattlerIndex()), () => {
// if there is not a player party, we can't continue
if (!this.scene.getParty()?.length) {
@@ -1181,17 +1146,8 @@ export class NextEncounterPhase extends EncounterPhase {
this.scene.arenaNextEnemy.setVisible(true);
const enemyField = this.scene.getEnemyField();
- const moveTargets: any[] = [this.scene.arenaEnemy, this.scene.arenaNextEnemy, this.scene.currentBattle.trainer, enemyField, this.scene.lastEnemyTrainer];
- const lastEncounterVisuals = this.scene?.lastMysteryEncounter?.introVisuals;
- if (lastEncounterVisuals) {
- moveTargets.push(lastEncounterVisuals);
- }
- const nextEncounterVisuals = this.scene.currentBattle?.mysteryEncounter?.introVisuals;
- if (nextEncounterVisuals) {
- moveTargets.push(nextEncounterVisuals);
- }
this.scene.tweens.add({
- targets: moveTargets.flat(),
+ targets: [this.scene.arenaEnemy, this.scene.arenaNextEnemy, this.scene.currentBattle.trainer, enemyField, this.scene.lastEnemyTrainer].flat(),
x: "+=300",
duration: 2000,
onComplete: () => {
@@ -1203,11 +1159,6 @@ export class NextEncounterPhase extends EncounterPhase {
if (this.scene.lastEnemyTrainer) {
this.scene.lastEnemyTrainer.destroy();
}
- if (lastEncounterVisuals) {
- this.scene.field.remove(lastEncounterVisuals);
- lastEncounterVisuals.destroy();
- this.scene.lastMysteryEncounter.introVisuals = null;
- }
if (!this.tryOverrideForBattleSpec()) {
this.doEncounterCommon();
@@ -1238,14 +1189,8 @@ export class NewBiomeEncounterPhase extends NextEncounterPhase {
}
const enemyField = this.scene.getEnemyField();
- const moveTargets: any[] = [this.scene.arenaEnemy, enemyField];
- const mysteryEncounter = this.scene.currentBattle?.mysteryEncounter?.introVisuals;
- if (mysteryEncounter) {
- moveTargets.push(mysteryEncounter);
- }
-
this.scene.tweens.add({
- targets: moveTargets.flat(),
+ targets: [this.scene.arenaEnemy, enemyField].flat(),
x: "+=300",
duration: 2000,
onComplete: () => {
@@ -1271,12 +1216,6 @@ export class PostSummonPhase extends PokemonPhase {
pokemon.status.turnCount = 0;
}
this.scene.arena.applyTags(ArenaTrapTag, pokemon);
-
- // If this is fight or flight mystery encounter and is enemy pokemon summon phase, add enraged tag
- if (pokemon.findTags(t => t instanceof MysteryEncounterPostSummonTag)) {
- pokemon.lapseTag(BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON);
- }
-
applyPostSummonAbAttrs(PostSummonAbAttr, pokemon).then(() => this.end());
}
}
@@ -1437,7 +1376,7 @@ export class SummonPhase extends PartyMemberPokemonPhase {
preSummon(): void {
const partyMember = this.getPokemon();
// If the Pokemon about to be sent out is fainted or illegal under a challenge, switch to the first non-fainted legal Pokemon
- if (!partyMember.isAllowedInBattle() || (this.player && !this.getParty().some(p => p.id === partyMember.id))) {
+ if (!partyMember.isAllowedInBattle()) {
console.warn("The Pokemon about to be sent out is fainted or illegal under a challenge. Attempting to resolve...");
// First check if they're somehow still in play, if so remove them.
@@ -1485,16 +1424,13 @@ export class SummonPhase extends PartyMemberPokemonPhase {
onComplete: () => this.scene.trainer.setVisible(false)
});
this.scene.time.delayedCall(750, () => this.summon());
- } else if (this.scene.currentBattle.battleType === BattleType.TRAINER || this.scene?.currentBattle?.mysteryEncounter?.encounterVariant === MysteryEncounterVariant.TRAINER_BATTLE) {
+ } else {
const trainerName = this.scene.currentBattle.trainer.getName(!(this.fieldIndex % 2) ? TrainerSlot.TRAINER : TrainerSlot.TRAINER_PARTNER);
const pokemonName = this.getPokemon().name;
const message = i18next.t("battle:trainerSendOut", { trainerName, pokemonName });
this.scene.pbTrayEnemy.hide();
this.scene.ui.showText(message, null, () => this.summon());
- } else if (this.scene.currentBattle.battleType === BattleType.MYSTERY_ENCOUNTER) {
- this.scene.pbTrayEnemy.hide();
- this.summonWild();
}
}
@@ -1576,57 +1512,6 @@ export class SummonPhase extends PartyMemberPokemonPhase {
});
}
- summonWild(): void {
- const pokemon = this.getPokemon();
-
- if (this.fieldIndex === 1) {
- pokemon.setFieldPosition(FieldPosition.RIGHT, 0);
- } else {
- const availablePartyMembers = this.getParty().filter(p => !p.isFainted()).length;
- pokemon.setFieldPosition(!this.scene.currentBattle.double || availablePartyMembers === 1 ? FieldPosition.CENTER : FieldPosition.LEFT);
- }
-
- this.scene.add.existing(pokemon);
- this.scene.field.add(pokemon);
- if (!this.player) {
- const playerPokemon = this.scene.getPlayerPokemon() as Pokemon;
- if (playerPokemon?.visible) {
- this.scene.field.moveBelow(pokemon, playerPokemon);
- }
- this.scene.currentBattle.seenEnemyPartyMemberIds.add(pokemon.id);
- }
- this.scene.updateModifiers(this.player);
- this.scene.updateFieldScale();
- pokemon.showInfo();
- pokemon.playAnim();
- pokemon.setVisible(true);
- pokemon.getSprite().setVisible(true);
- pokemon.setScale(0.75);
- pokemon.tint(getPokeballTintColor(pokemon.pokeball));
- pokemon.untint(250, "Sine.easeIn");
- this.scene.updateFieldScale();
- pokemon.x += 16;
- pokemon.y -= 16;
- pokemon.alpha = 0;
-
- // Ease pokemon in
- this.scene.tweens.add({
- targets: pokemon,
- x: "-=16",
- y: "+=16",
- alpha: 1,
- duration: 1000,
- ease: "Sine.easeIn",
- scale: pokemon.getSpriteScale(),
- onComplete: () => {
- pokemon.cry(pokemon.getHpRatio() > 0.25 ? undefined : { rate: 0.85 });
- pokemon.getSprite().clearTint();
- pokemon.resetSummonData();
- this.scene.time.delayedCall(1000, () => this.end());
- }
- });
- }
-
onEnd(): void {
const pokemon = this.getPokemon();
@@ -1636,7 +1521,7 @@ export class SummonPhase extends PartyMemberPokemonPhase {
pokemon.resetTurnData();
- if (!this.loaded || this.scene.currentBattle.battleType === BattleType.TRAINER || this.scene.currentBattle.battleType === BattleType.MYSTERY_ENCOUNTER || (this.scene.currentBattle.waveIndex % 10) === 1) {
+ if (!this.loaded || this.scene.currentBattle.battleType === BattleType.TRAINER || (this.scene.currentBattle.waveIndex % 10) === 1) {
this.scene.triggerPokemonFormChange(pokemon, SpeciesFormChangeActiveTrigger, true);
this.queuePostSummon();
}
@@ -1698,10 +1583,6 @@ export class SwitchSummonPhase extends SummonPhase {
(this.player ? this.scene.getEnemyField() : this.scene.getPlayerField()).forEach(enemyPokemon => enemyPokemon.removeTagsBySourceId(pokemon.id));
}
- if (!pokemon.isActive() || !pokemon.isOnField()) {
- this.switchAndSummon();
- }
-
this.scene.ui.showText(this.player ?
i18next.t("battle:playerComeBack", { pokemonName: pokemon.name }) :
i18next.t("battle:trainerComeBack", {
@@ -2120,13 +2001,6 @@ export class CommandPhase extends FieldPhase {
this.scene.ui.showText(null, 0);
this.scene.ui.setMode(Mode.COMMAND, this.fieldIndex);
}, null, true);
- } else if (this.scene.currentBattle.battleType === BattleType.MYSTERY_ENCOUNTER && !this.scene.currentBattle.mysteryEncounter.catchAllowed) {
- this.scene.ui.setMode(Mode.COMMAND, this.fieldIndex);
- this.scene.ui.setMode(Mode.MESSAGE);
- this.scene.ui.showText(i18next.t("battle:noPokeballMysteryEncounter"), null, () => {
- this.scene.ui.showText(null, 0);
- this.scene.ui.setMode(Mode.COMMAND, this.fieldIndex);
- }, null, true);
} else {
const targets = this.scene.getEnemyField().filter(p => p.isActive(true)).map(p => p.getBattlerIndex());
if (targets.length > 1) {
@@ -2412,14 +2286,12 @@ export class TurnStartPhase extends FieldPhase {
return aIndex < bIndex ? -1 : aIndex > bIndex ? 1 : 0;
});
- this.queueMoveHeaders(moveOrder);
for (const o of moveOrder) {
const pokemon = field[o];
const turnCommand = this.scene.currentBattle.turnCommands[o];
if (turnCommand.skip) {
- this.scene.tryRemovePhase(phase => phase instanceof MoveHeaderPhase && phase.pokemon === pokemon);
continue;
}
@@ -2483,30 +2355,8 @@ export class TurnStartPhase extends FieldPhase {
this.scene.pushPhase(new BerryPhase(this.scene));
this.scene.pushPhase(new TurnEndPhase(this.scene));
- /**
- * this.end() will call shiftPhase(), which dumps everything from PrependQueue (aka everything that is unshifted()) to the front
- * of the queue and dequeues to start the next phase
- * this is important since stuff like SwitchSummon, AttemptRun, AttemptCapture Phases break the "flow" and should take precedence
- */
this.end();
}
-
- queueMoveHeaders(moveOrder: BattlerIndex[]): void {
- moveOrder.forEach(o => {
- const pokemon = this.scene.getField()[o];
- const turnCommand = this.scene.currentBattle.turnCommands[o];
-
- if (turnCommand.command === Command.FIGHT) {
- const queuedMove = turnCommand.move;
- if (!!queuedMove) {
- const move = pokemon.getMoveset().find(m => m.moveId === queuedMove.move) || new PokemonMove(queuedMove.move);
- if (move.getMove().hasAttr(MoveHeaderAttr)) {
- this.scene.pushPhase(new MoveHeaderPhase(this.scene, pokemon, move));
- }
- }
- }
- });
- }
}
/** The phase after attacks where the pokemon eat berries */
@@ -2691,96 +2541,6 @@ export class CommonAnimPhase extends PokemonPhase {
}
}
-export class MoveHeaderPhase extends BattlePhase {
- public pokemon: Pokemon;
- public move: PokemonMove;
-
- constructor(scene: BattleScene, pokemon: Pokemon, move: PokemonMove) {
- super(scene);
-
- this.pokemon = pokemon;
- this.move = move;
- }
-
- canMove(): boolean {
- return this.pokemon.isActive(true) && this.move.isUsable(this.pokemon, true);
- }
-
- start() {
- super.start();
-
- if (this.canMove()) {
- /**
- * Preemptively apply status effects (Paralysis, Sleep, and Freeze).
- * If this move would be cancelled by the user's status, it's cancelled
- * here before applying header effects.
- * If the user has one of these statuses, but the move isn't cancelled, the same status
- * check in this move's respective `MovePhase` is ignored.
- */
- if (this.pokemon.status && !this.pokemon.status.isPostTurn()) {
- this.pokemon.status.incrementTurn();
- let activated = false;
- let healed = false;
-
- switch (this.pokemon.status.effect) {
- case StatusEffect.PARALYSIS:
- if (!this.pokemon.randSeedInt(4)) {
- activated = true;
- }
- break;
- case StatusEffect.SLEEP:
- healed = this.pokemon.status.turnCount === this.pokemon.status.cureTurn;
- activated = !healed;
- break;
- case StatusEffect.FREEZE:
- healed = !!this.move.getMove().findAttr(attr => attr instanceof HealStatusEffectAttr && attr.selfTarget && attr.isOfEffect(StatusEffect.FREEZE)) || !this.pokemon.randSeedInt(5);
- activated = !healed;
- break;
- }
-
- if (activated) {
- this.scene.queueMessage(getStatusEffectActivationText(this.pokemon.status.effect, getPokemonNameWithAffix(this.pokemon)));
- this.scene.unshiftPhase(new CommonAnimPhase(this.scene, this.pokemon.getBattlerIndex(), undefined, CommonAnim.POISON + (this.pokemon.status.effect - 1)));
- this.cancelMove();
- this.end();
- } else {
- if (healed) {
- this.scene.queueMessage(getStatusEffectHealText(this.pokemon.status.effect, getPokemonNameWithAffix(this.pokemon)));
- this.pokemon.resetStatus();
- this.pokemon.updateInfo();
- }
- const movePhase = this.scene.findPhase(phase => phase instanceof MovePhase && phase.pokemon === this.pokemon);
- if (movePhase instanceof MovePhase) {
- movePhase.setIgnoreStatusCheck();
- }
- applyMoveAttrs(MoveHeaderAttr, this.pokemon, null, this.move.getMove()).then(() => this.end());
- }
- } else {
- applyMoveAttrs(MoveHeaderAttr, this.pokemon, null, this.move.getMove()).then(() => this.end());
- }
- } else {
- this.end();
- }
- }
-
- cancelMove(): void {
- this.pokemon.turnData.acted = true; // Record that the move was attempted
-
- this.pokemon.lapseTags(BattlerTagLapseType.PRE_MOVE);
-
- const moveQueue = this.pokemon.getMoveQueue();
-
- // Record a failed move so Abilities like Truant don't trigger next turn and soft-lock
- this.pokemon.pushMoveHistory({ move: Moves.NONE, result: MoveResult.FAIL });
-
- this.pokemon.lapseTags(BattlerTagLapseType.MOVE_EFFECT); // Remove any tags from moves like Fly/Dive/etc.
- moveQueue.shift(); // Remove the second turn of charge moves
-
- // Remove the MovePhase from this turn with the same user Pokemon
- this.scene.tryRemovePhase(phase => phase instanceof MovePhase && phase.pokemon === this.pokemon);
- }
-}
-
export class MovePhase extends BattlePhase {
public pokemon: Pokemon;
public move: PokemonMove;
@@ -2789,7 +2549,6 @@ export class MovePhase extends BattlePhase {
protected ignorePp: boolean;
protected failed: boolean;
protected cancelled: boolean;
- protected ignoreStatusCheck: boolean;
constructor(scene: BattleScene, pokemon: Pokemon, targets: BattlerIndex[], move: PokemonMove, followUp?: boolean, ignorePp?: boolean) {
super(scene);
@@ -2801,7 +2560,6 @@ export class MovePhase extends BattlePhase {
this.ignorePp = !!ignorePp;
this.failed = false;
this.cancelled = false;
- this.ignoreStatusCheck = false;
}
canMove(): boolean {
@@ -2889,7 +2647,6 @@ export class MovePhase extends BattlePhase {
return false;
});
- // Readability?: this function declaration honestly gets in the way of readability of what start() is doing , move either to beginning or end
const doMove = () => {
this.pokemon.turnData.acted = true; // Record that the move was attempted, even if it fails
@@ -2998,7 +2755,7 @@ export class MovePhase extends BattlePhase {
this.end();
};
- if (!this.followUp && this.pokemon.status && !this.pokemon.status.isPostTurn() && !this.ignoreStatusCheck) {
+ if (!this.followUp && this.pokemon.status && !this.pokemon.status.isPostTurn()) {
this.pokemon.status.incrementTurn();
let activated = false;
let healed = false;
@@ -3071,10 +2828,6 @@ export class MovePhase extends BattlePhase {
this.scene.queueMessage(failedText || i18next.t("battle:attackFailed"));
}
- setIgnoreStatusCheck(): void {
- this.ignoreStatusCheck = true;
- }
-
end() {
if (!this.followUp && this.canMove()) {
this.scene.unshiftPhase(new MoveEndPhase(this.scene, this.pokemon.getBattlerIndex()));
@@ -3257,11 +3010,8 @@ export class MoveEffectPhase extends PokemonPhase {
if (--user.turnData.hitsLeft >= 1 && this.getTarget()?.isActive()) {
this.scene.unshiftPhase(this.getNewHitPhase());
} else {
- // queue message for number of hits made by multi-move
- // if multi-hit attack only hits once, still want to render a message
const hitsTotal = user.turnData.hitCount - Math.max(user.turnData.hitsLeft, 0);
- if (hitsTotal > 1 || user.turnData.hitsLeft > 0) {
- // if there are multiple hits, or if there are hits of the multi-hit move left
+ if (hitsTotal > 1) {
this.scene.queueMessage(i18next.t("battle:attackHitsCount", { count: hitsTotal }));
}
this.scene.applyModifiers(HitHealModifier, this.player, user);
@@ -3297,10 +3047,6 @@ export class MoveEffectPhase extends PokemonPhase {
return true;
}
- if (target.getTag(BattlerTagType.ALWAYS_GET_HIT)) {
- return true;
- }
-
const hiddenTag = target.getTag(SemiInvulnerableTag);
if (hiddenTag && !this.move.getMove().getAttrs(HitsTagAttr).some(hta => hta.tagType === hiddenTag.tagType)) {
return false;
@@ -3556,20 +3302,6 @@ export class StatChangePhase extends PokemonPhase {
applyPostStatChangeAbAttrs(PostStatChangeAbAttr, pokemon, filteredStats, this.levels, this.selfTarget);
- //Look for any other stat change phases; if this is the last one, do White Herb check
- const existingPhase = this.scene.findPhase(p => p instanceof StatChangePhase && p.battlerIndex === this.battlerIndex);
- if (!(existingPhase instanceof StatChangePhase)) {
- // Apply White Herb if needed
- const whiteHerb = this.scene.applyModifier(PokemonResetNegativeStatStageModifier, this.player, pokemon) as PokemonResetNegativeStatStageModifier;
- // If the White Herb was applied, consume it
- if (whiteHerb) {
- if (!--whiteHerb.stackCount) {
- this.scene.removeModifier(whiteHerb);
- }
- this.scene.updateModifiers(this.player);
- }
- }
-
pokemon.updateInfo();
handleTutorial(this.scene, Tutorial.Stat_Change).then(() => super.end());
@@ -3679,13 +3411,12 @@ export class StatChangePhase extends PokemonPhase {
if (relLevelStats.length > 1) {
statsFragment = relLevelStats.length >= 5
- ? i18next.t("battle:stats")
- : `${relLevelStats.slice(0, -1).map(s => getBattleStatName(s)).join(", ")}${relLevelStats.length > 2 ? "," : ""} ${i18next.t("battle:statsAnd")} ${getBattleStatName(relLevelStats[relLevelStats.length - 1])}`;
- messages.push(getBattleStatLevelChangeDescription(getPokemonNameWithAffix(this.getPokemon()), statsFragment, Math.abs(parseInt(rl)), levels >= 1,true));
+ ? "stats"
+ : `${relLevelStats.slice(0, -1).map(s => getBattleStatName(s)).join(", ")}${relLevelStats.length > 2 ? "," : ""} and ${getBattleStatName(relLevelStats[relLevelStats.length - 1])}`;
} else {
statsFragment = getBattleStatName(relLevelStats[0]);
- messages.push(getBattleStatLevelChangeDescription(getPokemonNameWithAffix(this.getPokemon()), statsFragment, Math.abs(parseInt(rl)), levels >= 1));
}
+ messages.push(getBattleStatLevelChangeDescription(getPokemonNameWithAffix(this.getPokemon()), statsFragment, Math.abs(parseInt(rl)), levels >= 1));
});
return messages;
@@ -4041,7 +3772,7 @@ export class FaintPhase extends PokemonPhase {
}
} else {
this.scene.unshiftPhase(new VictoryPhase(this.scene, this.battlerIndex));
- if (this.scene.currentBattle.battleType === BattleType.TRAINER || this.scene.currentBattle.battleType === BattleType.MYSTERY_ENCOUNTER) {
+ if (this.scene.currentBattle.battleType === BattleType.TRAINER) {
const hasReservePartyMember = !!this.scene.getEnemyParty().filter(p => p.isActive() && !p.isOnField() && p.trainerSlot === (pokemon as EnemyPokemon).trainerSlot).length;
if (hasReservePartyMember) {
this.scene.pushPhase(new SwitchSummonPhase(this.scene, this.fieldIndex, -1, false, false, false));
@@ -4137,8 +3868,6 @@ export class VictoryPhase extends PokemonPhase {
let expValue = this.getPokemon().getExpValue();
if (this.scene.currentBattle.battleType === BattleType.TRAINER) {
expValue = Math.floor(expValue * 1.5);
- } else if (this.scene.currentBattle.battleType === BattleType.MYSTERY_ENCOUNTER) {
- expValue = Math.floor(expValue * this.scene.currentBattle.mysteryEncounter.expMultiplier);
}
for (const partyMember of nonFaintedPartyMembers) {
const pId = partyMember.id;
@@ -4207,13 +3936,7 @@ export class VictoryPhase extends PokemonPhase {
}
}
- if (this.scene.currentBattle.battleType === BattleType.MYSTERY_ENCOUNTER) {
- handleMysteryEncounterVictory(this.scene);
- this.end();
- return;
- }
-
- if (!this.scene.getEnemyParty().find(p => this.scene.currentBattle.battleType === BattleType.WILD ? p.isOnField() : !p?.isFainted(true))) {
+ if (!this.scene.getEnemyParty().find(p => this.scene.currentBattle.battleType ? !p?.isFainted(true) : p.isOnField())) {
this.scene.pushPhase(new BattleEndPhase(this.scene));
if (this.scene.currentBattle.battleType === BattleType.TRAINER) {
this.scene.pushPhase(new TrainerVictoryPhase(this.scene));
@@ -4243,7 +3966,6 @@ export class VictoryPhase extends PokemonPhase {
this.scene.pushPhase(new AddEnemyBuffModifierPhase(this.scene));
}
}
-
this.scene.pushPhase(new NewBattlePhase(this.scene));
} else {
this.scene.currentBattle.battleType = BattleType.CLEAR;
@@ -4482,6 +4204,15 @@ export class GameOverPhase extends BattlePhase {
this.scene.gameData.gameStats.dailyRunSessionsWon++;
}
}
+
+ this.scene.gameData.getSession(this.scene.sessionSlotId).then(sessionData => {
+ if (sessionData) {
+ this.scene.gameData.saveRunHistory(this.scene, sessionData, this.victory);
+ }
+ }).catch(err => {
+ console.error(err);
+ });
+
const fadeDuration = this.victory ? 10000 : 5000;
this.scene.fadeOutBgm(fadeDuration, true);
const activeBattlers = this.scene.getField().filter(p => p?.isActive(true));
@@ -5060,7 +4791,7 @@ export class AttemptCapturePhase extends PokemonPhase {
const pokemon = this.getPokemon() as EnemyPokemon;
- if (!pokemon?.hp || !!pokemon.getTag(SemiInvulnerableTag) && !pokemon.getTag(BattlerTagType.FLYING)) {
+ if (!pokemon?.hp) {
return this.end();
}
@@ -5352,6 +5083,219 @@ export class AttemptRunPhase extends PokemonPhase {
}
}
+export class SelectModifierPhase extends BattlePhase {
+ private rerollCount: integer;
+ private modifierTiers: ModifierTier[];
+
+ constructor(scene: BattleScene, rerollCount: integer = 0, modifierTiers?: ModifierTier[]) {
+ super(scene);
+
+ this.rerollCount = rerollCount;
+ this.modifierTiers = modifierTiers;
+ }
+
+ start() {
+ super.start();
+
+ if (!this.rerollCount) {
+ this.updateSeed();
+ } else {
+ this.scene.reroll = false;
+ }
+
+ const party = this.scene.getParty();
+ regenerateModifierPoolThresholds(party, this.getPoolType(), this.rerollCount);
+ const modifierCount = new Utils.IntegerHolder(3);
+ if (this.isPlayer()) {
+ this.scene.applyModifiers(ExtraModifierModifier, true, modifierCount);
+ }
+ const typeOptions: ModifierTypeOption[] = this.getModifierTypeOptions(modifierCount.value);
+
+ const modifierSelectCallback = (rowCursor: integer, cursor: integer) => {
+ if (rowCursor < 0 || cursor < 0) {
+ this.scene.ui.showText(i18next.t("battle:skipItemQuestion"), null, () => {
+ this.scene.ui.setOverlayMode(Mode.CONFIRM, () => {
+ this.scene.ui.revertMode();
+ this.scene.ui.setMode(Mode.MESSAGE);
+ super.end();
+ }, () => this.scene.ui.setMode(Mode.MODIFIER_SELECT, this.isPlayer(), typeOptions, modifierSelectCallback, this.getRerollCost(typeOptions, this.scene.lockModifierTiers)));
+ });
+ return false;
+ }
+ let modifierType: ModifierType;
+ let cost: integer;
+ switch (rowCursor) {
+ case 0:
+ switch (cursor) {
+ case 0:
+ const rerollCost = this.getRerollCost(typeOptions, this.scene.lockModifierTiers);
+ if (this.scene.money < rerollCost) {
+ this.scene.ui.playError();
+ return false;
+ } else {
+ this.scene.reroll = true;
+ this.scene.unshiftPhase(new SelectModifierPhase(this.scene, this.rerollCount + 1, typeOptions.map(o => o.type.tier)));
+ this.scene.ui.clearText();
+ this.scene.ui.setMode(Mode.MESSAGE).then(() => super.end());
+ this.scene.money -= rerollCost;
+ this.scene.updateMoneyText();
+ this.scene.animateMoneyChanged(false);
+ this.scene.playSound("buy");
+ }
+ break;
+ case 1:
+ this.scene.ui.setModeWithoutClear(Mode.PARTY, PartyUiMode.MODIFIER_TRANSFER, -1, (fromSlotIndex: integer, itemIndex: integer, itemQuantity: integer, toSlotIndex: integer) => {
+ if (toSlotIndex !== undefined && fromSlotIndex < 6 && toSlotIndex < 6 && fromSlotIndex !== toSlotIndex && itemIndex > -1) {
+ const itemModifiers = this.scene.findModifiers(m => m instanceof PokemonHeldItemModifier
+ && (m as PokemonHeldItemModifier).getTransferrable(true) && (m as PokemonHeldItemModifier).pokemonId === party[fromSlotIndex].id) as PokemonHeldItemModifier[];
+ const itemModifier = itemModifiers[itemIndex];
+ this.scene.tryTransferHeldItemModifier(itemModifier, party[toSlotIndex], true, itemQuantity);
+ } else {
+ this.scene.ui.setMode(Mode.MODIFIER_SELECT, this.isPlayer(), typeOptions, modifierSelectCallback, this.getRerollCost(typeOptions, this.scene.lockModifierTiers));
+ }
+ }, PartyUiHandler.FilterItemMaxStacks);
+ break;
+ case 2:
+ this.scene.ui.setModeWithoutClear(Mode.PARTY, PartyUiMode.CHECK, -1, () => {
+ this.scene.ui.setMode(Mode.MODIFIER_SELECT, this.isPlayer(), typeOptions, modifierSelectCallback, this.getRerollCost(typeOptions, this.scene.lockModifierTiers));
+ });
+ break;
+ case 3:
+ this.scene.lockModifierTiers = !this.scene.lockModifierTiers;
+ const uiHandler = this.scene.ui.getHandler() as ModifierSelectUiHandler;
+ uiHandler.setRerollCost(this.getRerollCost(typeOptions, this.scene.lockModifierTiers));
+ uiHandler.updateLockRaritiesText();
+ uiHandler.updateRerollCostText();
+ return false;
+ }
+ return true;
+ case 1:
+ modifierType = typeOptions[cursor].type;
+ break;
+ default:
+ const shopOptions = getPlayerShopModifierTypeOptionsForWave(this.scene.currentBattle.waveIndex, this.scene.getWaveMoneyAmount(1));
+ const shopOption = shopOptions[rowCursor > 2 || shopOptions.length <= SHOP_OPTIONS_ROW_LIMIT ? cursor : cursor + SHOP_OPTIONS_ROW_LIMIT];
+ modifierType = shopOption.type;
+ cost = shopOption.cost;
+ break;
+ }
+
+ if (cost && this.scene.money < cost) {
+ this.scene.ui.playError();
+ return false;
+ }
+
+ const applyModifier = (modifier: Modifier, playSound: boolean = false) => {
+ const result = this.scene.addModifier(modifier, false, playSound);
+ if (cost) {
+ result.then(success => {
+ if (success) {
+ this.scene.money -= cost;
+ this.scene.updateMoneyText();
+ this.scene.animateMoneyChanged(false);
+ this.scene.playSound("buy");
+ (this.scene.ui.getHandler() as ModifierSelectUiHandler).updateCostText();
+ } else {
+ this.scene.ui.playError();
+ }
+ });
+ } else {
+ const doEnd = () => {
+ this.scene.ui.clearText();
+ this.scene.ui.setMode(Mode.MESSAGE);
+ super.end();
+ };
+ if (result instanceof Promise) {
+ result.then(() => doEnd());
+ } else {
+ doEnd();
+ }
+ }
+ };
+
+ if (modifierType instanceof PokemonModifierType) {
+ if (modifierType instanceof FusePokemonModifierType) {
+ this.scene.ui.setModeWithoutClear(Mode.PARTY, PartyUiMode.SPLICE, -1, (fromSlotIndex: integer, spliceSlotIndex: integer) => {
+ if (spliceSlotIndex !== undefined && fromSlotIndex < 6 && spliceSlotIndex < 6 && fromSlotIndex !== spliceSlotIndex) {
+ this.scene.ui.setMode(Mode.MODIFIER_SELECT, this.isPlayer()).then(() => {
+ const modifier = modifierType.newModifier(party[fromSlotIndex], party[spliceSlotIndex]);
+ applyModifier(modifier, true);
+ });
+ } else {
+ this.scene.ui.setMode(Mode.MODIFIER_SELECT, this.isPlayer(), typeOptions, modifierSelectCallback, this.getRerollCost(typeOptions, this.scene.lockModifierTiers));
+ }
+ }, modifierType.selectFilter);
+ } else {
+ const pokemonModifierType = modifierType as PokemonModifierType;
+ const isMoveModifier = modifierType instanceof PokemonMoveModifierType;
+ const isTmModifier = modifierType instanceof TmModifierType;
+ const isRememberMoveModifier = modifierType instanceof RememberMoveModifierType;
+ const isPpRestoreModifier = (modifierType instanceof PokemonPpRestoreModifierType || modifierType instanceof PokemonPpUpModifierType);
+ const partyUiMode = isMoveModifier ? PartyUiMode.MOVE_MODIFIER
+ : isTmModifier ? PartyUiMode.TM_MODIFIER
+ : isRememberMoveModifier ? PartyUiMode.REMEMBER_MOVE_MODIFIER
+ : PartyUiMode.MODIFIER;
+ const tmMoveId = isTmModifier
+ ? (modifierType as TmModifierType).moveId
+ : undefined;
+ this.scene.ui.setModeWithoutClear(Mode.PARTY, partyUiMode, -1, (slotIndex: integer, option: PartyOption) => {
+ if (slotIndex < 6) {
+ this.scene.ui.setMode(Mode.MODIFIER_SELECT, this.isPlayer()).then(() => {
+ const modifier = !isMoveModifier
+ ? !isRememberMoveModifier
+ ? modifierType.newModifier(party[slotIndex])
+ : modifierType.newModifier(party[slotIndex], option as integer)
+ : modifierType.newModifier(party[slotIndex], option - PartyOption.MOVE_1);
+ applyModifier(modifier, true);
+ });
+ } else {
+ this.scene.ui.setMode(Mode.MODIFIER_SELECT, this.isPlayer(), typeOptions, modifierSelectCallback, this.getRerollCost(typeOptions, this.scene.lockModifierTiers));
+ }
+ }, pokemonModifierType.selectFilter, modifierType instanceof PokemonMoveModifierType ? (modifierType as PokemonMoveModifierType).moveSelectFilter : undefined, tmMoveId, isPpRestoreModifier);
+ }
+ } else {
+ applyModifier(modifierType.newModifier());
+ }
+
+ return !cost;
+ };
+ this.scene.ui.setMode(Mode.MODIFIER_SELECT, this.isPlayer(), typeOptions, modifierSelectCallback, this.getRerollCost(typeOptions, this.scene.lockModifierTiers));
+ }
+
+ updateSeed(): void {
+ this.scene.resetSeed();
+ }
+
+ isPlayer(): boolean {
+ return true;
+ }
+
+ getRerollCost(typeOptions: ModifierTypeOption[], lockRarities: boolean): integer {
+ let baseValue = 0;
+ if (lockRarities) {
+ const tierValues = [50, 125, 300, 750, 2000];
+ for (const opt of typeOptions) {
+ baseValue += tierValues[opt.type.tier];
+ }
+ } else {
+ baseValue = 250;
+ }
+ return Math.min(Math.ceil(this.scene.currentBattle.waveIndex / 10) * baseValue * Math.pow(2, this.rerollCount), Number.MAX_SAFE_INTEGER);
+ }
+
+ getPoolType(): ModifierPoolType {
+ return ModifierPoolType.PLAYER;
+ }
+
+ getModifierTypeOptions(modifierCount: integer): ModifierTypeOption[] {
+ return getPlayerModifierTypeOptions(modifierCount, this.scene.getParty(), this.scene.lockModifierTiers ? this.modifierTiers : undefined);
+ }
+
+ addModifier(modifier: Modifier): Promise {
+ return this.scene.addModifier(modifier, false, true);
+ }
+}
+
export class EggLapsePhase extends Phase {
constructor(scene: BattleScene) {
super(scene);
@@ -5513,45 +5457,19 @@ export class ScanIvsPhase extends PokemonPhase {
const pokemon = this.getPokemon();
- let enemyIvs = [];
- let statsContainer = [];
- let statsContainerLabels = [];
- const enemyField = this.scene.getEnemyField();
- const uiTheme = (this.scene as BattleScene).uiTheme; // Assuming uiTheme is accessible
- for (let e = 0; e < enemyField.length; e++) {
- enemyIvs = enemyField[e].ivs;
- const currentIvs = this.scene.gameData.dexData[enemyField[e].species.speciesId].ivs;
- const ivsToShow = this.scene.ui.getMessageHandler().topIvs(enemyIvs, this.shownIvs);
- statsContainer = enemyField[e].getBattleInfo().getStatsValueContainer().list;
- statsContainerLabels = statsContainer.filter(m => m.name.indexOf("icon_stat_label") >= 0);
- for (let s = 0; s < statsContainerLabels.length; s++) {
- const ivStat = Stat[statsContainerLabels[s].frame.name];
- if (enemyIvs[ivStat] > currentIvs[ivStat] && ivsToShow.indexOf(Number(ivStat)) >= 0) {
- const hexColour = enemyIvs[ivStat] === 31 ? "#f8c020" : getTextColor(TextStyle.SUMMARY_GREEN, false, uiTheme);
- const hexTextColour = Phaser.Display.Color.HexStringToColor(hexColour).color;
- statsContainerLabels[s].setTint(hexTextColour);
- }
- statsContainerLabels[s].setVisible(true);
- }
- }
-
- if (!this.scene.hideIvs) {
- this.scene.ui.showText(i18next.t("battle:ivScannerUseQuestion", { pokemonName: pokemon.name }), null, () => {
- this.scene.ui.setMode(Mode.CONFIRM, () => {
- this.scene.ui.setMode(Mode.MESSAGE);
- this.scene.ui.clearText();
- new CommonBattleAnim(CommonAnim.LOCK_ON, pokemon, pokemon).play(this.scene, () => {
- this.scene.ui.getMessageHandler().promptIvs(pokemon.id, pokemon.ivs, this.shownIvs).then(() => this.end());
- });
- }, () => {
- this.scene.ui.setMode(Mode.MESSAGE);
- this.scene.ui.clearText();
- this.end();
+ this.scene.ui.showText(i18next.t("battle:ivScannerUseQuestion", { pokemonName: pokemon.name }), null, () => {
+ this.scene.ui.setMode(Mode.CONFIRM, () => {
+ this.scene.ui.setMode(Mode.MESSAGE);
+ this.scene.ui.clearText();
+ new CommonBattleAnim(CommonAnim.LOCK_ON, pokemon, pokemon).play(this.scene, () => {
+ this.scene.ui.getMessageHandler().promptIvs(pokemon.id, pokemon.ivs, this.shownIvs).then(() => this.end());
});
+ }, () => {
+ this.scene.ui.setMode(Mode.MESSAGE);
+ this.scene.ui.clearText();
+ this.end();
});
- } else {
- this.end();
- }
+ });
}
}
diff --git a/src/phases/battle-phase.ts b/src/phases/battle-phase.ts
deleted file mode 100644
index 62c35403f3fc..000000000000
--- a/src/phases/battle-phase.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import {Phase} from "#app/phase";
-import BattleScene from "#app/battle-scene";
-import {TrainerSlot} from "#app/data/trainer-config";
-
-export class BattlePhase extends Phase {
- constructor(scene: BattleScene) {
- super(scene);
- }
-
- showEnemyTrainer(trainerSlot: TrainerSlot = TrainerSlot.NONE): void {
- const sprites = this.scene.currentBattle.trainer.getSprites();
- const tintSprites = this.scene.currentBattle.trainer.getTintSprites();
- for (let i = 0; i < sprites.length; i++) {
- const visible = !trainerSlot || !i === (trainerSlot === TrainerSlot.TRAINER) || sprites.length < 2;
- [sprites[i], tintSprites[i]].map(sprite => {
- if (visible) {
- sprite.x = trainerSlot || sprites.length < 2 ? 0 : i ? 16 : -16;
- }
- sprite.setVisible(visible);
- sprite.clearTint();
- });
- sprites[i].setVisible(visible);
- tintSprites[i].setVisible(visible);
- sprites[i].clearTint();
- tintSprites[i].clearTint();
- }
- this.scene.tweens.add({
- targets: this.scene.currentBattle.trainer,
- x: "-=16",
- y: "+=16",
- alpha: 1,
- ease: "Sine.easeInOut",
- duration: 750
- });
- }
-
- hideEnemyTrainer(): void {
- this.scene.tweens.add({
- targets: this.scene.currentBattle.trainer,
- x: "+=16",
- y: "-=16",
- alpha: 0,
- ease: "Sine.easeInOut",
- duration: 750
- });
- }
-}
diff --git a/src/phases/mystery-encounter-phase.ts b/src/phases/mystery-encounter-phase.ts
deleted file mode 100644
index 2700ec32ae18..000000000000
--- a/src/phases/mystery-encounter-phase.ts
+++ /dev/null
@@ -1,473 +0,0 @@
-import i18next from "i18next";
-import BattleScene from "../battle-scene";
-import { Phase } from "../phase";
-import { Mode } from "../ui/ui";
-import {
- getTextWithEncounterDialogueTokens
-} from "../data/mystery-encounters/mystery-encounter-utils";
-import { CheckSwitchPhase, NewBattlePhase, PostSummonPhase, ReturnPhase, ScanIvsPhase, SummonPhase, ToggleDoublePositionPhase } from "../phases";
-import MysteryEncounterOption from "../data/mystery-encounter-option";
-import { MysteryEncounterVariant } from "../data/mystery-encounter";
-import { getCharVariantFromDialogue } from "../data/dialogue";
-import { TrainerSlot } from "../data/trainer-config";
-import { BattleSpec } from "../enums/battle-spec";
-import { Tutorial, handleTutorial } from "../tutorial";
-import { IvScannerModifier } from "../modifier/modifier";
-import * as Utils from "../utils";
-import {SelectModifierPhase} from "#app/phases/select-modifier-phase";
-import {isNullOrUndefined} from "../utils";
-
-/**
- * Will handle (in order):
- * - Clearing of phase queues to enter the Mystery Encounter game state
- * - Management of session data related to MEs
- * - Initialization of ME option select menu and UI
- * - Execute onPreOptionPhase() logic if it exists for the selected option
- * - Display any OptionTextDisplay.selected type dialogue that is set in the MysteryEncounterDialogue dialogue tree for selected option
- * - Queuing of the MysteryEncounterOptionSelectedPhase
- */
-export class MysteryEncounterPhase extends Phase {
- constructor(scene: BattleScene) {
- super(scene);
- }
-
- start() {
- super.start();
-
- // Clears out queued phases that are part of standard battle
- this.scene.clearPhaseQueue();
- this.scene.clearPhaseQueueSplice();
-
- // Sets flag that ME was encountered
- // Can be used in later MEs to check for requirements to spawn, etc.
- this.scene.mysteryEncounterFlags.encounteredEvents.push([this.scene.currentBattle.mysteryEncounter.encounterType, this.scene.currentBattle.mysteryEncounter.encounterTier]);
-
- // Initiates encounter dialogue window and option select
- this.scene.ui.setMode(Mode.MYSTERY_ENCOUNTER);
- }
-
- handleOptionSelect(option: MysteryEncounterOption, index: number): boolean {
- // Set option selected flag
- this.scene.currentBattle.mysteryEncounter.selectedOption = option;
-
- if (!option.onOptionPhase) {
- return false;
- }
-
- // Populate dialogue tokens for option requirements
- this.scene.currentBattle.mysteryEncounter.populateDialogueTokensFromRequirements();
-
- if (option.onPreOptionPhase) {
- this.scene.executeWithSeedOffset(async () => {
- return await option.onPreOptionPhase(this.scene)
- .then((result) => {
- if (isNullOrUndefined(result) || result) {
- this.continueEncounter(index);
- }
- });
- }, this.scene.currentBattle.waveIndex * 1000);
- } else {
- this.continueEncounter(index);
- }
-
- return true;
- }
-
- continueEncounter(optionIndex: number) {
- const endDialogueAndContinueEncounter = () => {
- this.scene.pushPhase(new MysteryEncounterOptionSelectedPhase(this.scene));
- this.end();
- };
-
- const optionSelectDialogue = this.scene.currentBattle?.mysteryEncounter?.dialogue?.encounterOptionsDialogue?.options?.[optionIndex];
- if (optionSelectDialogue?.selected?.length > 0) {
- // Handle intermediate dialogue (between player selection event and the onOptionSelect logic)
- this.scene.ui.setMode(Mode.MESSAGE);
- const selectedDialogue = optionSelectDialogue.selected;
- let i = 0;
- const showNextDialogue = () => {
- const nextAction = i === selectedDialogue.length - 1 ? endDialogueAndContinueEncounter : showNextDialogue;
- const dialogue = selectedDialogue[i];
- let title: string = null;
- const text: string = getTextWithEncounterDialogueTokens(this.scene, dialogue.text);
- if (dialogue.speaker) {
- title = getTextWithEncounterDialogueTokens(this.scene, dialogue.speaker);
- }
-
- if (title) {
- this.scene.ui.showDialogue(text, title, null, nextAction, 0, i === 0 ? 750 : 0);
- } else {
- this.scene.ui.showText(text, null, nextAction, i === 0 ? 750 : 0, true);
- }
- i++;
- };
-
- showNextDialogue();
- } else {
- endDialogueAndContinueEncounter();
- }
- }
-
- cancel() {
- this.end();
- }
-
- end() {
- this.scene.ui.setMode(Mode.MESSAGE).then(() => super.end());
- }
-}
-
-/**
- * Will handle (in order):
- * - Execute onOptionSelect() logic if it exists for the selected option
- *
- * It is important to point out that no phases are directly queued by any logic within this phase
- * Any phase that is meant to follow this one MUST be queued via the onOptionSelect() logic of the selected option
- */
-export class MysteryEncounterOptionSelectedPhase extends Phase {
- onOptionSelect: (scene: BattleScene) => Promise;
-
- constructor(scene: BattleScene) {
- super(scene);
- this.onOptionSelect = this.scene.currentBattle.mysteryEncounter.selectedOption.onOptionPhase;
- }
-
- start() {
- super.start();
- if (this.scene.currentBattle.mysteryEncounter.hideIntroVisuals) {
- this.hideMysteryEncounterIntroVisuals().then(() => {
- this.scene.executeWithSeedOffset(() => {
- this.onOptionSelect(this.scene).finally(() => {
- this.end();
- });
- }, this.scene.currentBattle.waveIndex * 1000);
- });
- } else {
- this.scene.executeWithSeedOffset(() => {
- this.onOptionSelect(this.scene).finally(() => {
- this.end();
- });
- }, this.scene.currentBattle.waveIndex * 1000);
- }
- }
-
- hideMysteryEncounterIntroVisuals(): Promise {
- return new Promise(resolve => {
- const introVisuals = this.scene.currentBattle.mysteryEncounter.introVisuals;
- if (introVisuals) {
- // Hide
- this.scene.tweens.add({
- targets: introVisuals,
- x: "+=16",
- y: "-=16",
- alpha: 0,
- ease: "Sine.easeInOut",
- duration: 750,
- onComplete: () => {
- this.scene.field.remove(introVisuals);
- introVisuals.setVisible(false);
- introVisuals.destroy();
- this.scene.currentBattle.mysteryEncounter.introVisuals = null;
- resolve(true);
- }
- });
- } else {
- resolve(true);
- }
- });
- }
-}
-
-/**
- * Will handle (in order):
- * - Setting BGM
- * - Showing intro dialogue for an enemy trainer or wild Pokemon
- * - Sliding in the visuals for enemy trainer or wild Pokemon, as well as handling summoning animations
- * - Queue the SummonPhases, PostSummonPhases, etc., required to initialize the phase queue for a battle
- */
-export class MysteryEncounterBattlePhase extends Phase {
- constructor(scene: BattleScene) {
- super(scene);
- }
-
- start() {
- super.start();
-
- this.doMysteryEncounterBattle(this.scene);
- }
-
- getBattleMessage(scene: BattleScene): string {
- const enemyField = scene.getEnemyField();
- const encounterVariant = scene.currentBattle.mysteryEncounter.encounterVariant;
-
- if (scene.currentBattle.battleSpec === BattleSpec.FINAL_BOSS) {
- return i18next.t("battle:bossAppeared", { bossName: enemyField[0].name });
- }
-
- if (encounterVariant === MysteryEncounterVariant.TRAINER_BATTLE) {
- if (scene.currentBattle.double) {
- return i18next.t("battle:trainerAppearedDouble", { trainerName: scene.currentBattle.trainer.getName(TrainerSlot.NONE, true) });
-
- } else {
- return i18next.t("battle:trainerAppeared", { trainerName: scene.currentBattle.trainer.getName(TrainerSlot.NONE, true) });
- }
- }
-
- return enemyField.length === 1
- ? i18next.t("battle:singleWildAppeared", { pokemonName: enemyField[0].name })
- : i18next.t("battle:multiWildAppeared", { pokemonName1: enemyField[0].name, pokemonName2: enemyField[1].name });
- }
-
- doMysteryEncounterBattle(scene: BattleScene) {
- const encounterVariant = scene.currentBattle.mysteryEncounter.encounterVariant;
- if (encounterVariant === MysteryEncounterVariant.WILD_BATTLE || encounterVariant === MysteryEncounterVariant.BOSS_BATTLE) {
- // Summons the wild/boss Pokemon
- if (encounterVariant === MysteryEncounterVariant.BOSS_BATTLE) {
- scene.playBgm(undefined);
- }
- const availablePartyMembers = scene.getEnemyParty().filter(p => !p.isFainted()).length;
- scene.unshiftPhase(new SummonPhase(scene, 0, false));
- if (scene.currentBattle.double && availablePartyMembers > 1) {
- scene.unshiftPhase(new SummonPhase(scene, 1, false));
- }
-
- if (!scene.currentBattle.mysteryEncounter.hideBattleIntroMessage) {
- scene.ui.showText(this.getBattleMessage(scene), null, () => this.endBattleSetup(scene), 1500);
- } else {
- this.endBattleSetup(scene);
- }
- } else if (encounterVariant === MysteryEncounterVariant.TRAINER_BATTLE) {
- this.showEnemyTrainer();
- const doSummon = () => {
- scene.currentBattle.started = true;
- scene.playBgm(undefined);
- scene.pbTray.showPbTray(scene.getParty());
- scene.pbTrayEnemy.showPbTray(scene.getEnemyParty());
- const doTrainerSummon = () => {
- this.hideEnemyTrainer();
- const availablePartyMembers = scene.getEnemyParty().filter(p => !p.isFainted()).length;
- scene.unshiftPhase(new SummonPhase(scene, 0, false));
- if (scene.currentBattle.double && availablePartyMembers > 1) {
- scene.unshiftPhase(new SummonPhase(scene, 1, false));
- }
- this.endBattleSetup(scene);
- };
- if (!scene.currentBattle.mysteryEncounter.hideBattleIntroMessage) {
- scene.ui.showText(this.getBattleMessage(scene), null, doTrainerSummon, 1500, true);
- } else {
- doTrainerSummon();
- }
- };
-
- const encounterMessages = scene.currentBattle.trainer.getEncounterMessages();
-
- if (!encounterMessages?.length) {
- doSummon();
- } else {
- const trainer = this.scene.currentBattle.trainer;
- let message: string;
- scene.executeWithSeedOffset(() => message = Utils.randSeedItem(encounterMessages), scene.currentBattle.waveIndex * 1000);
-
- const showDialogueAndSummon = () => {
- scene.ui.showDialogue(message, trainer.getName(TrainerSlot.NONE, true), null, () => {
- scene.charSprite.hide().then(() => scene.hideFieldOverlay(250).then(() => doSummon()));
- });
- };
- if (scene.currentBattle.trainer.config.hasCharSprite && !scene.ui.shouldSkipDialogue(message)) {
- scene.showFieldOverlay(500).then(() => scene.charSprite.showCharacter(trainer.getKey(), getCharVariantFromDialogue(encounterMessages[0])).then(() => showDialogueAndSummon()));
- } else {
- showDialogueAndSummon();
- }
- }
- }
- }
-
- endBattleSetup(scene: BattleScene) {
- const enemyField = scene.getEnemyField();
- const encounterVariant = scene.currentBattle.mysteryEncounter.encounterVariant;
-
- if (encounterVariant !== MysteryEncounterVariant.TRAINER_BATTLE) {
- enemyField.map(p => this.scene.pushConditionalPhase(new PostSummonPhase(this.scene, p.getBattlerIndex()), () => {
- // if there is not a player party, we can't continue
- if (!this.scene.getParty()?.length) {
- return false;
- }
- // how many player pokemon are on the field ?
- const pokemonsOnFieldCount = this.scene.getParty().filter(p => p.isOnField()).length;
- // if it's a 2vs1, there will never be a 2nd pokemon on our field even
- const requiredPokemonsOnField = Math.min(this.scene.getParty().filter((p) => !p.isFainted()).length, 2);
- // if it's a double, there should be 2, otherwise 1
- if (this.scene.currentBattle.double) {
- return pokemonsOnFieldCount === requiredPokemonsOnField;
- }
- return pokemonsOnFieldCount === 1;
- }));
- const ivScannerModifier = this.scene.findModifier(m => m instanceof IvScannerModifier);
- if (ivScannerModifier) {
- enemyField.map(p => this.scene.pushPhase(new ScanIvsPhase(this.scene, p.getBattlerIndex(), Math.min(ivScannerModifier.getStackCount() * 2, 6))));
- }
- }
-
- const availablePartyMembers = scene.getParty().filter(p => !p.isFainted());
-
- if (!availablePartyMembers[0].isOnField()) {
- scene.pushPhase(new SummonPhase(scene, 0));
- }
-
- if (scene.currentBattle.double) {
- if (availablePartyMembers.length > 1) {
- scene.pushPhase(new ToggleDoublePositionPhase(scene, true));
- if (!availablePartyMembers[1].isOnField()) {
- scene.pushPhase(new SummonPhase(scene, 1));
- }
- }
- } else {
- if (availablePartyMembers.length > 1 && availablePartyMembers[1].isOnField()) {
- scene.pushPhase(new ReturnPhase(scene, 1));
- }
- scene.pushPhase(new ToggleDoublePositionPhase(scene, false));
- }
-
- if (encounterVariant !== MysteryEncounterVariant.TRAINER_BATTLE && (scene.currentBattle.waveIndex > 1 || !scene.gameMode.isDaily)) {
- const minPartySize = scene.currentBattle.double ? 2 : 1;
- if (availablePartyMembers.length > minPartySize) {
- scene.pushPhase(new CheckSwitchPhase(scene, 0, scene.currentBattle.double));
- if (scene.currentBattle.double) {
- scene.pushPhase(new CheckSwitchPhase(scene, 1, scene.currentBattle.double));
- }
- }
- }
-
- // TODO: remove?
- handleTutorial(this.scene, Tutorial.Access_Menu).then(() => super.end());
- }
-
- showEnemyTrainer(): void {
- // Show enemy trainer
- const trainer = this.scene.currentBattle.trainer;
- trainer.alpha = 0;
- trainer.x += 16;
- trainer.y -= 16;
- trainer.setVisible(true);
- this.scene.tweens.add({
- targets: trainer,
- x: "-=16",
- y: "+=16",
- alpha: 1,
- ease: "Sine.easeInOut",
- duration: 750,
- onComplete: () => {
- trainer.untint(100, "Sine.easeOut");
- trainer.playAnim();
- }
- });
- }
-
- hideEnemyTrainer(): void {
- this.scene.tweens.add({
- targets: this.scene.currentBattle.trainer,
- x: "+=16",
- y: "-=16",
- alpha: 0,
- ease: "Sine.easeInOut",
- duration: 750
- });
- }
-}
-
-/**
- * Will handle (in order):
- * - Any encounter reward logic that is set within MysteryEncounter doEncounterRewards
- * - Otherwise, can add a no-reward-item shop with only Potions, etc. if addHealPhase is true
- * - Queuing of the PostMysteryEncounterPhase
- */
-export class MysteryEncounterRewardsPhase extends Phase {
- addHealPhase: boolean;
-
- constructor(scene: BattleScene, addHealPhase: boolean = false) {
- super(scene);
- this.addHealPhase = addHealPhase;
- }
-
- start() {
- super.start();
-
- this.scene.executeWithSeedOffset(() => {
- if (this.scene.currentBattle.mysteryEncounter.doEncounterRewards) {
- this.scene.currentBattle.mysteryEncounter.doEncounterRewards(this.scene);
- } else if (this.addHealPhase) {
- this.scene.tryRemovePhase(p => p instanceof SelectModifierPhase);
- this.scene.unshiftPhase(new SelectModifierPhase(this.scene, 0, null, { fillRemaining: false, rerollMultiplier: 0}));
- }
- }, this.scene.currentBattle.waveIndex * 1000);
-
- this.scene.pushPhase(new PostMysteryEncounterPhase(this.scene));
- this.end();
- }
-}
-
-/**
- * Will handle (in order):
- * - onPostOptionSelect logic (based on an option that was selected)
- * - Showing any outro dialogue messages
- * - Cleanup of any leftover intro visuals
- * - Queuing of the next wave
- */
-export class PostMysteryEncounterPhase extends Phase {
- onPostOptionSelect: (scene: BattleScene) => Promise;
-
- constructor(scene: BattleScene) {
- super(scene);
- this.onPostOptionSelect = this.scene.currentBattle.mysteryEncounter.selectedOption.onPostOptionPhase;
- }
-
- start() {
- super.start();
-
- if (this.onPostOptionSelect) {
- this.scene.executeWithSeedOffset(async () => {
- return await this.onPostOptionSelect(this.scene)
- .then((result) => {
- if (isNullOrUndefined(result) || result) {
- this.continueEncounter();
- }
- });
- }, this.scene.currentBattle.waveIndex * 1000);
- } else {
- this.continueEncounter();
- }
- }
-
- continueEncounter() {
- const endPhase = () => {
- this.scene.pushPhase(new NewBattlePhase(this.scene));
- this.end();
- };
-
- const outroDialogue = this.scene.currentBattle?.mysteryEncounter?.dialogue?.outro;
- if (outroDialogue?.length > 0) {
- let i = 0;
- const showNextDialogue = () => {
- const nextAction = i === outroDialogue.length - 1 ? endPhase : showNextDialogue;
- const dialogue = outroDialogue[i];
- let title: string = null;
- const text: string = getTextWithEncounterDialogueTokens(this.scene, dialogue.text);
- if (dialogue.speaker) {
- title = getTextWithEncounterDialogueTokens(this.scene, dialogue.speaker);
- }
-
- this.scene.ui.setMode(Mode.MESSAGE);
- if (title) {
- this.scene.ui.showDialogue(text, title, null, nextAction, 0, i === 0 ? 750 : 0);
- } else {
- this.scene.ui.showText(text, null, nextAction, i === 0 ? 750 : 0, true);
- }
- i++;
- };
-
- showNextDialogue();
- } else {
- endPhase();
- }
- }
-}
diff --git a/src/phases/select-modifier-phase.ts b/src/phases/select-modifier-phase.ts
deleted file mode 100644
index 5e53281ba841..000000000000
--- a/src/phases/select-modifier-phase.ts
+++ /dev/null
@@ -1,259 +0,0 @@
-import {ModifierTier} from "#app/modifier/modifier-tier";
-import {
- CustomModifierSettings,
- FusePokemonModifierType, getPlayerModifierTypeOptions,
- getPlayerShopModifierTypeOptionsForWave, ModifierPoolType,
- ModifierType,
- ModifierTypeOption,
- PokemonModifierType,
- PokemonMoveModifierType,
- PokemonPpRestoreModifierType,
- PokemonPpUpModifierType,
- regenerateModifierPoolThresholds,
- RememberMoveModifierType,
- TmModifierType
-} from "#app/modifier/modifier-type";
-import BattleScene from "#app/battle-scene";
-import * as Utils from "#app/utils";
-import {ExtraModifierModifier, Modifier, PokemonHeldItemModifier} from "#app/modifier/modifier";
-import i18next from "#app/plugins/i18n";
-import {Mode} from "#app/ui/ui";
-import PartyUiHandler, {PartyOption, PartyUiMode} from "#app/ui/party-ui-handler";
-import ModifierSelectUiHandler, {SHOP_OPTIONS_ROW_LIMIT} from "#app/ui/modifier-select-ui-handler";
-import {BattlePhase} from "#app/phases/battle-phase";
-import {isNullOrUndefined} from "#app/utils";
-
-export class SelectModifierPhase extends BattlePhase {
- private rerollCount: integer;
- private modifierTiers: ModifierTier[];
- private customModifierSettings: CustomModifierSettings;
-
- constructor(scene: BattleScene, rerollCount: integer = 0, modifierTiers?: ModifierTier[], customModifierSettings?: CustomModifierSettings) {
- super(scene);
-
- this.rerollCount = rerollCount;
- this.modifierTiers = modifierTiers;
- this.customModifierSettings = customModifierSettings;
- }
-
- start() {
- super.start();
-
- if (!this.rerollCount) {
- this.updateSeed();
- } else {
- this.scene.reroll = false;
- }
-
- const party = this.scene.getParty();
- regenerateModifierPoolThresholds(party, this.getPoolType(), this.rerollCount);
- const modifierCount = new Utils.IntegerHolder(3);
- if (this.isPlayer()) {
- this.scene.applyModifiers(ExtraModifierModifier, true, modifierCount);
- }
-
- // If custom modifiers are specified, overrides default item count
- if (!!this.customModifierSettings) {
- const newItemCount = (this.customModifierSettings.guaranteedModifierTiers?.length || 0) +
- (this.customModifierSettings.guaranteedModifierTypeOptions?.length || 0) +
- (this.customModifierSettings.guaranteedModifierTypeFuncs?.length || 0);
- if (this.customModifierSettings.fillRemaining) {
- const originalCount = modifierCount.value;
- modifierCount.value = originalCount > newItemCount ? originalCount : newItemCount;
- } else {
- modifierCount.value = newItemCount;
- }
- }
-
- const typeOptions: ModifierTypeOption[] = this.getModifierTypeOptions(modifierCount.value);
-
- const modifierSelectCallback = (rowCursor: integer, cursor: integer) => {
- if (rowCursor < 0 || cursor < 0) {
- this.scene.ui.showText(i18next.t("battle:skipItemQuestion"), null, () => {
- this.scene.ui.setOverlayMode(Mode.CONFIRM, () => {
- this.scene.ui.revertMode();
- this.scene.ui.setMode(Mode.MESSAGE);
- super.end();
- }, () => this.scene.ui.setMode(Mode.MODIFIER_SELECT, this.isPlayer(), typeOptions, modifierSelectCallback, this.getRerollCost(typeOptions, this.scene.lockModifierTiers)));
- });
- return false;
- }
- let modifierType: ModifierType;
- let cost: integer;
- switch (rowCursor) {
- case 0:
- switch (cursor) {
- case 0:
- const rerollCost = this.getRerollCost(typeOptions, this.scene.lockModifierTiers);
- if (rerollCost === 0 || this.scene.money < rerollCost) {
- this.scene.ui.playError();
- return false;
- } else {
- this.scene.reroll = true;
- this.scene.unshiftPhase(new SelectModifierPhase(this.scene, this.rerollCount + 1, typeOptions.map(o => o.type.tier)));
- this.scene.ui.clearText();
- this.scene.ui.setMode(Mode.MESSAGE).then(() => super.end());
- this.scene.money -= rerollCost;
- this.scene.updateMoneyText();
- this.scene.animateMoneyChanged(false);
- this.scene.playSound("buy");
- }
- break;
- case 1:
- this.scene.ui.setModeWithoutClear(Mode.PARTY, PartyUiMode.MODIFIER_TRANSFER, -1, (fromSlotIndex: integer, itemIndex: integer, itemQuantity: integer, toSlotIndex: integer) => {
- if (toSlotIndex !== undefined && fromSlotIndex < 6 && toSlotIndex < 6 && fromSlotIndex !== toSlotIndex && itemIndex > -1) {
- const itemModifiers = this.scene.findModifiers(m => m instanceof PokemonHeldItemModifier
- && (m as PokemonHeldItemModifier).getTransferrable(true) && (m as PokemonHeldItemModifier).pokemonId === party[fromSlotIndex].id) as PokemonHeldItemModifier[];
- const itemModifier = itemModifiers[itemIndex];
- this.scene.tryTransferHeldItemModifier(itemModifier, party[toSlotIndex], true, itemQuantity);
- } else {
- this.scene.ui.setMode(Mode.MODIFIER_SELECT, this.isPlayer(), typeOptions, modifierSelectCallback, this.getRerollCost(typeOptions, this.scene.lockModifierTiers));
- }
- }, PartyUiHandler.FilterItemMaxStacks);
- break;
- case 2:
- this.scene.ui.setModeWithoutClear(Mode.PARTY, PartyUiMode.CHECK, -1, () => {
- this.scene.ui.setMode(Mode.MODIFIER_SELECT, this.isPlayer(), typeOptions, modifierSelectCallback, this.getRerollCost(typeOptions, this.scene.lockModifierTiers));
- });
- break;
- case 3:
- this.scene.lockModifierTiers = !this.scene.lockModifierTiers;
- const uiHandler = this.scene.ui.getHandler() as ModifierSelectUiHandler;
- uiHandler.setRerollCost(this.getRerollCost(typeOptions, this.scene.lockModifierTiers));
- uiHandler.updateLockRaritiesText();
- uiHandler.updateRerollCostText();
- return false;
- }
- return true;
- case 1:
- if (typeOptions.length === 0) {
- this.scene.ui.revertMode();
- this.scene.ui.setMode(Mode.MESSAGE);
- super.end();
- }
- modifierType = typeOptions[cursor].type;
- break;
- default:
- const shopOptions = getPlayerShopModifierTypeOptionsForWave(this.scene.currentBattle.waveIndex, this.scene.getWaveMoneyAmount(1));
- const shopOption = shopOptions[rowCursor > 2 || shopOptions.length <= SHOP_OPTIONS_ROW_LIMIT ? cursor : cursor + SHOP_OPTIONS_ROW_LIMIT];
- modifierType = shopOption.type;
- cost = shopOption.cost;
- break;
- }
-
- if (cost && this.scene.money < cost) {
- this.scene.ui.playError();
- return false;
- }
-
- const applyModifier = (modifier: Modifier, playSound: boolean = false) => {
- const result = this.scene.addModifier(modifier, false, playSound);
- if (cost) {
- result.then(success => {
- if (success) {
- this.scene.money -= cost;
- this.scene.updateMoneyText();
- this.scene.animateMoneyChanged(false);
- this.scene.playSound("buy");
- (this.scene.ui.getHandler() as ModifierSelectUiHandler).updateCostText();
- } else {
- this.scene.ui.playError();
- }
- });
- } else {
- const doEnd = () => {
- this.scene.ui.clearText();
- this.scene.ui.setMode(Mode.MESSAGE);
- super.end();
- };
- if (result instanceof Promise) {
- result.then(() => doEnd());
- } else {
- doEnd();
- }
- }
- };
-
- if (modifierType instanceof PokemonModifierType) {
- if (modifierType instanceof FusePokemonModifierType) {
- this.scene.ui.setModeWithoutClear(Mode.PARTY, PartyUiMode.SPLICE, -1, (fromSlotIndex: integer, spliceSlotIndex: integer) => {
- if (spliceSlotIndex !== undefined && fromSlotIndex < 6 && spliceSlotIndex < 6 && fromSlotIndex !== spliceSlotIndex) {
- this.scene.ui.setMode(Mode.MODIFIER_SELECT, this.isPlayer()).then(() => {
- const modifier = modifierType.newModifier(party[fromSlotIndex], party[spliceSlotIndex]);
- applyModifier(modifier, true);
- });
- } else {
- this.scene.ui.setMode(Mode.MODIFIER_SELECT, this.isPlayer(), typeOptions, modifierSelectCallback, this.getRerollCost(typeOptions, this.scene.lockModifierTiers));
- }
- }, modifierType.selectFilter);
- } else {
- const pokemonModifierType = modifierType as PokemonModifierType;
- const isMoveModifier = modifierType instanceof PokemonMoveModifierType;
- const isTmModifier = modifierType instanceof TmModifierType;
- const isRememberMoveModifier = modifierType instanceof RememberMoveModifierType;
- const isPpRestoreModifier = (modifierType instanceof PokemonPpRestoreModifierType || modifierType instanceof PokemonPpUpModifierType);
- const partyUiMode = isMoveModifier ? PartyUiMode.MOVE_MODIFIER
- : isTmModifier ? PartyUiMode.TM_MODIFIER
- : isRememberMoveModifier ? PartyUiMode.REMEMBER_MOVE_MODIFIER
- : PartyUiMode.MODIFIER;
- const tmMoveId = isTmModifier
- ? (modifierType as TmModifierType).moveId
- : undefined;
- this.scene.ui.setModeWithoutClear(Mode.PARTY, partyUiMode, -1, (slotIndex: integer, option: PartyOption) => {
- if (slotIndex < 6) {
- this.scene.ui.setMode(Mode.MODIFIER_SELECT, this.isPlayer()).then(() => {
- const modifier = !isMoveModifier
- ? !isRememberMoveModifier
- ? modifierType.newModifier(party[slotIndex])
- : modifierType.newModifier(party[slotIndex], option as integer)
- : modifierType.newModifier(party[slotIndex], option - PartyOption.MOVE_1);
- applyModifier(modifier, true);
- });
- } else {
- this.scene.ui.setMode(Mode.MODIFIER_SELECT, this.isPlayer(), typeOptions, modifierSelectCallback, this.getRerollCost(typeOptions, this.scene.lockModifierTiers));
- }
- }, pokemonModifierType.selectFilter, modifierType instanceof PokemonMoveModifierType ? (modifierType as PokemonMoveModifierType).moveSelectFilter : undefined, tmMoveId, isPpRestoreModifier);
- }
- } else {
- applyModifier(modifierType.newModifier());
- }
-
- return !cost;
- };
- this.scene.ui.setMode(Mode.MODIFIER_SELECT, this.isPlayer(), typeOptions, modifierSelectCallback, this.getRerollCost(typeOptions, this.scene.lockModifierTiers));
- }
-
- updateSeed(): void {
- this.scene.resetSeed();
- }
-
- isPlayer(): boolean {
- return true;
- }
-
- getRerollCost(typeOptions: ModifierTypeOption[], lockRarities: boolean): integer {
- let baseValue = 0;
- if (lockRarities) {
- const tierValues = [50, 125, 300, 750, 2000];
- for (const opt of typeOptions) {
- baseValue += tierValues[opt.type.tier];
- }
- } else {
- baseValue = 250;
- }
- const multiplier = !isNullOrUndefined(this.customModifierSettings?.rerollMultiplier) ? this.customModifierSettings.rerollMultiplier : 1;
- return Math.min(Math.ceil(this.scene.currentBattle.waveIndex / 10) * baseValue * Math.pow(2, this.rerollCount) * multiplier, Number.MAX_SAFE_INTEGER);
- }
-
- getPoolType(): ModifierPoolType {
- return ModifierPoolType.PLAYER;
- }
-
- getModifierTypeOptions(modifierCount: integer): ModifierTypeOption[] {
- return getPlayerModifierTypeOptions(modifierCount, this.scene.getParty(), this.scene.lockModifierTiers ? this.modifierTiers : undefined, this.customModifierSettings);
- }
-
- addModifier(modifier: Modifier): Promise {
- return this.scene.addModifier(modifier, false, true);
- }
-}
diff --git a/src/pipelines/sprite.ts b/src/pipelines/sprite.ts
index a61d321c765b..741c31183d42 100644
--- a/src/pipelines/sprite.ts
+++ b/src/pipelines/sprite.ts
@@ -4,7 +4,6 @@ import Pokemon from "../field/pokemon";
import Trainer from "../field/trainer";
import FieldSpritePipeline from "./field-sprite";
import * as Utils from "../utils";
-import MysteryEncounterIntroVisuals from "../field/mystery-encounter-intro";
const spriteFragShader = `
#ifdef GL_FRAGMENT_PRECISION_HIGH
@@ -354,7 +353,7 @@ export default class SpritePipeline extends FieldSpritePipeline {
const ignoreFieldPos = data["ignoreFieldPos"] as boolean;
const ignoreOverride = data["ignoreOverride"] as boolean;
- const isEntityObj = sprite.parentContainer instanceof Pokemon || sprite.parentContainer instanceof Trainer || sprite.parentContainer instanceof MysteryEncounterIntroVisuals;
+ const isEntityObj = sprite.parentContainer instanceof Pokemon || sprite.parentContainer instanceof Trainer;
const field = isEntityObj ? sprite.parentContainer.parentContainer : sprite.parentContainer;
const position = isEntityObj
? [ sprite.parentContainer.x, sprite.parentContainer.y ]
@@ -449,7 +448,7 @@ export default class SpritePipeline extends FieldSpritePipeline {
const hasShadow = sprite.pipelineData["hasShadow"] as boolean;
if (hasShadow) {
- const isEntityObj = sprite.parentContainer instanceof Pokemon || sprite.parentContainer instanceof Trainer || sprite.parentContainer instanceof MysteryEncounterIntroVisuals;
+ const isEntityObj = sprite.parentContainer instanceof Pokemon || sprite.parentContainer instanceof Trainer;
const field = isEntityObj ? sprite.parentContainer.parentContainer : sprite.parentContainer;
const fieldScaleRatio = field.scale / 6;
const baseY = (isEntityObj
diff --git a/src/system/game-data.ts b/src/system/game-data.ts
index 6fd6afef4d32..f260f6263240 100644
--- a/src/system/game-data.ts
+++ b/src/system/game-data.ts
@@ -40,8 +40,6 @@ import { GameDataType } from "#enums/game-data-type";
import { Moves } from "#enums/moves";
import { PlayerGender } from "#enums/player-gender";
import { Species } from "#enums/species";
-import { MysteryEncounterFlags } from "../data/mystery-encounter-flags";
-import MysteryEncounter from "../data/mystery-encounter";
export const defaultStarterSpecies: Species[] = [
Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE,
@@ -73,18 +71,20 @@ export function getDataTypeKey(dataType: GameDataType, slotId: integer = 0): str
return "tutorials";
case GameDataType.SEEN_DIALOGUES:
return "seenDialogues";
+ case GameDataType.RUN_HISTORY:
+ return "runHistory";
}
}
export function encrypt(data: string, bypassLogin: boolean): string {
return (bypassLogin
- ? (data: string) => btoa(encodeURIComponent(data))
+ ? (data: string) => btoa(data)
: (data: string) => AES.encrypt(data, saveKey))(data);
}
export function decrypt(data: string, bypassLogin: boolean): string {
return (bypassLogin
- ? (data: string) => decodeURIComponent(atob(data))
+ ? (data: string) => atob(data)
: (data: string) => AES.decrypt(data, saveKey).toString(enc.Utf8))(data);
}
@@ -95,6 +95,7 @@ interface SystemSaveData {
dexData: DexData;
starterData: StarterData;
gameStats: GameStats;
+ runHistory: RunHistoryData;
unlocks: Unlocks;
achvUnlocks: AchvUnlocks;
voucherUnlocks: VoucherUnlocks;
@@ -121,11 +122,18 @@ export interface SessionSaveData {
waveIndex: integer;
battleType: BattleType;
trainer: TrainerData;
- mysteryEncounter: MysteryEncounter;
gameVersion: string;
timestamp: integer;
challenges: ChallengeData[];
- mysteryEncounterFlags: MysteryEncounterFlags;
+}
+
+export interface RunHistoryData {
+ [key: integer]: RunEntries;
+}
+
+export interface RunEntries {
+ entry: SessionSaveData;
+ victory: boolean;
}
interface Unlocks {
@@ -287,7 +295,7 @@ export class GameData {
public starterData: StarterData;
public gameStats: GameStats;
-
+ public runHistory: RunHistoryData;
public unlocks: Unlocks;
public achvUnlocks: AchvUnlocks;
@@ -306,6 +314,7 @@ export class GameData {
this.trainerId = Utils.randInt(65536);
this.secretId = Utils.randInt(65536);
this.starterData = {};
+ this.runHistory = {};
this.gameStats = new GameStats();
this.unlocks = {
[Unlockables.ENDLESS_MODE]: false,
@@ -332,6 +341,7 @@ export class GameData {
trainerId: this.trainerId,
secretId: this.secretId,
gender: this.gender,
+ runHistory: this.runHistory,
dexData: this.dexData,
starterData: this.starterData,
gameStats: this.gameStats,
@@ -436,6 +446,11 @@ export class GameData {
localStorage.setItem(`data_${loggedInUser.username}`, encrypt(systemDataStr, bypassLogin));
+ if (!localStorage.hasOwnProperty(`runHistoryData_${loggedInUser.username}`)) {
+ localStorage.setItem(`runHistoryData_${loggedInUser.username}`, encrypt("", true));
+ }
+
+
/*const versions = [ this.scene.game.config.gameVersion, data.gameVersion || '0.0.0' ];
if (versions[0] !== versions[1]) {
@@ -840,9 +855,7 @@ export class GameData {
trainer: scene.currentBattle.battleType === BattleType.TRAINER ? new TrainerData(scene.currentBattle.trainer) : null,
gameVersion: scene.game.config.gameVersion,
timestamp: new Date().getTime(),
- challenges: scene.gameMode.challenges.map(c => new ChallengeData(c)),
- mysteryEncounter: scene.currentBattle.mysteryEncounter,
- mysteryEncounterFlags: scene.mysteryEncounterFlags
+ challenges: scene.gameMode.challenges.map(c => new ChallengeData(c))
} as SessionSaveData;
}
@@ -933,14 +946,11 @@ export class GameData {
scene.score = sessionData.score;
scene.updateScoreText();
- scene.mysteryEncounterFlags = sessionData?.mysteryEncounterFlags ? sessionData?.mysteryEncounterFlags : new MysteryEncounterFlags(null);
-
scene.newArena(sessionData.arena.biome);
const battleType = sessionData.battleType || 0;
const trainerConfig = sessionData.trainer ? trainerConfigs[sessionData.trainer.trainerType] : null;
- const mysteryEncounterConfig = sessionData?.mysteryEncounter;
- const battle = scene.newBattle(sessionData.waveIndex, battleType, sessionData.trainer, battleType === BattleType.TRAINER ? trainerConfig?.doubleOnly || sessionData.trainer?.variant === TrainerVariant.DOUBLE : sessionData.enemyParty.length > 1, mysteryEncounterConfig);
+ const battle = scene.newBattle(sessionData.waveIndex, battleType, sessionData.trainer, battleType === BattleType.TRAINER ? trainerConfig?.doubleOnly || sessionData.trainer?.variant === TrainerVariant.DOUBLE : sessionData.enemyParty.length > 1);
battle.enemyLevels = sessionData.enemyParty.map(p => p.level);
scene.arena.init();
@@ -1154,16 +1164,70 @@ export class GameData {
return ret;
}
- if (k === "mysteryEncounter") {
- return new MysteryEncounter(v);
- }
+ return v;
+ }) as SessionSaveData;
+ }
- if (k === "mysteryEncounterFlags") {
- return new MysteryEncounterFlags(v);
+ public async getRunHistoryData(scene: BattleScene): Promise