Update for 0.35.0 n minor fix (#203)

* fix pokemon_caught_by_type * rename unknown12 * update for 0.35.0
AeonLucid · Aug 24, 2016 · e9b4e76 · e9b4e76
1 parent fe6ba3e
commit e9b4e76
Show file tree

Hide file tree

Showing 21 changed files with 118 additions and 2 deletions.
diff --git a/src/POGOProtos/Data/BuddyPokemon.proto b/src/POGOProtos/Data/BuddyPokemon.proto
@@ -0,0 +1,8 @@
+syntax = "proto3";
+package POGOProtos.Data;
+
+message BuddyPokemon {
+	fixed64 id = 1;
+	double start_km_walked = 2;
+	double last_km_awarded = 3;
+}
diff --git a/src/POGOProtos/Data/Logs/ActionLogEntry.proto b/src/POGOProtos/Data/Logs/ActionLogEntry.proto
@@ -3,6 +3,7 @@ package POGOProtos.Data.Logs;
 
 import "POGOProtos/Data/Logs/CatchPokemonLogEntry.proto";
 import "POGOProtos/Data/Logs/FortSearchLogEntry.proto";
+import "POGOProtos/Data/Logs/BuddyPokemonLogEntry.proto";
 
 message ActionLogEntry {
 	int64 timestamp_ms = 1;
@@ -11,5 +12,6 @@ message ActionLogEntry {
 	oneof Action {
 		.POGOProtos.Data.Logs.CatchPokemonLogEntry catch_pokemon = 3;
 		.POGOProtos.Data.Logs.FortSearchLogEntry fort_search = 4;
+		.POGOProtos.Data.Logs.BuddyPokemonLogEntry buddy_pokemon = 5;
 	}
 }
diff --git a/src/POGOProtos/Data/Logs/BuddyPokemonLogEntry.proto b/src/POGOProtos/Data/Logs/BuddyPokemonLogEntry.proto
@@ -0,0 +1,15 @@
+syntax = "proto3";
+package POGOProtos.Data.Logs;
+
+import "POGOProtos/Enums/PokemonId.proto";
+
+message BuddyPokemonLogEntry {
+	.POGOProtos.Data.Logs.BuddyPokemonLogEntry.Result result = 1;
+	.POGOProtos.Enums.PokemonId pokemon_id = 2;
+	int32 amount = 3;
+
+	enum Result {
+		UNSET = 0;
+		CANDY_FOUND = 1;
+	}
+}
diff --git a/src/POGOProtos/Data/Player/PlayerStats.proto b/src/POGOProtos/Data/Player/PlayerStats.proto
@@ -23,6 +23,6 @@ message PlayerStats {
 	int32 prestige_raised_total = 19;
 	int32 prestige_dropped_total = 20;
 	int32 pokemon_deployed = 21;
-	bytes pokemon_caught_by_type = 22; // TODO: repeated PokemonType ??
+	repeated int32 pokemon_caught_by_type = 22;
 	int32 small_rattata_caught = 23;
 }
diff --git a/src/POGOProtos/Data/PlayerData.proto b/src/POGOProtos/Data/PlayerData.proto
@@ -7,6 +7,7 @@ import "POGOProtos/Data/Player/DailyBonus.proto";
 import "POGOProtos/Data/Player/EquippedBadge.proto";
 import "POGOProtos/Data/Player/ContactSettings.proto";
 import "POGOProtos/Data/Player/Currency.proto";
+import "POGOProtos/Data/BuddyPokemon.proto";
 import "POGOProtos/Enums/TeamColor.proto";
 
 message PlayerData {
@@ -22,4 +23,5 @@ message PlayerData {
 	.POGOProtos.Data.Player.ContactSettings contact_settings = 13;
 	repeated .POGOProtos.Data.Player.Currency currencies = 14;
 	int32 remaining_codename_claims = 15;
+	.POGOProtos.Data.BuddyPokemon buddy_pokemon = 16;
 }
diff --git a/src/POGOProtos/Data/PokemonData.proto b/src/POGOProtos/Data/PokemonData.proto
@@ -36,4 +36,5 @@ message PokemonData {
 	int32 favorite = 29;
 	string nickname = 30;
 	int32 from_fort = 31;
+	int32 buddy_candy_awarded = 32;
 }
diff --git a/src/POGOProtos/Networking/Envelopes/RequestEnvelope.proto b/src/POGOProtos/Networking/Envelopes/RequestEnvelope.proto
@@ -19,7 +19,7 @@ message RequestEnvelope {
 	double altitude = 9;
 	AuthInfo auth_info = 10;
 	.POGOProtos.Networking.Envelopes.AuthTicket auth_ticket = 11;
-	int64 unknown12 = 12;
+	int64 ms_since_last_locationfix = 12;
 
 	message AuthInfo {
 		string provider = 1;

diff --git a/src/POGOProtos/Networking/Requests/Messages/CheckChallenge.proto b/src/POGOProtos/Networking/Requests/Messages/CheckChallenge.proto
@@ -0,0 +1,6 @@
+syntax = "proto3";
+package POGOProtos.Networking.Requests.Messages;
+
+message CheckChallengeMessage {
+	bool debug_request = 1;
+}
diff --git a/src/POGOProtos/Networking/Requests/Messages/GetBuddyWalked.proto b/src/POGOProtos/Networking/Requests/Messages/GetBuddyWalked.proto
@@ -0,0 +1,5 @@
+syntax = "proto3";
+package POGOProtos.Networking.Requests.Messages;
+
+message GetBuddyWalkedMessage {
+}
diff --git a/src/POGOProtos/Networking/Requests/Messages/GetPlayerMessage.proto b/src/POGOProtos/Networking/Requests/Messages/GetPlayerMessage.proto
@@ -2,4 +2,10 @@ syntax = "proto3";
 package POGOProtos.Networking.Requests.Messages;
 
 message GetPlayerMessage {
+	.POGOProtos.Networking.Requests.Messages.GetPlayerMessage.PlayerLocale player_locale = 1;
+
+	message PlayerLocale {
+		string country = 1;
+		string language = 2;
+	}
 }
diff --git a/src/POGOProtos/Networking/Requests/Messages/SetBuddyPokemon.proto b/src/POGOProtos/Networking/Requests/Messages/SetBuddyPokemon.proto
@@ -0,0 +1,6 @@
+syntax = "proto3";
+package POGOProtos.Networking.Requests.Messages;
+
+message SetBuddyPokemonMessage {
+	fixed64 pokemon_id = 1;
+}
diff --git a/src/POGOProtos/Networking/Requests/Messages/VerifyChallenge.proto b/src/POGOProtos/Networking/Requests/Messages/VerifyChallenge.proto
@@ -0,0 +1,6 @@
+syntax = "proto3";
+package POGOProtos.Networking.Requests.Messages;
+
+message VerifyChallengeMessage {
+	string token = 1;
+}
diff --git a/src/POGOProtos/Networking/Requests/RequestType.proto b/src/POGOProtos/Networking/Requests/RequestType.proto
@@ -57,6 +57,8 @@ enum RequestType {
 	NICKNAME_POKEMON = 149;               // Implemented [R & M]
 	EQUIP_BADGE = 150;                    // Implemented [R & M]
 	SET_CONTACT_SETTINGS = 151;           // Implemented [R & M]
+	SET_BUDDY_POKEMON = 152;
+	GET_BUDDY_WALKED = 153;
 	GET_ASSET_DIGEST = 300;               // Implemented [R & M]
 	GET_DOWNLOAD_URLS = 301;              // Implemented [R & M]
 	GET_SUGGESTED_CODENAMES = 401;        // Implemented [R & M]
@@ -66,6 +68,8 @@ enum RequestType {
 	SET_PLAYER_TEAM = 405;                // Implemented [R & M]
 	MARK_TUTORIAL_COMPLETE = 406;         // Implemented [R & M]
 	LOAD_SPAWN_POINTS = 500;              // Can't find this one
+	CHECK_CHALLENGE = 600;
+	VERIFY_CHALLENGE = 601;
 	ECHO = 666;                           // Implemented [R & M]
 	DEBUG_UPDATE_INVENTORY = 700;
 	DEBUG_DELETE_PLAYER = 701;

diff --git a/src/POGOProtos/Networking/Responses/CheckChallengeResponse.proto b/src/POGOProtos/Networking/Responses/CheckChallengeResponse.proto
@@ -0,0 +1,7 @@
+syntax = "proto3";
+package POGOProtos.Networking.Responses;
+
+message CheckChallengeResponse {
+	bool show_challenge = 1;
+	string challenge_url = 2;
+}
diff --git a/src/POGOProtos/Networking/Responses/FortDeployPokemonResponse.proto b/src/POGOProtos/Networking/Responses/FortDeployPokemonResponse.proto
@@ -21,5 +21,6 @@ message FortDeployPokemonResponse {
 		ERROR_PLAYER_HAS_NO_TEAM = 6;
 		ERROR_POKEMON_NOT_FULL_HP = 7;
 		ERROR_PLAYER_BELOW_MINIMUM_LEVEL = 8;
+		ERROR_POKEMON_IS_BUDDY = 9;
 	}
 }
diff --git a/src/POGOProtos/Networking/Responses/FortSearchResponse.proto b/src/POGOProtos/Networking/Responses/FortSearchResponse.proto
@@ -19,5 +19,6 @@ message FortSearchResponse {
 		OUT_OF_RANGE = 2;
 		IN_COOLDOWN_PERIOD = 3;
 		INVENTORY_FULL = 4;
+		EXCEEDED_DAILY_LIMIT = 5;
 	}
 }
diff --git a/src/POGOProtos/Networking/Responses/GetBuddyWalkedResponse.proto b/src/POGOProtos/Networking/Responses/GetBuddyWalkedResponse.proto
@@ -0,0 +1,11 @@
+syntax = "proto3";
+package POGOProtos.Networking.Responses;
+
+import "POGOProtos/Enums/PokemonFamilyId.proto";
+
+message GetBuddyWalkedResponse
+{
+	bool success = 1;
+	.POGOProtos.Enums.PokemonFamilyId family_candy_id = 2;
+	int32 candy_earned_count = 3;
+}
diff --git a/src/POGOProtos/Networking/Responses/ReleasePokemonResponse.proto b/src/POGOProtos/Networking/Responses/ReleasePokemonResponse.proto
@@ -11,5 +11,6 @@ message ReleasePokemonResponse {
 		POKEMON_DEPLOYED = 2;
 		FAILED = 3;
 		ERROR_POKEMON_IS_EGG = 4;
+		ERROR_POKEMON_IS_BUDDY = 5;
 	}
 }
diff --git a/src/POGOProtos/Networking/Responses/SetBuddyPokemonResponse.proto b/src/POGOProtos/Networking/Responses/SetBuddyPokemonResponse.proto
@@ -0,0 +1,18 @@
+syntax = "proto3";
+package POGOProtos.Networking.Responses;
+
+import "POGOProtos/Data/BuddyPokemon.proto";
+
+message SetBuddyPokemonResponse
+{
+	.POGOProtos.Networking.Responses.SetBuddyPokemonResponse.Result result = 1;
+	.POGOProtos.Data.BuddyPokemon updated_buddy = 2;
+
+	enum Result {
+		UNEST = 0;
+		SUCCESS = 1;
+		ERROR_POKEMON_DEPLOYED = 2;
+		ERROR_POKEMON_NOT_OWNED = 3;
+		ERROR_POKEMON_IS_EGG = 4;
+	}
+}
diff --git a/src/POGOProtos/Networking/Responses/VerifyChallengeResponse.proto b/src/POGOProtos/Networking/Responses/VerifyChallengeResponse.proto
@@ -0,0 +1,6 @@
+syntax = "proto3";
+package POGOProtos.Networking.Responses;
+
+message VerifyChallengeResponse {
+	bool success = 1;
+}
diff --git a/src/POGOProtos/Settings/Master/PokemonSettings.proto b/src/POGOProtos/Settings/Master/PokemonSettings.proto
@@ -32,4 +32,14 @@ message PokemonSettings {
 	float km_distance_to_hatch = 20;
 	.POGOProtos.Enums.PokemonFamilyId family_id = 21;
 	int32 candy_to_evolve = 22;
+	float km_buddy_distance = 23;
+	.POGOProtos.Settings.Master.PokemonSettings.BuddySize buddy_size = 24;
+
+	enum BuddySize
+	{
+		BUDDY_MEDIUM = 0;
+		BUDDY_SHOULDER = 1;
+		BUDDY_BIG = 2;
+		BUDDY_FLYING = 3;
+	}
 }