From 0ae7421ae644510cc39a094c9c1b3fa57941c7a6 Mon Sep 17 00:00:00 2001 From: Mordechai Zuber Date: Tue, 8 Mar 2016 19:34:23 +0200 Subject: [PATCH 1/5] Fix issue phalt/pokeapi#131 --- templates/pages/docsv2.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/pages/docsv2.md b/templates/pages/docsv2.md index dafefdde..7439650f 100644 --- a/templates/pages/docsv2.md +++ b/templates/pages/docsv2.md @@ -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)) | From 834094295aafd69b73a5ffb5a3cf27eb0cb9427b Mon Sep 17 00:00:00 2001 From: Mordechai Zuber Date: Tue, 8 Mar 2016 19:36:27 +0200 Subject: [PATCH 2/5] Fix phalt/pokeapi#132 --- templates/pages/docsv2.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/pages/docsv2.md b/templates/pages/docsv2.md index 7439650f..a486a88f 100644 --- a/templates/pages/docsv2.md +++ b/templates/pages/docsv2.md @@ -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)) | From a7def4945b4ab7d9d42266a826c99e8fbc93fffb Mon Sep 17 00:00:00 2001 From: Mordechai Zuber Date: Tue, 8 Mar 2016 19:38:45 +0200 Subject: [PATCH 3/5] Fix issue phalt/pokeapi#121 --- templates/pages/docsv2.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/pages/docsv2.md b/templates/pages/docsv2.md index a486a88f..8957e1f9 100644 --- a/templates/pages/docsv2.md +++ b/templates/pages/docsv2.md @@ -15,7 +15,7 @@
  • Berry Flavors
  • Characteristics
  • Contest Types
    • -
  • Contest Effects
    • +
  • Contest Effects
    • ba
  • Egg Groups
  • Encounter Methods
  • Encounter Conditions
    • @@ -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 From e50ae665de54e79d85cc7bba7719de0c5c51362d Mon Sep 17 00:00:00 2001 From: Mordechai Zuber Date: Wed, 9 Mar 2016 11:41:41 +0200 Subject: [PATCH 4/5] Update docsv2.md --- templates/pages/docsv2.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/pages/docsv2.md b/templates/pages/docsv2.md index 8957e1f9..04d4ee6d 100644 --- a/templates/pages/docsv2.md +++ b/templates/pages/docsv2.md @@ -15,7 +15,7 @@
  • Berry Flavors
  • Characteristics
  • Contest Types
    • -
  • Contest Effects
    • ba +
  • Contest Effects
  • Egg Groups
  • Encounter Methods
  • Encounter Conditions
    • From 32429488282a5b7566db9b5ba4da3df3fc8a8c8e Mon Sep 17 00:00:00 2001 From: Mordechai Zuber Date: Wed, 9 Mar 2016 16:52:00 +0200 Subject: [PATCH 5/5] Fix for phalt/pokeapi#120 --- pokemon_v2/README.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pokemon_v2/README.md b/pokemon_v2/README.md index c3959b68..62c2e81e 100644 --- a/pokemon_v2/README.md +++ b/pokemon_v2/README.md @@ -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".