Skip to content

feat(tappable): add pokemon tappables and Golbat API support #1277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
unseenmagik wants to merge 1 commit into from
Closed

feat(tappable): add pokemon tappables and Golbat API support #1277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion config/custom-environment-variables.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1294,6 +1294,10 @@
"xlCandy": {
"__name": "DEFAULT_FILTERS_TAPPABLES_XL_CANDY",
"__format": "boolean"
},
"pokemon": {
"__name": "DEFAULT_FILTERS_TAPPABLES_POKEMON",
"__format": "boolean"
}
},
"pokemon": {
Expand Down Expand Up @@ -2479,4 +2483,4 @@
}
}
}
}
}
3 changes: 2 additions & 1 deletion config/default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,8 @@
"items": true,
"megaEnergy": true,
"candy": true,
"xlCandy": true
"xlCandy": true,
"pokemon": true
},
"pokemon": {
"enabled": false,
Expand Down
1 change: 1 addition & 0 deletions packages/logger/lib/tags.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ const TAGS = /** @type {const} */ ({
pokestops: chalk.hex('#e91e63')('[POKESTOPS]'),
gyms: chalk.hex('#9c27b0')('[GYMS]'),
stations: chalk.hex('#00bcd4')('[STATIONS]'),
tappables: chalk.hex('#cddc39')('[TAPPABLES]'),
weather: chalk.hex('#3f51b5')('[WEATHER]'),
available: chalk.hex('#2196f3')('[AVAILABLE]'),
scanAreas: chalk.hex('#00bcd4')('[SCAN AREAS]'),
Expand Down
3 changes: 3 additions & 0 deletions packages/types/lib/scanner.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,9 @@ export interface Tappable {
type: string
fort_id: string | null
item_id: number | null
pokemon_id?: number | null
form?: number | null
costume?: number | null
reward_type?: string | null
reward_pokemon_id?: number | null
temp_evolution?: number | null
Expand Down
2 changes: 2 additions & 0 deletions server/src/filters/builder/tappable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ function buildTappables(perms, defaults) {
filters[key] = new BaseFilter(defaults.xlCandy)
} else if (key.startsWith('m')) {
filters[key] = new BaseFilter(defaults.megaEnergy)
} else if (Number.isInteger(Number(key.charAt(0)))) {
filters[key] = new BaseFilter(defaults.pokemon)
} else {
filters[key] = new BaseFilter(defaults.items)
}
Expand Down
3 changes: 3 additions & 0 deletions server/src/graphql/typeDefs/scanner.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,9 @@ type Tappable {
type: String
fort_id: String
item_id: Int
pokemon_id: Int
form: Int
costume: Int
reward_type: String
reward_pokemon_id: Int
temp_evolution: Int
Expand Down
Loading
Loading