diff --git a/pokemon-go-protobuf-types.cabal b/pokemon-go-protobuf-types.cabal --- a/pokemon-go-protobuf-types.cabal +++ b/pokemon-go-protobuf-types.cabal @@ -1,5 +1,5 @@ name: pokemon-go-protobuf-types -version: 0.1.1 +version: 0.1.2 synopsis: Haskell types for the Pokemon Go protobuf protocol. homepage: https://github.com/relrod/pokemon-go-protobuf-types license: BSD3 diff --git a/src/Proto/POGOProtos/Data/Battle/BattleAction.hs b/src/Proto/POGOProtos/Data/Battle/BattleAction.hs --- a/src/Proto/POGOProtos/Data/Battle/BattleAction.hs +++ b/src/Proto/POGOProtos/Data/Battle/BattleAction.hs @@ -249,7 +249,7 @@ (Data.ProtoLens.PlainField Data.ProtoLens.Optional targetIndex) activePokemonId__field_descriptor = Data.ProtoLens.FieldDescriptor "active_pokemon_id" - (Data.ProtoLens.UInt64Field :: + (Data.ProtoLens.Fixed64Field :: Data.ProtoLens.FieldTypeDescriptor Data.Word.Word64) (Data.ProtoLens.PlainField Data.ProtoLens.Optional activePokemonId) playerJoined__field_descriptor @@ -285,7 +285,7 @@ (Data.ProtoLens.OptionalField maybe'playerLeft) targetPokemonId__field_descriptor = Data.ProtoLens.FieldDescriptor "target_pokemon_id" - (Data.ProtoLens.UInt64Field :: + (Data.ProtoLens.Fixed64Field :: Data.ProtoLens.FieldTypeDescriptor Data.Word.Word64) (Data.ProtoLens.PlainField Data.ProtoLens.Optional targetPokemonId) in diff --git a/src/Proto/POGOProtos/Networking/Envelopes/RequestEnvelope.hs b/src/Proto/POGOProtos/Networking/Envelopes/RequestEnvelope.hs --- a/src/Proto/POGOProtos/Networking/Envelopes/RequestEnvelope.hs +++ b/src/Proto/POGOProtos/Networking/Envelopes/RequestEnvelope.hs @@ -24,8 +24,7 @@ _RequestEnvelope'requests :: [Proto.POGOProtos.Networking.Requests.Request.Request], _RequestEnvelope'unknown6 :: - Prelude.Maybe - Proto.POGOProtos.Networking.Envelopes.Unknown6.Unknown6, + [Proto.POGOProtos.Networking.Envelopes.Unknown6.Unknown6], _RequestEnvelope'latitude :: Prelude.Double, _RequestEnvelope'longitude :: Prelude.Double, _RequestEnvelope'altitude :: Prelude.Double, @@ -65,22 +64,11 @@ (\ x__ y__ -> x__{_RequestEnvelope'requests = y__}) type instance Data.ProtoLens.Field "unknown6" RequestEnvelope = - Proto.POGOProtos.Networking.Envelopes.Unknown6.Unknown6 + [Proto.POGOProtos.Networking.Envelopes.Unknown6.Unknown6] instance Data.ProtoLens.HasField "unknown6" RequestEnvelope RequestEnvelope where field _ - = (Prelude..) maybe'unknown6 - (Data.ProtoLens.maybeLens Data.Default.Class.def) - -type instance Data.ProtoLens.Field "maybe'unknown6" RequestEnvelope - = - Prelude.Maybe - Proto.POGOProtos.Networking.Envelopes.Unknown6.Unknown6 - -instance Data.ProtoLens.HasField "maybe'unknown6" RequestEnvelope - RequestEnvelope where - field _ = Lens.Family2.Unchecked.lens _RequestEnvelope'unknown6 (\ x__ y__ -> x__{_RequestEnvelope'unknown6 = y__}) @@ -163,8 +151,7 @@ = RequestEnvelope{_RequestEnvelope'statusCode = Data.ProtoLens.fieldDefault, _RequestEnvelope'requestId = Data.ProtoLens.fieldDefault, - _RequestEnvelope'requests = [], - _RequestEnvelope'unknown6 = Prelude.Nothing, + _RequestEnvelope'requests = [], _RequestEnvelope'unknown6 = [], _RequestEnvelope'latitude = Data.ProtoLens.fieldDefault, _RequestEnvelope'longitude = Data.ProtoLens.fieldDefault, _RequestEnvelope'altitude = Data.ProtoLens.fieldDefault, @@ -195,7 +182,7 @@ (Data.ProtoLens.MessageField :: Data.ProtoLens.FieldTypeDescriptor Proto.POGOProtos.Networking.Envelopes.Unknown6.Unknown6) - (Data.ProtoLens.OptionalField maybe'unknown6) + (Data.ProtoLens.RepeatedField Data.ProtoLens.Unpacked unknown6) latitude__field_descriptor = Data.ProtoLens.FieldDescriptor "latitude" (Data.ProtoLens.DoubleField :: @@ -448,17 +435,6 @@ maybe'token = Data.ProtoLens.field (Data.ProtoLens.ProxySym :: Data.ProtoLens.ProxySym "maybe'token") - -maybe'unknown6 :: - forall msg msg' . - Data.ProtoLens.HasField "maybe'unknown6" msg msg' => - Lens.Family2.Lens msg msg' - (Data.ProtoLens.Field "maybe'unknown6" msg) - (Data.ProtoLens.Field "maybe'unknown6" msg') -maybe'unknown6 - = Data.ProtoLens.field - (Data.ProtoLens.ProxySym :: - Data.ProtoLens.ProxySym "maybe'unknown6") provider :: forall msg msg' . Data.ProtoLens.HasField "provider" msg msg' => diff --git a/src/Proto/POGOProtos/Networking/Envelopes/ResponseEnvelope.hs b/src/Proto/POGOProtos/Networking/Envelopes/ResponseEnvelope.hs --- a/src/Proto/POGOProtos/Networking/Envelopes/ResponseEnvelope.hs +++ b/src/Proto/POGOProtos/Networking/Envelopes/ResponseEnvelope.hs @@ -23,8 +23,7 @@ _ResponseEnvelope'requestId :: Data.Word.Word64, _ResponseEnvelope'apiUrl :: Data.Text.Text, _ResponseEnvelope'unknown6 :: - Prelude.Maybe - Proto.POGOProtos.Networking.Envelopes.Unknown6Response.Unknown6Response, + [Proto.POGOProtos.Networking.Envelopes.Unknown6Response.Unknown6Response], _ResponseEnvelope'authTicket :: Prelude.Maybe Proto.POGOProtos.Networking.Envelopes.AuthTicket.AuthTicket, @@ -60,22 +59,11 @@ (\ x__ y__ -> x__{_ResponseEnvelope'apiUrl = y__}) type instance Data.ProtoLens.Field "unknown6" ResponseEnvelope = - Proto.POGOProtos.Networking.Envelopes.Unknown6Response.Unknown6Response + [Proto.POGOProtos.Networking.Envelopes.Unknown6Response.Unknown6Response] instance Data.ProtoLens.HasField "unknown6" ResponseEnvelope ResponseEnvelope where field _ - = (Prelude..) maybe'unknown6 - (Data.ProtoLens.maybeLens Data.Default.Class.def) - -type instance - Data.ProtoLens.Field "maybe'unknown6" ResponseEnvelope = - Prelude.Maybe - Proto.POGOProtos.Networking.Envelopes.Unknown6Response.Unknown6Response - -instance Data.ProtoLens.HasField "maybe'unknown6" ResponseEnvelope - ResponseEnvelope where - field _ = Lens.Family2.Unchecked.lens _ResponseEnvelope'unknown6 (\ x__ y__ -> x__{_ResponseEnvelope'unknown6 = y__}) @@ -123,7 +111,7 @@ Data.ProtoLens.fieldDefault, _ResponseEnvelope'requestId = Data.ProtoLens.fieldDefault, _ResponseEnvelope'apiUrl = Data.ProtoLens.fieldDefault, - _ResponseEnvelope'unknown6 = Prelude.Nothing, + _ResponseEnvelope'unknown6 = [], _ResponseEnvelope'authTicket = Prelude.Nothing, _ResponseEnvelope'returns = [], _ResponseEnvelope'error = Data.ProtoLens.fieldDefault} @@ -150,7 +138,7 @@ (Data.ProtoLens.MessageField :: Data.ProtoLens.FieldTypeDescriptor Proto.POGOProtos.Networking.Envelopes.Unknown6Response.Unknown6Response) - (Data.ProtoLens.OptionalField maybe'unknown6) + (Data.ProtoLens.RepeatedField Data.ProtoLens.Unpacked unknown6) authTicket__field_descriptor = Data.ProtoLens.FieldDescriptor "auth_ticket" (Data.ProtoLens.MessageField :: @@ -295,17 +283,6 @@ = Data.ProtoLens.field (Data.ProtoLens.ProxySym :: Data.ProtoLens.ProxySym "maybe'authTicket") - -maybe'unknown6 :: - forall msg msg' . - Data.ProtoLens.HasField "maybe'unknown6" msg msg' => - Lens.Family2.Lens msg msg' - (Data.ProtoLens.Field "maybe'unknown6" msg) - (Data.ProtoLens.Field "maybe'unknown6" msg') -maybe'unknown6 - = Data.ProtoLens.field - (Data.ProtoLens.ProxySym :: - Data.ProtoLens.ProxySym "maybe'unknown6") requestId :: forall msg msg' . Data.ProtoLens.HasField "requestId" msg msg' => diff --git a/src/Proto/POGOProtos/Networking/Envelopes/Unknown6.hs b/src/Proto/POGOProtos/Networking/Envelopes/Unknown6.hs --- a/src/Proto/POGOProtos/Networking/Envelopes/Unknown6.hs +++ b/src/Proto/POGOProtos/Networking/Envelopes/Unknown6.hs @@ -15,17 +15,18 @@ import qualified Data.Map import qualified Data.ByteString -data Unknown6 = Unknown6{_Unknown6'unknown1 :: Data.Int.Int32, +data Unknown6 = Unknown6{_Unknown6'requestType :: Data.Int.Int32, _Unknown6'unknown2 :: Prelude.Maybe Unknown6'Unknown2} deriving (Prelude.Show, Prelude.Eq) -type instance Data.ProtoLens.Field "unknown1" Unknown6 = +type instance Data.ProtoLens.Field "requestType" Unknown6 = Data.Int.Int32 -instance Data.ProtoLens.HasField "unknown1" Unknown6 Unknown6 where +instance Data.ProtoLens.HasField "requestType" Unknown6 Unknown6 + where field _ - = Lens.Family2.Unchecked.lens _Unknown6'unknown1 - (\ x__ y__ -> x__{_Unknown6'unknown1 = y__}) + = Lens.Family2.Unchecked.lens _Unknown6'requestType + (\ x__ y__ -> x__{_Unknown6'requestType = y__}) type instance Data.ProtoLens.Field "unknown2" Unknown6 = Unknown6'Unknown2 @@ -46,16 +47,16 @@ instance Data.Default.Class.Default Unknown6 where def - = Unknown6{_Unknown6'unknown1 = Data.ProtoLens.fieldDefault, + = Unknown6{_Unknown6'requestType = Data.ProtoLens.fieldDefault, _Unknown6'unknown2 = Prelude.Nothing} instance Data.ProtoLens.Message Unknown6 where descriptor - = let unknown1__field_descriptor - = Data.ProtoLens.FieldDescriptor "unknown1" + = let requestType__field_descriptor + = Data.ProtoLens.FieldDescriptor "request_type" (Data.ProtoLens.Int32Field :: Data.ProtoLens.FieldTypeDescriptor Data.Int.Int32) - (Data.ProtoLens.PlainField Data.ProtoLens.Optional unknown1) + (Data.ProtoLens.PlainField Data.ProtoLens.Optional requestType) unknown2__field_descriptor = Data.ProtoLens.FieldDescriptor "unknown2" (Data.ProtoLens.MessageField :: @@ -64,10 +65,10 @@ in Data.ProtoLens.MessageDescriptor (Data.Map.fromList - [(Data.ProtoLens.Tag 1, unknown1__field_descriptor), + [(Data.ProtoLens.Tag 1, requestType__field_descriptor), (Data.ProtoLens.Tag 2, unknown2__field_descriptor)]) (Data.Map.fromList - [("unknown1", unknown1__field_descriptor), + [("request_type", requestType__field_descriptor), ("unknown2", unknown2__field_descriptor)]) data Unknown6'Unknown2 = Unknown6'Unknown2{_Unknown6'Unknown2'unknown1 @@ -111,6 +112,14 @@ = Data.ProtoLens.field (Data.ProtoLens.ProxySym :: Data.ProtoLens.ProxySym "maybe'unknown2") + +requestType :: + forall msg msg' . Data.ProtoLens.HasField "requestType" msg msg' => + Lens.Family2.Lens msg msg' (Data.ProtoLens.Field "requestType" msg) + (Data.ProtoLens.Field "requestType" msg') +requestType + = Data.ProtoLens.field + (Data.ProtoLens.ProxySym :: Data.ProtoLens.ProxySym "requestType") unknown1 :: forall msg msg' . Data.ProtoLens.HasField "unknown1" msg msg' => diff --git a/src/Proto/POGOProtos/Networking/Envelopes/Unknown6Response.hs b/src/Proto/POGOProtos/Networking/Envelopes/Unknown6Response.hs --- a/src/Proto/POGOProtos/Networking/Envelopes/Unknown6Response.hs +++ b/src/Proto/POGOProtos/Networking/Envelopes/Unknown6Response.hs @@ -14,21 +14,23 @@ import qualified Data.Word import qualified Data.Map import qualified Data.ByteString +import qualified Proto.POGOProtos.Data.Player.Currency +import qualified Proto.POGOProtos.Inventory.Item.ItemData -data Unknown6Response = Unknown6Response{_Unknown6Response'unknown1 +data Unknown6Response = Unknown6Response{_Unknown6Response'responseType :: Data.Int.Int32, _Unknown6Response'unknown2 :: Prelude.Maybe Unknown6Response'Unknown2} deriving (Prelude.Show, Prelude.Eq) -type instance Data.ProtoLens.Field "unknown1" Unknown6Response = - Data.Int.Int32 +type instance Data.ProtoLens.Field "responseType" Unknown6Response + = Data.Int.Int32 -instance Data.ProtoLens.HasField "unknown1" Unknown6Response +instance Data.ProtoLens.HasField "responseType" Unknown6Response Unknown6Response where field _ - = Lens.Family2.Unchecked.lens _Unknown6Response'unknown1 - (\ x__ y__ -> x__{_Unknown6Response'unknown1 = y__}) + = Lens.Family2.Unchecked.lens _Unknown6Response'responseType + (\ x__ y__ -> x__{_Unknown6Response'responseType = y__}) type instance Data.ProtoLens.Field "unknown2" Unknown6Response = Unknown6Response'Unknown2 @@ -51,17 +53,17 @@ instance Data.Default.Class.Default Unknown6Response where def - = Unknown6Response{_Unknown6Response'unknown1 = + = Unknown6Response{_Unknown6Response'responseType = Data.ProtoLens.fieldDefault, _Unknown6Response'unknown2 = Prelude.Nothing} instance Data.ProtoLens.Message Unknown6Response where descriptor - = let unknown1__field_descriptor - = Data.ProtoLens.FieldDescriptor "unknown1" + = let responseType__field_descriptor + = Data.ProtoLens.FieldDescriptor "response_type" (Data.ProtoLens.Int32Field :: Data.ProtoLens.FieldTypeDescriptor Data.Int.Int32) - (Data.ProtoLens.PlainField Data.ProtoLens.Optional unknown1) + (Data.ProtoLens.PlainField Data.ProtoLens.Optional responseType) unknown2__field_descriptor = Data.ProtoLens.FieldDescriptor "unknown2" (Data.ProtoLens.MessageField :: @@ -70,14 +72,21 @@ in Data.ProtoLens.MessageDescriptor (Data.Map.fromList - [(Data.ProtoLens.Tag 1, unknown1__field_descriptor), + [(Data.ProtoLens.Tag 1, responseType__field_descriptor), (Data.ProtoLens.Tag 2, unknown2__field_descriptor)]) (Data.Map.fromList - [("unknown1", unknown1__field_descriptor), + [("response_type", responseType__field_descriptor), ("unknown2", unknown2__field_descriptor)]) data Unknown6Response'Unknown2 = Unknown6Response'Unknown2{_Unknown6Response'Unknown2'unknown1 - :: Data.Word.Word64} + :: Data.Word.Word64, + _Unknown6Response'Unknown2'items :: + [Unknown6Response'Unknown2'StoreItem], + _Unknown6Response'Unknown2'playerCurrencies + :: + [Proto.POGOProtos.Data.Player.Currency.Currency], + _Unknown6Response'Unknown2'unknown4 :: + Data.Text.Text} deriving (Prelude.Show, Prelude.Eq) type instance @@ -90,9 +99,45 @@ = Lens.Family2.Unchecked.lens _Unknown6Response'Unknown2'unknown1 (\ x__ y__ -> x__{_Unknown6Response'Unknown2'unknown1 = y__}) +type instance + Data.ProtoLens.Field "items" Unknown6Response'Unknown2 = + [Unknown6Response'Unknown2'StoreItem] + +instance Data.ProtoLens.HasField "items" Unknown6Response'Unknown2 + Unknown6Response'Unknown2 where + field _ + = Lens.Family2.Unchecked.lens _Unknown6Response'Unknown2'items + (\ x__ y__ -> x__{_Unknown6Response'Unknown2'items = y__}) + +type instance + Data.ProtoLens.Field "playerCurrencies" Unknown6Response'Unknown2 = + [Proto.POGOProtos.Data.Player.Currency.Currency] + +instance Data.ProtoLens.HasField "playerCurrencies" + Unknown6Response'Unknown2 Unknown6Response'Unknown2 where + field _ + = Lens.Family2.Unchecked.lens + _Unknown6Response'Unknown2'playerCurrencies + (\ x__ y__ -> + x__{_Unknown6Response'Unknown2'playerCurrencies = y__}) + +type instance + Data.ProtoLens.Field "unknown4" Unknown6Response'Unknown2 = + Data.Text.Text + +instance Data.ProtoLens.HasField "unknown4" + Unknown6Response'Unknown2 Unknown6Response'Unknown2 where + field _ + = Lens.Family2.Unchecked.lens _Unknown6Response'Unknown2'unknown4 + (\ x__ y__ -> x__{_Unknown6Response'Unknown2'unknown4 = y__}) + instance Data.Default.Class.Default Unknown6Response'Unknown2 where def = Unknown6Response'Unknown2{_Unknown6Response'Unknown2'unknown1 = + Data.ProtoLens.fieldDefault, + _Unknown6Response'Unknown2'items = [], + _Unknown6Response'Unknown2'playerCurrencies = [], + _Unknown6Response'Unknown2'unknown4 = Data.ProtoLens.fieldDefault} instance Data.ProtoLens.Message Unknown6Response'Unknown2 where @@ -102,12 +147,386 @@ (Data.ProtoLens.UInt64Field :: Data.ProtoLens.FieldTypeDescriptor Data.Word.Word64) (Data.ProtoLens.PlainField Data.ProtoLens.Optional unknown1) + items__field_descriptor + = Data.ProtoLens.FieldDescriptor "items" + (Data.ProtoLens.MessageField :: + Data.ProtoLens.FieldTypeDescriptor + Unknown6Response'Unknown2'StoreItem) + (Data.ProtoLens.RepeatedField Data.ProtoLens.Unpacked items) + playerCurrencies__field_descriptor + = Data.ProtoLens.FieldDescriptor "player_currencies" + (Data.ProtoLens.MessageField :: + Data.ProtoLens.FieldTypeDescriptor + Proto.POGOProtos.Data.Player.Currency.Currency) + (Data.ProtoLens.RepeatedField Data.ProtoLens.Unpacked + playerCurrencies) + unknown4__field_descriptor + = Data.ProtoLens.FieldDescriptor "unknown4" + (Data.ProtoLens.StringField :: + Data.ProtoLens.FieldTypeDescriptor Data.Text.Text) + (Data.ProtoLens.PlainField Data.ProtoLens.Optional unknown4) in Data.ProtoLens.MessageDescriptor (Data.Map.fromList - [(Data.ProtoLens.Tag 1, unknown1__field_descriptor)]) - (Data.Map.fromList [("unknown1", unknown1__field_descriptor)]) + [(Data.ProtoLens.Tag 1, unknown1__field_descriptor), + (Data.ProtoLens.Tag 2, items__field_descriptor), + (Data.ProtoLens.Tag 3, playerCurrencies__field_descriptor), + (Data.ProtoLens.Tag 4, unknown4__field_descriptor)]) + (Data.Map.fromList + [("unknown1", unknown1__field_descriptor), + ("items", items__field_descriptor), + ("player_currencies", playerCurrencies__field_descriptor), + ("unknown4", unknown4__field_descriptor)]) +data Unknown6Response'Unknown2'StoreItem = Unknown6Response'Unknown2'StoreItem{_Unknown6Response'Unknown2'StoreItem'itemId + :: Data.Text.Text, + _Unknown6Response'Unknown2'StoreItem'isIap + :: Prelude.Bool, + _Unknown6Response'Unknown2'StoreItem'currencyToBuy + :: + Prelude.Maybe + Proto.POGOProtos.Data.Player.Currency.Currency, + _Unknown6Response'Unknown2'StoreItem'yieldsCurrency + :: + Prelude.Maybe + Proto.POGOProtos.Data.Player.Currency.Currency, + _Unknown6Response'Unknown2'StoreItem'yieldsItem + :: + Prelude.Maybe + Proto.POGOProtos.Inventory.Item.ItemData.ItemData, + _Unknown6Response'Unknown2'StoreItem'tags + :: + [Unknown6Response'Unknown2'StoreItem'Tag], + _Unknown6Response'Unknown2'StoreItem'unknown7 + :: Data.Int.Int32} + deriving (Prelude.Show, Prelude.Eq) + +type instance + Data.ProtoLens.Field "itemId" Unknown6Response'Unknown2'StoreItem = + Data.Text.Text + +instance Data.ProtoLens.HasField "itemId" + Unknown6Response'Unknown2'StoreItem + Unknown6Response'Unknown2'StoreItem where + field _ + = Lens.Family2.Unchecked.lens + _Unknown6Response'Unknown2'StoreItem'itemId + (\ x__ y__ -> + x__{_Unknown6Response'Unknown2'StoreItem'itemId = y__}) + +type instance + Data.ProtoLens.Field "isIap" Unknown6Response'Unknown2'StoreItem = + Prelude.Bool + +instance Data.ProtoLens.HasField "isIap" + Unknown6Response'Unknown2'StoreItem + Unknown6Response'Unknown2'StoreItem where + field _ + = Lens.Family2.Unchecked.lens + _Unknown6Response'Unknown2'StoreItem'isIap + (\ x__ y__ -> + x__{_Unknown6Response'Unknown2'StoreItem'isIap = y__}) + +type instance + Data.ProtoLens.Field "currencyToBuy" + Unknown6Response'Unknown2'StoreItem + = Proto.POGOProtos.Data.Player.Currency.Currency + +instance Data.ProtoLens.HasField "currencyToBuy" + Unknown6Response'Unknown2'StoreItem + Unknown6Response'Unknown2'StoreItem where + field _ + = (Prelude..) maybe'currencyToBuy + (Data.ProtoLens.maybeLens Data.Default.Class.def) + +type instance + Data.ProtoLens.Field "maybe'currencyToBuy" + Unknown6Response'Unknown2'StoreItem + = Prelude.Maybe Proto.POGOProtos.Data.Player.Currency.Currency + +instance Data.ProtoLens.HasField "maybe'currencyToBuy" + Unknown6Response'Unknown2'StoreItem + Unknown6Response'Unknown2'StoreItem where + field _ + = Lens.Family2.Unchecked.lens + _Unknown6Response'Unknown2'StoreItem'currencyToBuy + (\ x__ y__ -> + x__{_Unknown6Response'Unknown2'StoreItem'currencyToBuy = y__}) + +type instance + Data.ProtoLens.Field "yieldsCurrency" + Unknown6Response'Unknown2'StoreItem + = Proto.POGOProtos.Data.Player.Currency.Currency + +instance Data.ProtoLens.HasField "yieldsCurrency" + Unknown6Response'Unknown2'StoreItem + Unknown6Response'Unknown2'StoreItem where + field _ + = (Prelude..) maybe'yieldsCurrency + (Data.ProtoLens.maybeLens Data.Default.Class.def) + +type instance + Data.ProtoLens.Field "maybe'yieldsCurrency" + Unknown6Response'Unknown2'StoreItem + = Prelude.Maybe Proto.POGOProtos.Data.Player.Currency.Currency + +instance Data.ProtoLens.HasField "maybe'yieldsCurrency" + Unknown6Response'Unknown2'StoreItem + Unknown6Response'Unknown2'StoreItem where + field _ + = Lens.Family2.Unchecked.lens + _Unknown6Response'Unknown2'StoreItem'yieldsCurrency + (\ x__ y__ -> + x__{_Unknown6Response'Unknown2'StoreItem'yieldsCurrency = y__}) + +type instance + Data.ProtoLens.Field "yieldsItem" + Unknown6Response'Unknown2'StoreItem + = Proto.POGOProtos.Inventory.Item.ItemData.ItemData + +instance Data.ProtoLens.HasField "yieldsItem" + Unknown6Response'Unknown2'StoreItem + Unknown6Response'Unknown2'StoreItem where + field _ + = (Prelude..) maybe'yieldsItem + (Data.ProtoLens.maybeLens Data.Default.Class.def) + +type instance + Data.ProtoLens.Field "maybe'yieldsItem" + Unknown6Response'Unknown2'StoreItem + = Prelude.Maybe Proto.POGOProtos.Inventory.Item.ItemData.ItemData + +instance Data.ProtoLens.HasField "maybe'yieldsItem" + Unknown6Response'Unknown2'StoreItem + Unknown6Response'Unknown2'StoreItem where + field _ + = Lens.Family2.Unchecked.lens + _Unknown6Response'Unknown2'StoreItem'yieldsItem + (\ x__ y__ -> + x__{_Unknown6Response'Unknown2'StoreItem'yieldsItem = y__}) + +type instance + Data.ProtoLens.Field "tags" Unknown6Response'Unknown2'StoreItem = + [Unknown6Response'Unknown2'StoreItem'Tag] + +instance Data.ProtoLens.HasField "tags" + Unknown6Response'Unknown2'StoreItem + Unknown6Response'Unknown2'StoreItem where + field _ + = Lens.Family2.Unchecked.lens + _Unknown6Response'Unknown2'StoreItem'tags + (\ x__ y__ -> x__{_Unknown6Response'Unknown2'StoreItem'tags = y__}) + +type instance + Data.ProtoLens.Field "unknown7" Unknown6Response'Unknown2'StoreItem + = Data.Int.Int32 + +instance Data.ProtoLens.HasField "unknown7" + Unknown6Response'Unknown2'StoreItem + Unknown6Response'Unknown2'StoreItem where + field _ + = Lens.Family2.Unchecked.lens + _Unknown6Response'Unknown2'StoreItem'unknown7 + (\ x__ y__ -> + x__{_Unknown6Response'Unknown2'StoreItem'unknown7 = y__}) + +instance Data.Default.Class.Default + Unknown6Response'Unknown2'StoreItem where + def + = Unknown6Response'Unknown2'StoreItem{_Unknown6Response'Unknown2'StoreItem'itemId + = Data.ProtoLens.fieldDefault, + _Unknown6Response'Unknown2'StoreItem'isIap = + Data.ProtoLens.fieldDefault, + _Unknown6Response'Unknown2'StoreItem'currencyToBuy = + Prelude.Nothing, + _Unknown6Response'Unknown2'StoreItem'yieldsCurrency + = Prelude.Nothing, + _Unknown6Response'Unknown2'StoreItem'yieldsItem = + Prelude.Nothing, + _Unknown6Response'Unknown2'StoreItem'tags = [], + _Unknown6Response'Unknown2'StoreItem'unknown7 = + Data.ProtoLens.fieldDefault} + +instance Data.ProtoLens.Message Unknown6Response'Unknown2'StoreItem + where + descriptor + = let itemId__field_descriptor + = Data.ProtoLens.FieldDescriptor "item_id" + (Data.ProtoLens.StringField :: + Data.ProtoLens.FieldTypeDescriptor Data.Text.Text) + (Data.ProtoLens.PlainField Data.ProtoLens.Optional itemId) + isIap__field_descriptor + = Data.ProtoLens.FieldDescriptor "is_iap" + (Data.ProtoLens.BoolField :: + Data.ProtoLens.FieldTypeDescriptor Prelude.Bool) + (Data.ProtoLens.PlainField Data.ProtoLens.Optional isIap) + currencyToBuy__field_descriptor + = Data.ProtoLens.FieldDescriptor "currency_to_buy" + (Data.ProtoLens.MessageField :: + Data.ProtoLens.FieldTypeDescriptor + Proto.POGOProtos.Data.Player.Currency.Currency) + (Data.ProtoLens.OptionalField maybe'currencyToBuy) + yieldsCurrency__field_descriptor + = Data.ProtoLens.FieldDescriptor "yields_currency" + (Data.ProtoLens.MessageField :: + Data.ProtoLens.FieldTypeDescriptor + Proto.POGOProtos.Data.Player.Currency.Currency) + (Data.ProtoLens.OptionalField maybe'yieldsCurrency) + yieldsItem__field_descriptor + = Data.ProtoLens.FieldDescriptor "yields_item" + (Data.ProtoLens.MessageField :: + Data.ProtoLens.FieldTypeDescriptor + Proto.POGOProtos.Inventory.Item.ItemData.ItemData) + (Data.ProtoLens.OptionalField maybe'yieldsItem) + tags__field_descriptor + = Data.ProtoLens.FieldDescriptor "tags" + (Data.ProtoLens.MessageField :: + Data.ProtoLens.FieldTypeDescriptor + Unknown6Response'Unknown2'StoreItem'Tag) + (Data.ProtoLens.RepeatedField Data.ProtoLens.Unpacked tags) + unknown7__field_descriptor + = Data.ProtoLens.FieldDescriptor "unknown7" + (Data.ProtoLens.Int32Field :: + Data.ProtoLens.FieldTypeDescriptor Data.Int.Int32) + (Data.ProtoLens.PlainField Data.ProtoLens.Optional unknown7) + in + Data.ProtoLens.MessageDescriptor + (Data.Map.fromList + [(Data.ProtoLens.Tag 1, itemId__field_descriptor), + (Data.ProtoLens.Tag 2, isIap__field_descriptor), + (Data.ProtoLens.Tag 3, currencyToBuy__field_descriptor), + (Data.ProtoLens.Tag 4, yieldsCurrency__field_descriptor), + (Data.ProtoLens.Tag 5, yieldsItem__field_descriptor), + (Data.ProtoLens.Tag 6, tags__field_descriptor), + (Data.ProtoLens.Tag 7, unknown7__field_descriptor)]) + (Data.Map.fromList + [("item_id", itemId__field_descriptor), + ("is_iap", isIap__field_descriptor), + ("currency_to_buy", currencyToBuy__field_descriptor), + ("yields_currency", yieldsCurrency__field_descriptor), + ("yields_item", yieldsItem__field_descriptor), + ("tags", tags__field_descriptor), + ("unknown7", unknown7__field_descriptor)]) + +data Unknown6Response'Unknown2'StoreItem'Tag = Unknown6Response'Unknown2'StoreItem'Tag{_Unknown6Response'Unknown2'StoreItem'Tag'key + :: + Data.Text.Text, + _Unknown6Response'Unknown2'StoreItem'Tag'value + :: + Data.Text.Text} + deriving (Prelude.Show, Prelude.Eq) + +type instance + Data.ProtoLens.Field "key" Unknown6Response'Unknown2'StoreItem'Tag + = Data.Text.Text + +instance Data.ProtoLens.HasField "key" + Unknown6Response'Unknown2'StoreItem'Tag + Unknown6Response'Unknown2'StoreItem'Tag where + field _ + = Lens.Family2.Unchecked.lens + _Unknown6Response'Unknown2'StoreItem'Tag'key + (\ x__ y__ -> + x__{_Unknown6Response'Unknown2'StoreItem'Tag'key = y__}) + +type instance + Data.ProtoLens.Field "value" + Unknown6Response'Unknown2'StoreItem'Tag + = Data.Text.Text + +instance Data.ProtoLens.HasField "value" + Unknown6Response'Unknown2'StoreItem'Tag + Unknown6Response'Unknown2'StoreItem'Tag where + field _ + = Lens.Family2.Unchecked.lens + _Unknown6Response'Unknown2'StoreItem'Tag'value + (\ x__ y__ -> + x__{_Unknown6Response'Unknown2'StoreItem'Tag'value = y__}) + +instance Data.Default.Class.Default + Unknown6Response'Unknown2'StoreItem'Tag where + def + = Unknown6Response'Unknown2'StoreItem'Tag{_Unknown6Response'Unknown2'StoreItem'Tag'key + = Data.ProtoLens.fieldDefault, + _Unknown6Response'Unknown2'StoreItem'Tag'value = + Data.ProtoLens.fieldDefault} + +instance Data.ProtoLens.Message + Unknown6Response'Unknown2'StoreItem'Tag where + descriptor + = let key__field_descriptor + = Data.ProtoLens.FieldDescriptor "key" + (Data.ProtoLens.StringField :: + Data.ProtoLens.FieldTypeDescriptor Data.Text.Text) + (Data.ProtoLens.PlainField Data.ProtoLens.Optional key) + value__field_descriptor + = Data.ProtoLens.FieldDescriptor "value" + (Data.ProtoLens.StringField :: + Data.ProtoLens.FieldTypeDescriptor Data.Text.Text) + (Data.ProtoLens.PlainField Data.ProtoLens.Optional value) + in + Data.ProtoLens.MessageDescriptor + (Data.Map.fromList + [(Data.ProtoLens.Tag 1, key__field_descriptor), + (Data.ProtoLens.Tag 2, value__field_descriptor)]) + (Data.Map.fromList + [("key", key__field_descriptor), + ("value", value__field_descriptor)]) + +currencyToBuy :: + forall msg msg' . + Data.ProtoLens.HasField "currencyToBuy" msg msg' => + Lens.Family2.Lens msg msg' + (Data.ProtoLens.Field "currencyToBuy" msg) + (Data.ProtoLens.Field "currencyToBuy" msg') +currencyToBuy + = Data.ProtoLens.field + (Data.ProtoLens.ProxySym :: + Data.ProtoLens.ProxySym "currencyToBuy") + +isIap :: + forall msg msg' . Data.ProtoLens.HasField "isIap" msg msg' => + Lens.Family2.Lens msg msg' (Data.ProtoLens.Field "isIap" msg) + (Data.ProtoLens.Field "isIap" msg') +isIap + = Data.ProtoLens.field + (Data.ProtoLens.ProxySym :: Data.ProtoLens.ProxySym "isIap") + +itemId :: + forall msg msg' . Data.ProtoLens.HasField "itemId" msg msg' => + Lens.Family2.Lens msg msg' (Data.ProtoLens.Field "itemId" msg) + (Data.ProtoLens.Field "itemId" msg') +itemId + = Data.ProtoLens.field + (Data.ProtoLens.ProxySym :: Data.ProtoLens.ProxySym "itemId") + +items :: + forall msg msg' . Data.ProtoLens.HasField "items" msg msg' => + Lens.Family2.Lens msg msg' (Data.ProtoLens.Field "items" msg) + (Data.ProtoLens.Field "items" msg') +items + = Data.ProtoLens.field + (Data.ProtoLens.ProxySym :: Data.ProtoLens.ProxySym "items") + +key :: + forall msg msg' . Data.ProtoLens.HasField "key" msg msg' => + Lens.Family2.Lens msg msg' (Data.ProtoLens.Field "key" msg) + (Data.ProtoLens.Field "key" msg') +key + = Data.ProtoLens.field + (Data.ProtoLens.ProxySym :: Data.ProtoLens.ProxySym "key") + +maybe'currencyToBuy :: + forall msg msg' . + Data.ProtoLens.HasField "maybe'currencyToBuy" msg msg' => + Lens.Family2.Lens msg msg' + (Data.ProtoLens.Field "maybe'currencyToBuy" msg) + (Data.ProtoLens.Field "maybe'currencyToBuy" msg') +maybe'currencyToBuy + = Data.ProtoLens.field + (Data.ProtoLens.ProxySym :: + Data.ProtoLens.ProxySym "maybe'currencyToBuy") + maybe'unknown2 :: forall msg msg' . Data.ProtoLens.HasField "maybe'unknown2" msg msg' => @@ -119,6 +538,57 @@ (Data.ProtoLens.ProxySym :: Data.ProtoLens.ProxySym "maybe'unknown2") +maybe'yieldsCurrency :: + forall msg msg' . + Data.ProtoLens.HasField "maybe'yieldsCurrency" msg msg' => + Lens.Family2.Lens msg msg' + (Data.ProtoLens.Field "maybe'yieldsCurrency" msg) + (Data.ProtoLens.Field "maybe'yieldsCurrency" msg') +maybe'yieldsCurrency + = Data.ProtoLens.field + (Data.ProtoLens.ProxySym :: + Data.ProtoLens.ProxySym "maybe'yieldsCurrency") + +maybe'yieldsItem :: + forall msg msg' . + Data.ProtoLens.HasField "maybe'yieldsItem" msg msg' => + Lens.Family2.Lens msg msg' + (Data.ProtoLens.Field "maybe'yieldsItem" msg) + (Data.ProtoLens.Field "maybe'yieldsItem" msg') +maybe'yieldsItem + = Data.ProtoLens.field + (Data.ProtoLens.ProxySym :: + Data.ProtoLens.ProxySym "maybe'yieldsItem") + +playerCurrencies :: + forall msg msg' . + Data.ProtoLens.HasField "playerCurrencies" msg msg' => + Lens.Family2.Lens msg msg' + (Data.ProtoLens.Field "playerCurrencies" msg) + (Data.ProtoLens.Field "playerCurrencies" msg') +playerCurrencies + = Data.ProtoLens.field + (Data.ProtoLens.ProxySym :: + Data.ProtoLens.ProxySym "playerCurrencies") + +responseType :: + forall msg msg' . + Data.ProtoLens.HasField "responseType" msg msg' => + Lens.Family2.Lens msg msg' + (Data.ProtoLens.Field "responseType" msg) + (Data.ProtoLens.Field "responseType" msg') +responseType + = Data.ProtoLens.field + (Data.ProtoLens.ProxySym :: Data.ProtoLens.ProxySym "responseType") + +tags :: + forall msg msg' . Data.ProtoLens.HasField "tags" msg msg' => + Lens.Family2.Lens msg msg' (Data.ProtoLens.Field "tags" msg) + (Data.ProtoLens.Field "tags" msg') +tags + = Data.ProtoLens.field + (Data.ProtoLens.ProxySym :: Data.ProtoLens.ProxySym "tags") + unknown1 :: forall msg msg' . Data.ProtoLens.HasField "unknown1" msg msg' => Lens.Family2.Lens msg msg' (Data.ProtoLens.Field "unknown1" msg) @@ -134,3 +604,46 @@ unknown2 = Data.ProtoLens.field (Data.ProtoLens.ProxySym :: Data.ProtoLens.ProxySym "unknown2") + +unknown4 :: + forall msg msg' . Data.ProtoLens.HasField "unknown4" msg msg' => + Lens.Family2.Lens msg msg' (Data.ProtoLens.Field "unknown4" msg) + (Data.ProtoLens.Field "unknown4" msg') +unknown4 + = Data.ProtoLens.field + (Data.ProtoLens.ProxySym :: Data.ProtoLens.ProxySym "unknown4") + +unknown7 :: + forall msg msg' . Data.ProtoLens.HasField "unknown7" msg msg' => + Lens.Family2.Lens msg msg' (Data.ProtoLens.Field "unknown7" msg) + (Data.ProtoLens.Field "unknown7" msg') +unknown7 + = Data.ProtoLens.field + (Data.ProtoLens.ProxySym :: Data.ProtoLens.ProxySym "unknown7") + +value :: + forall msg msg' . Data.ProtoLens.HasField "value" msg msg' => + Lens.Family2.Lens msg msg' (Data.ProtoLens.Field "value" msg) + (Data.ProtoLens.Field "value" msg') +value + = Data.ProtoLens.field + (Data.ProtoLens.ProxySym :: Data.ProtoLens.ProxySym "value") + +yieldsCurrency :: + forall msg msg' . + Data.ProtoLens.HasField "yieldsCurrency" msg msg' => + Lens.Family2.Lens msg msg' + (Data.ProtoLens.Field "yieldsCurrency" msg) + (Data.ProtoLens.Field "yieldsCurrency" msg') +yieldsCurrency + = Data.ProtoLens.field + (Data.ProtoLens.ProxySym :: + Data.ProtoLens.ProxySym "yieldsCurrency") + +yieldsItem :: + forall msg msg' . Data.ProtoLens.HasField "yieldsItem" msg msg' => + Lens.Family2.Lens msg msg' (Data.ProtoLens.Field "yieldsItem" msg) + (Data.ProtoLens.Field "yieldsItem" msg') +yieldsItem + = Data.ProtoLens.field + (Data.ProtoLens.ProxySym :: Data.ProtoLens.ProxySym "yieldsItem") diff --git a/src/Proto/POGOProtos/Settings/Master/MoveSettings.hs b/src/Proto/POGOProtos/Settings/Master/MoveSettings.hs --- a/src/Proto/POGOProtos/Settings/Master/MoveSettings.hs +++ b/src/Proto/POGOProtos/Settings/Master/MoveSettings.hs @@ -14,11 +14,11 @@ import qualified Data.Word import qualified Data.Map import qualified Data.ByteString -import qualified Proto.POGOProtos.Enums.PokemonMovementType +import qualified Proto.POGOProtos.Enums.PokemonMove import qualified Proto.POGOProtos.Enums.PokemonType data MoveSettings = MoveSettings{_MoveSettings'movementId :: - Proto.POGOProtos.Enums.PokemonMovementType.PokemonMovementType, + Proto.POGOProtos.Enums.PokemonMove.PokemonMove, _MoveSettings'animationId :: Data.Int.Int32, _MoveSettings'pokemonType :: Proto.POGOProtos.Enums.PokemonType.PokemonType, @@ -37,7 +37,7 @@ deriving (Prelude.Show, Prelude.Eq) type instance Data.ProtoLens.Field "movementId" MoveSettings = - Proto.POGOProtos.Enums.PokemonMovementType.PokemonMovementType + Proto.POGOProtos.Enums.PokemonMove.PokemonMove instance Data.ProtoLens.HasField "movementId" MoveSettings MoveSettings where @@ -196,7 +196,7 @@ = Data.ProtoLens.FieldDescriptor "movement_id" (Data.ProtoLens.EnumField :: Data.ProtoLens.FieldTypeDescriptor - Proto.POGOProtos.Enums.PokemonMovementType.PokemonMovementType) + Proto.POGOProtos.Enums.PokemonMove.PokemonMove) (Data.ProtoLens.PlainField Data.ProtoLens.Optional movementId) animationId__field_descriptor = Data.ProtoLens.FieldDescriptor "animation_id"