Skip to content

Commit 51c3c35

Browse files
committed
chore: remove unused ditto_form
1 parent 5490c12 commit 51c3c35

File tree

7 files changed

+2
-14
lines changed

7 files changed

+2
-14
lines changed

packages/types/lib/scanner.d.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,6 @@ export interface Pokemon {
229229
costume: number
230230
gender: Gender
231231
display_pokemon_id: number
232-
ditto_form: number
233232
weight: number
234233
height: number
235234
size: number

server/src/filters/pokemon/Backend.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -430,16 +430,9 @@ class PkmnBackend {
430430
expire_timestamp_verified: !!pokemon.expire_timestamp_verified,
431431
updated: pokemon.updated,
432432
display_pokemon_id: pokemon.display_pokemon_id,
433-
ditto_form: pokemon.ditto_form,
434433
seen_type: pokemon.seen_type,
435434
changed: !!pokemon.changed,
436435
}
437-
if (result.pokemon_id === 132 && !result.ditto_form) {
438-
result.ditto_form = result.form
439-
result.form =
440-
state.event.masterfile.pokemon[result.display_pokemon_id]
441-
?.defaultFormId || 0
442-
}
443436
if (!result.seen_type) {
444437
if (result.spawn_id === null) {
445438
result.seen_type = result.pokestop_id ? 'nearby_stop' : 'nearby_cell'

server/src/graphql/typeDefs/scanner.graphql

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ type Pokemon {
165165
costume: Int
166166
gender: Int
167167
display_pokemon_id: Int
168-
ditto_form: Int
169168
weight: Float
170169
height: Float
171170
size: Float

server/src/models/Pokemon.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ class Pokemon extends Model {
5757
'pokemon.gender',
5858
'pokemon.costume',
5959
'pokemon_display.pokemon AS display_pokemon_id',
60-
'pokemon_display.form AS ditto_form',
6160
'weather_boosted_condition AS weather',
6261
raw('IF(calc_endminsec IS NOT NULL, 1, NULL)').as(
6362
'expire_timestamp_verified',

src/features/pokemon/PokemonPopup.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ const Header = ({
229229
const filters = useStorage((s) => s.filters)
230230

231231
const [anchorEl, setAnchorEl] = React.useState(null)
232-
const { id, pokemon_id, form, ditto_form, display_pokemon_id } = pokemon
232+
const { id, pokemon_id, form, display_pokemon_id } = pokemon
233233

234234
const handleClick = (event) => {
235235
setAnchorEl(event.currentTarget)
@@ -295,7 +295,7 @@ const Header = ({
295295
<Typography variant={pokeName.length > 8 ? 'h6' : 'h5'}>
296296
{pokeName}
297297
</Typography>
298-
{ditto_form !== null && display_pokemon_id ? (
298+
{pokemon_id === 132 && display_pokemon_id ? (
299299
<Typography variant="caption">
300300
({t(`poke_${display_pokemon_id}`)})
301301
</Typography>

src/features/tutorial/data.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ export const tutorialData = /** @type {const} */ ({
88
gender: 1,
99
expire_timestamp_verified: 1,
1010
display_pokemon_id: null,
11-
ditto_form: null,
1211
iv: 62.22,
1312
cp: 111,
1413
level: 7,

src/services/queries/pokemon.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ const core = gql`
1616
expire_timestamp_verified
1717
updated
1818
display_pokemon_id
19-
ditto_form
2019
seen_type
2120
}
2221
`

0 commit comments

Comments
 (0)