Merge branch 'master' into add_mascalade-pokeapi_to_api_v1

This commit is contained in:
sh0hei 2016-03-16 09:53:33 +09:00
commit 5bc832bf46
2 changed files with 16 additions and 4 deletions

View file

@ -980,10 +980,22 @@ An item is an object in the games which the player can pick up, keep in their ba
| flavor_text_entries | The flavor text of this ability listed in different languages | list [VersionGroupFlavorText](#versiongroupflavortext) |
| game_indices | A list of game indices relevent to this item by generation | list [GenerationGameIndex](#generationgameindex) |
| names | The name of this item listed in different languages | list [Name](#resourcename) |
| held_by_pokemon | A list of pokémon that might be found in the wild holding this item | list [NamedAPIResource](#namedapiresource) ([Pokemon](#pokemon)) |
| held_by_pokemon | A list of pokémon that might be found in the wild holding this item | list [HeldByPokemon](#heldbypokemon) |
| baby_trigger_for | An evolution chain this item requires to produce a bay during mating | list [APIResource](#apiresource) ([EvolutionChain](#evolution-chains)) |
#### HeldByPokemon
| Name | Description | Data Type |
| ---- | ----------- | --------- |
| pokemon | The pokemon who might be holding the item | [NamedAPIResource](#namedapiresource) ([Pokemon](#pokemon)) |
| version_details | Details on chance of the pokemon having the item based on version | list [VersionDetails](#helditemversiondetails) |
#### HeldItemVersionDetails
| Name | Description | Data Type |
| ---- | ----------- | --------- |
| rarity | The chance of the pokemon holding the item | integer |
| version | The version the rarity applies | [NamedAPIResource](#namedapiresource) ([Version](#version)) |
## Item Attributes
Item attributes define particular aspects of items, e.g. "usable in battle" or "consumable".

View file

@ -957,7 +957,7 @@ An item is an object in the games which the player can pick up, keep in their ba
| names | The name of this item listed in different languages | list [Name](#resourcename) |
| sprites | A set of sprites used to depict this item in the game | [ItemSprites](#item-sprites) |
| held_by_pokemon | A list of Pokémon that might be found in the wild holding this item | list [NamedAPIResource](#namedapiresource) ([Pokemon](#pokemon)) |
| baby_trigger_for | An evolution chain this item requires to produce a bay during mating | list [APIResource](#apiresource) ([EvolutionChain](#evolution-chains)) |
| baby_trigger_for | An evolution chain this item requires to produce a bay during mating | [APIResource](#apiresource) ([EvolutionChain](#evolution-chains)) |
#### Item Sprites
@ -1239,7 +1239,7 @@ Moves are the skills of Pokémon in battle. In battle, a Pokémon uses one move
| pp | Power points. The number of times this move can be used | integer |
| priority | A value between -8 and 8. Sets the order in which moves are executed during battle. See [Bulbapedia](http://bulbapedia.bulbagarden.net/wiki/Priority) for greater detail. | integer |
| power | The base power of this move with a value of 0 if it does not have a base power | integer |
| contest_combos | A detail of normal and super contest combos that require this move | list [ContestComboSets](#contestcombosets) |
| contest_combos | A detail of normal and super contest combos that require this move | [ContestComboSets](#contestcombosets) |
| contest_type | The type of appeal this move gives a Pokémon when used in a contest | [NamedAPIResource](#namedapiresource) ([ContestType](#contest-types)) |
| contest_effect | The effect the move has when used in a contest | [NamedAPIResource](#namedapiresource) ([ContestEffect](#contest-effects)) |
| damage_class | The type of damage the move inflicts on the target, e.g. physical | [NamedAPIResource](#namedapiresource) ([MoveDamageClass](#move-damage-classes)) |
@ -1250,7 +1250,7 @@ Moves are the skills of Pokémon in battle. In battle, a Pokémon uses one move
| names | The name of this move listed in different languages | list [Name](#resourcename) |
| past_values | A list of move resource value changes across ersion groups of the game | list [PastMoveStatValues](#pastmovestatvalues) |
| stat_changes | A list of stats this moves effects and how much it effects them | list [MoveStatChange](#movestatchange) |
| contest_effect | The effect the move has when used in a super contest | [NamedAPIResource](#namedapiresource) ([ContestEffect](#contest-effects)) |
| super_contest_effect | The effect the move has when used in a super contest | [APIResource](#apiresource) ([SuperContestEffect](#super-contest-effects)) |
| target | The type of target that will recieve the effects of the attack | [NamedAPIResource](#namedapiresource) ([MoveTarget](#move-targets)) |
| type | The elemental type of this move | [NamedAPIResource](#namedapiresource) ([Type](#types)) |