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

Revert "Better inventory: attacks & movesets, IV CP perfection, pokemon level, etc.." #3549

Merged
merged 1 commit into from
Aug 11, 2016
Merged

Revert "Better inventory: attacks & movesets, IV CP perfection, pokemon level, etc.." #3549

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
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ share/

# PyCharm IDE settings
.idea/
*.iml

# Personal load details
src/
Expand Down
3 changes: 2 additions & 1 deletion data/charged_moves.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,9 @@
{"id":101,"name":"Flame Charge","type":"Fire","damage":25,"duration":3100,"energy":20,"dps":8.06},
{"id":34,"name":"Heart Stamp","type":"Psychic","damage":20,"duration":2550,"energy":25,"dps":7.84},
{"id":75,"name":"Parabolic Charge","type":"Electric","damage":15,"duration":2100,"energy":20,"dps":7.14},
{"id":13,"name":"Wrap","type":"Normal","damage":25,"duration":3700,"energy":20,"dps":6.75},
{"id":111,"name":"Icy Wind","type":"Ice","damage":25,"duration":3800,"energy":20,"dps":6.57},
{"id":84,"name":"Disarming Voice","type":"Fairy","damage":25,"duration":3900,"energy":20,"dps":6.41},
{"id":13,"name":"Wrap","type":"Normal","damage":25,"duration":4000,"energy":20,"dps":6.25},
{"id":66,"name":"Shadow Sneak","type":"Ghost","damage":15,"duration":3100,"energy":20,"dps":4.83},
{"id":48,"name":"Mega Drain","type":"Grass","damage":15,"duration":3200,"energy":20,"dps":4.68}]
{"id":48,"name":"Mega Drain","type":"Grass","damage":15,"duration":3200,"energy":20,"dps":4.68}]
81 changes: 0 additions & 81 deletions data/level_to_cpm.json
View file
Open in desktop

This file was deleted.

32 changes: 17 additions & 15 deletions data/pokemon.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1232,7 +1232,7 @@
"Previous evolution(s)": [
{
"Number": "029",
"Name": "Nidoran F"
"Name": "Nidoran F"
}
],
"Next Evolution Requirements": {
Expand Down Expand Up @@ -4326,14 +4326,20 @@
],
"Weight": "49.8 kg",
"Height": "1.5 m",
"Next evolution(s)": [
{
"Number": "107",
"Name": "Hitmonchan"
}
],
"Special Attack(s)": [
"Low Sweep",
"Stomp",
"Stone Edge"
],
"BaseAttack": 148,
"BaseDefense": 172,
"BaseStamina": 100,
"BaseDefense": 100,
"BaseStamina": 172,
"CaptureRate": 0.16,
"FleeRate": 0.09
},
Expand All @@ -4355,15 +4361,21 @@
],
"Weight": "50.2 kg",
"Height": "1.4 m",
"Previous evolution(s)": [
{
"Number": "106",
"Name": "Hitmonlee"
}
],
"Special Attack(s)": [
"Brick Break",
"Fire Punch",
"Ice Punch",
"Thunder Punch"
],
"BaseAttack": 138,
"BaseDefense": 204,
"BaseStamina": 100,
"BaseDefense": 100,
"BaseStamina": 204,
"CaptureRate": 0.16,
"FleeRate": 0.09
},
Expand Down Expand Up @@ -5717,16 +5729,6 @@
"Family": 147,
"Name": "Dratini candies"
},
"Next evolution(s)": [
{
"Number": "148",
"Name": "Dragonair"
},
{
"Number": "149",
"Name": "Dragonite"
}
],
"Special Attack(s)": [
"Aqua Tail",
"Twister",
Expand Down
Loading