feat: quest bread mode

Author: Mygod

packages/types/lib/scanner.d.ts

@@ -139,6 +139,8 @@ export interface Quest {
   quest_form_id: number
   quest_gender_id: Gender
   quest_costume_id: number
+  quest_location_card: number
+  quest_bread_mode: number
   quest_shiny: number
   quest_shiny_probability?: number
   mega_pokemon_id: number

server/src/graphql/typeDefs/map.graphql

@@ -123,6 +123,8 @@ type SearchQuest {
   quest_form_id: Int
   quest_gender_id: Int
   quest_costume_id: Int
+  quest_location_card: Int
+  quest_bread_mode: Int
   quest_item_id: Int
   quest_reward_type: Int
   quest_shiny: Int

server/src/graphql/typeDefs/scanner.graphql

@@ -83,6 +83,8 @@ type Quest {
   quest_form_id: Int
   quest_gender_id: Int
   quest_costume_id: Int
+  quest_location_card: Int
+  quest_bread_mode: Int
   quest_shiny: Int
   quest_shiny_probability: Float
   mega_pokemon_id: Int

server/src/models/Pokestop.js

@@ -186,9 +186,9 @@ class Pokestop extends Model {
     Pokestop.joinIncident(query, hasMultiInvasions, isMad, multiInvasionMs)
     applyManualIdFilter(query, {
       manualId: args.filters.onlyManualId,
-      latColumn: isMad ? 'latitude' : 'lat',
-      lonColumn: isMad ? 'longitude' : 'lon',
-      idColumn: isMad ? 'pokestop.pokestop_id' : 'id',
+      latColumn: isMad ? 'latitude' : 'pokestop.lat',
+      lonColumn: isMad ? 'longitude' : 'pokestop.lon',
+      idColumn: isMad ? 'pokestop.pokestop_id' : 'pokestop.id',
       bounds: {
         minLat: args.minLat,
         maxLat: args.maxLat,
@@ -936,6 +936,8 @@ class Pokestop extends Model {
                   'quest_gender_id',
                   'quest_shiny',
                   'quest_shiny_probability',
+                  'quest_location_card',
+                  'quest_bread_mode',
                 )
                 break
               case 9:
@@ -1684,6 +1686,8 @@ class Pokestop extends Model {
           break
         case 7:
           Object.keys(info).forEach((x) => (quest[`quest_${x}`] = info[x]))
+          quest.quest_location_card = quest.quest_location_card || 0
+          quest.quest_bread_mode = quest.quest_bread_mode || 0
           break
         case 9:
           Object.keys(info).forEach((x) => (quest[`xl_candy_${x}`] = info[x]))

src/features/pokestop/usePokestopMarker.js

@@ -263,6 +263,7 @@ export function usePokestopMarker({
         quest_gender_id,
         quest_costume_id,
         quest_shiny,
+        quest_bread_mode = 0,
         key,
       } = quest
       switch (quest_reward_type) {
@@ -308,6 +309,7 @@ export function usePokestopMarker({
               quest_costume_id,
               0,
               !!quest_shiny,
+              quest_bread_mode,
             ),
           })
           break

src/services/queries/pokestop.js

@@ -42,6 +42,8 @@ const quest = gql`
       quest_form_id
       quest_gender_id
       quest_costume_id
+      quest_location_card
+      quest_bread_mode
       quest_shiny
       quest_shiny_probability
       mega_pokemon_id

src/services/queries/search.js

@@ -171,6 +171,8 @@ export const QUESTS = gql`
       quest_form_id
       quest_gender_id
       quest_costume_id
+      quest_location_card
+      quest_bread_mode
       quest_shiny
       quest_item_id
       quest_reward_type

src/utils/getRewardInfo.js

@@ -8,6 +8,7 @@ export function getRewardInfo({
   quest_form_id,
   quest_gender_id,
   quest_costume_id,
+  quest_bread_mode = 0,
   quest_shiny,
   quest_item_id,
   item_amount,
@@ -60,6 +61,7 @@ export function getRewardInfo({
         quest_costume_id,
         0,
         !!quest_shiny,
+        quest_bread_mode,
       )
       break
     case 9: