Skip to content
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

Jump to bottom

0.51, hashing service and gen2 pokemons support #5854

Merged
merged 12 commits into from
Jan 10, 2017
Merged

0.51, hashing service and gen2 pokemons support #5854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
92009bc
0.51 and gen2 support
pogarek Dec 30, 2016
a2eb4d1
fix for badges
pogarek Dec 31, 2016
230e74c
fix for changes in pgoapi exceptions
pogarek Dec 31, 2016
815a4dc
another fix for candies
pogarek Dec 31, 2016
245a2d5
another fix for baby pokemons and candies
pogarek Jan 1, 2017
fc328bf
fix for sniper to do not check for pokemnos when encounter and spawni…
pogarek Jan 5, 2017
4c42cbd
moveset update from mgp25@5132827
pogarek Jan 5, 2017
28e5b8b
making 0.51 api optional
pogarek Jan 6, 2017
4225f44
Fix to catch 100% IV
pogarek Jan 6, 2017
336d9e6
another moves update from @mgp25
pogarek Jan 7, 2017
b9f0862
fast moves update from @Jcolomar
pogarek Jan 7, 2017
3ab8511
moves update from @NebulaXXX
pogarek Jan 9, 2017
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
1 change: 1 addition & 0 deletions configs/auth.json.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
}
],
"gmapkey": "GOOGLE_MAPS_API_KEY",
"hashkey" : "YOUR_PURCHASED_HASH_KEY",
"encrypt_location": "",
"telegram_token": "",
"discord_token": ""
Expand Down
79 changes: 44 additions & 35 deletions data/fast_moves.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"damage": 8,
"duration": 630,
"energy": 7,
"dps": 12.69
"dps": 12.7
},
{
"id": 226,
Expand Down Expand Up @@ -77,7 +77,7 @@
"type": "Fire",
"damage": 10,
"duration": 840,
"energy": 4,
"energy": 8,
"dps": 11.9
},
{
Expand All @@ -86,44 +86,44 @@
"type": "Ghost",
"damage": 11,
"duration": 950,
"energy": 7,
"dps": 11.57
"energy": 8,
"dps": 11.58
},
{
"id": 238,
"name": "Feint Attack",
"type": "Dark",
"damage": 12,
"duration": 1040,
"energy": 7,
"dps": 11.53
"energy": 10,
"dps": 11.54
},
{
"id": 224,
"name": "Poison Jab",
"type": "Poison",
"damage": 12,
"duration": 1050,
"energy": 7,
"dps": 11.42
"energy": 10,
"dps": 11.43
},
{
"id": 234,
"name": "Zen Headbutt",
"type": "Psychic",
"damage": 12,
"duration": 1050,
"energy": 4,
"dps": 11.42
"energy": 9,
"dps": 11.43
},
{
"id": 239,
"name": "Steel Wing",
"type": "Steel",
"damage": 15,
"duration": 1330,
"energy": 4,
"dps": 11.27
"energy": 12,
"dps": 11.28
},
{
"id": 201,
Expand All @@ -149,7 +149,7 @@
"type": "Ground",
"damage": 15,
"duration": 1350,
"energy": 9,
"energy": 12,
"dps": 11.11
},
{
Expand All @@ -159,25 +159,25 @@
"damage": 6,
"duration": 550,
"energy": 7,
"dps": 10.9
"dps": 10.91
},
{
"id": 221,
"name": "Tackle",
"type": "Normal",
"damage": 12,
"duration": 1100,
"energy": 7,
"dps": 10.9
"energy": 10,
"dps": 10.91
},
{
"id": 237,
"name": "Bubble",
"type": "Water",
"damage": 25,
"duration": 2300,
"energy": 15,
"dps": 10.86
"energy": 25,
"dps": 10.87
},
{
"id": 214,
Expand All @@ -194,7 +194,7 @@
"type": "Ice",
"damage": 15,
"duration": 1400,
"energy": 7,
"energy": 12,
"dps": 10.71
},
{
Expand All @@ -203,7 +203,7 @@
"type": "Fighting",
"damage": 15,
"duration": 1410,
"energy": 7,
"energy": 12,
"dps": 10.63
},
{
Expand All @@ -212,7 +212,7 @@
"type": "Normal",
"damage": 12,
"duration": 1130,
"energy": 7,
"energy": 10,
"dps": 10.61
},
{
Expand All @@ -221,7 +221,7 @@
"type": "Poison",
"damage": 6,
"duration": 575,
"energy": 4,
"energy": 8,
"dps": 10.43
},
{
Expand All @@ -230,7 +230,7 @@
"type": "Grass",
"damage": 15,
"duration": 1450,
"energy": 7,
"energy": 12,
"dps": 10.34
},
{
Expand All @@ -239,7 +239,7 @@
"type": "Ghost",
"damage": 5,
"duration": 500,
"energy": 7,
"energy": 6,
"dps": 10
},
{
Expand All @@ -248,7 +248,7 @@
"type": "Electric",
"damage": 7,
"duration": 700,
"energy": 4,
"energy": 8,
"dps": 10
},
{
Expand All @@ -257,7 +257,7 @@
"type": "Dark",
"damage": 7,
"duration": 700,
"energy": 4,
"energy": 9,
"dps": 10
},
{
Expand All @@ -266,7 +266,7 @@
"type": "Psychic",
"damage": 15,
"duration": 1510,
"energy": 7,
"energy": 14,
"dps": 9.93
},
{
Expand All @@ -275,7 +275,7 @@
"type": "Poison",
"damage": 10,
"duration": 1050,
"energy": 7,
"energy": 10,
"dps": 9.52
},
{
Expand All @@ -284,7 +284,7 @@
"type": "Fire",
"damage": 10,
"duration": 1050,
"energy": 7,
"energy": 10,
"dps": 9.52
},
{
Expand All @@ -293,7 +293,7 @@
"type": "Rock",
"damage": 12,
"duration": 1360,
"energy": 7,
"energy": 15,
"dps": 8.82
},
{
Expand All @@ -320,7 +320,7 @@
"type": "Electric",
"damage": 5,
"duration": 600,
"energy": 7,
"energy": 8,
"dps": 8.33
},
{
Expand All @@ -329,7 +329,7 @@
"type": "Steel",
"damage": 10,
"duration": 1200,
"energy": 7,
"energy": 10,
"dps": 8.33
},
{
Expand All @@ -338,7 +338,7 @@
"type": "Normal",
"damage": 10,
"duration": 1330,
"energy": 7,
"energy": 12,
"dps": 7.51
},
{
Expand All @@ -347,7 +347,7 @@
"type": "Bug",
"damage": 3,
"duration": 400,
"energy": 12,
"energy": 6,
"dps": 7.5
},
{
Expand All @@ -359,13 +359,22 @@
"energy": 7,
"dps": 7.5
},
{
"id": 242,
"name": "Transform",
"type": "Normal",
"damage": 0,
"duration": 1230,
"energy": 7,
"dps": 0.0
},
{
"id": 231,
"name": "Splash",
"type": "Water",
"damage": 0,
"duration": 1230,
"energy": 7,
"energy": 10,
"dps": 0
}
]
Loading