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

Added basic descriptions for missing items. #234

Open

slawekwaga wants to merge 25 commits into veekun:master from slawekwaga:master

slawekwaga commented Mar 24, 2018

Added missing descriptions. They are really basic


          Added basic descriptions for missing items.

b5707e8

Member

magical commented Mar 27, 2018

You've added a bunch of empty columns to the CSV files, which isn't gonna work.

Author

slawekwaga commented Mar 28, 2018

Oops. Used LibreOffice to edit these files.

slawekwaga added 22 commits

March 29, 2018 16:25


          Unnecessary columns are unneccesary.

224c888


          Update ability_prose.csv

930fac1


          Update item_prose.csv

57ae5a7


          Fixed Comatose

356869c


          Merge branch 'master' of https://github.com/slawekwaga/pokedex

094a603


          Update move_effect_prose.csv

e3b606c


          playing

d5f48c2


          Update item_prose.csv

bc4a772


          Update item_prose.csv

ff206e0


          Update item_prose.csv

d29c758


          Update item_prose.csv

3164edf


          Update item_prose.csv

fafda12


          Update item_prose.csv

be671d1


          Update item_prose.csv

9cd40dc


          test

50bb7d4


          Update move_effect_prose.csv

ccd471d


          Update move_effect_prose.csv

cb3895d


          Update move_effect_prose.csv

ffef194


          Update move_effect_prose.csv

baee760


          Update move_effect_prose.csv

9a2b1e3


          Update move_effect_prose.csv

cf34f06


          Update move_effect_prose.csv

74023c1

magical reviewed

View reviewed changes

Member

magical left a comment

Looks a lot better, thanks!

Did Gale Wings and Parental Bond change in gen 7, or does the correction apply to gen 6 too?

pokedex/data/csv/item_prose.csv Outdated

    
              142,9,Used for creating PokéBlocks and Poffins.,"No effect, only useful for planting and cooking."

              143,9,Used for creating PokéBlocks and Poffins.,"No effect, only useful for planting and cooking."

              144,9,Used for creating PokéBlocks and Poffins.,"No effect, only useful for planting and cooking."

              145,9,Used for creating PokéBlocks and Poffins.,"No effect, only useful for planting and cooking."

Member

magical Mar 30, 2018

Please change these commas back to semicolons. Using a semicolon here is correct; using a comma would create a comma splice.

pokedex/data/csv/item_prose.csv Outdated

    
              157,9,Used for creating PokéBlocks and Poffins.,"No effect, only useful for planting and cooking."

              158,9,Used for creating PokéBlocks and Poffins.,"No effect, only useful for planting and cooking."

              159,9,Used for creating PokéBlocks and Poffins.,"No effect, only useful for planting and cooking."

              160,9,Used for creating PokéBlocks and Poffins.,"No effect, only useful for planting and cooking."

Member

magical Mar 30, 2018

Change commas back to semicolons.

pokedex/data/csv/item_prose.csv Outdated

    
            @@ -542,7 +543,7 @@ Held by Onix or Scyther: Evolves the holder into Steelix or Scizor when traded,
          
              239,9,Raises the holder's Cuteness while in a contest.,Held: Increases the holder's Cuteness during a Super Contest's Visual Competition.

              240,9,Raises the holder's Smartness while in a contest.,Held: Increases the holder's Smartness during a Super Contest's Visual Competition.

              241,9,Raises the holder's Toughness while in a contest.,Held: Increases the holder's Toughness during a Super Contest's Visual Competition.

              242,9,Held: Provides a 1/10 (10%) boost in accuracy to the holder.,Held: Increases the accuracy of any move the holder uses by 10% (multiplied; i.e. 70% accuracy is increased to 77%).

              242,9,Held: Provides a 1/10 (10%) boost in accuracy to the holder.,"Held: Increases the accuracy of any move the holder uses by 10% (multiplied, i.e. 70% accuracy is increased to 77%)."

Member

magical Mar 30, 2018

Change comma back to semicolon.

pokedex/data/csv/item_prose.csv Outdated

    
            @@ -1123,7 +1124,7 @@ Used in battle
          
              618,9,Ends a wild battle.,"Used in battle

              :   Ends a wild battle.  Cannot be used in trainer battles."

              619,9,Stores props for the Pokémon Musical.,Stores props for the Pokémon Musical.

              620,9,Return to the museum in Nacrene City.,Only used as a plot point; this item is given to the player and taken away in the same cutscene.

              620,9,Return to the museum in Nacrene City.,"Only used as a plot point, this item is given to the player and taken away in the same cutscene."

Member

magical Mar 30, 2018

Comma, semicolon.

pokedex/data/csv/item_prose.csv Outdated

+,9,Doubles the chance of two Pokémon producing an egg at the daycare every 255 steps.,Doubles the chance of two Pokémon producing an egg at the daycare every 255 steps.
+,9,Raises the chance of finding a shiny Pokémon.,Raises the chance of finding a shiny Pokémon.
+,9,Required to progress in the Plasma Frigate.,Required to progress in the Plasma Frigate.
+,9,"Appears in the Café Warehouse on Sunday, return to the customer with a Patrat on Thursday.","Appears in the Café Warehouse on Sunday, return to the customer with a Patrat on Thursday."

Member

magical Mar 30, 2018

Semicolon.

pokedex/data/csv/move_effect_prose.csv Outdated

    
            @@ -752,7 +752,7 @@ This move may be used even if the user is under the effect of []{move:ingrain}.
          
              If a Pokémon under this effect uses []{move:bug-bite} or []{move:pluck} on a Pokémon holding a berry, the berry is destroyed but not used.  If a Pokémon under this effect uses []{move:fling}, it will [fail]{mechanic:fail}.

              This effect is passed by []{move:baton-pass}."

              234,9,Throws held item at the target; power depends on the item.,"Inflicts [regular damage]{mechanic:regular-damage}.  Power and type are determined by the user's [held item]{mechanic:held-item}.  The item is consumed.  If the user is not holding an item, or its item has no set type and power, this move will [fail]{mechanic:fail}.

              234,9,"Throws held item at the target, power depends on the item.","Inflicts [regular damage]{mechanic:regular-damage}.  Power and type are determined by the user's [held item]{mechanic:held-item}.  The item is consumed.  If the user is not holding an item, or its item has no set type and power, this move will [fail]{mechanic:fail}.

Member

magical Mar 30, 2018

Semicolon.

pokedex/data/csv/move_effect_prose.csv Outdated

    
            @@ -895,14 +895,14 @@ This move cannot be selected by []{move:sleep-talk}."
          
              279,9,Prevents any multi-target moves from hitting friendly Pokémon this turn.,"Moves with multiple targets will not hit friendly Pokémon for the remainder of this turn.  If the user is last to act this turn, this move will [fail]{mechanic:fail}.

              This move cannot be selected by []{move:assist} or []{move:metronome}."

              280,9,Averages Defense and Special Defense with the target.,Averages the user's unmodified [Defense]{mechanic:defense} with the target's unmodified Defense; the value becomes the unmodified Defense for both Pokémon. Unmodified [Special Defense]{mechanic:special-defense} is averaged the same way.

              280,9,Averages Defense and Special Defense with the target.,"Averages the user's unmodified [Defense]{mechanic:defense} with the target's unmodified Defense, the value becomes the unmodified Defense for both Pokémon. Unmodified [Special Defense]{mechanic:special-defense} is averaged the same way."

Member

magical Mar 30, 2018

Semicolon.

pokedex/data/csv/move_effect_prose.csv Outdated

    
              281,9,Averages Attack and Special Attack with the target.,"Averages the user's unmodified [Attack]{mechanic:attack} with the target's unmodified Attack; the value becomes the unmodified Attack for both Pokémon. Unmodified [Special Attack]{mechanic:special-attack} is averaged the same way.

              This effect applies before any other persistent changes to unmodified Attack or Special Attack, such as []{ability:flower-gift} during []{move:sunny-day}."

              282,9,All Pokémon's Defense and Special Defense are swapped for 5 turns.,"For five turns (including this one), every Pokémon's [Defense]{mechanic:defense} and [Special Defense]{mechanic:special-defense} are swapped."

              283,9,"Inflicts damage based on the target's Defense, not Special Defense.","Inflicts [regular damage]{mechanic:regular-damage}.  Damage calculation always uses the target's [Defense]{mechanic:defense}, regardless of this move's damage class."

              284,9,Inflicts double damage if the target is Poisoned.,"Inflicts [regular damage]{mechanic:regular-damage}.  If the target is [poisoned]{mechanic:poisoned}, this move has double power."

              285,9,Raises the user's Speed by two stages and halves the user's weight.,Raises the user's [Speed]{mechanic:speed} by two [stages]{mechanic:stage}.  Halves the user's weight; this effect does not stack.

              285,9,Raises the user's Speed by two stages and halves the user's weight.,"Raises the user's [Speed]{mechanic:speed} by two [stages]{mechanic:stage}.  Halves the user's weight, this effect does not stack."

Member

magical Mar 30, 2018

Semicolon.

Author

slawekwaga commented Mar 30, 2018

The change on Gale wings and Parental bond occured in gen VII

Member

magical commented Mar 30, 2018

We should probably add a changelog entry, then:
https://github.com/veekun/pokedex/blob/master/pokedex/data/csv/ability_changelog.csv
https://github.com/veekun/pokedex/blob/master/pokedex/data/csv/ability_changelog_prose.csv

slawekwaga added 2 commits

March 30, 2018 13:37


          Update item_prose.csv

5e33d1c


          Update move_effect_prose.csv

d390712

Author

slawekwaga commented Mar 30, 2018

There's a lot of changes on abilities and moves.
More on that subject here: https://pokemondb.net/pokebase/270531/what-are-all-the-nerfs-and-buffs-in-pokemon-sun-and-moon

Author

slawekwaga commented Mar 30, 2018

And some Items changed as well.
Super Potion, Hyper Potion, Rage Candy Bar

Member

magical commented Apr 25, 2018

Ah, thanks for the link. I only mentioned Parental Bond and Gale Wings because those seem to be the only two abilities updated in the PR.

The other changes look good. I'm happy to merge the PR if you add changelog entries for Parental Bond and Gale Wings. You could also revert those two changes and open a new PR for them. (And if you wanted to update some of the other moves and abilities that would be fine too 😁 )

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet