Merge branch 'staging' into fix-item-names-id

Resources/scripts/updater.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Executed when the master branch of PokeAPI/pokeapi gets updated
+# Executed when the master/staging branch of PokeAPI/pokeapi gets updated
 # Runs in CircleCI
 # Generates new data using the latest changes of PokeAPI/pokeapi in order to open a Pull Request towards PokeAPI/api-data
 
@@ -90,10 +90,10 @@ get_invokator_pr_number() {
   commit_msg_regex="Merge pull request #([0-9]+) from PokeAPI/(.*)"
   last_commit_message=$(git log --oneline --format=%B -n 1 HEAD | head -n 1)
   invokator_pr_number_from_graphql="$(get_invokator_pr_number_from_graphql)"
-  if ! [ -z "$CIRCLE_PULL_REQUEST" ]; then
-    echo "${CIRCLE_PULL_REQUEST##*/}"
-  elif [ "$invokator_pr_number_from_graphql" != 'null' ]; then
+  if [ "$invokator_pr_number_from_graphql" != 'null' ]; then
     echo "$invokator_pr_number_from_graphql"
+  elif [ -n "$CIRCLE_PULL_REQUEST" ]; then
+    echo "${CIRCLE_PULL_REQUEST##*/}"
   elif [[ $last_commit_message =~ $commit_msg_regex ]]; then
     echo "${BASH_REMATCH[1]}"
   else
@@ -289,7 +289,7 @@ EOF
 customize_pr() {
   # Wait for Github to open the PR
   sleep 10
-  
+
   data_repo_pr_number=$1
   curl -H "$auth_header" -X PATCH --data "$(pr_input_assignees_and_labels)" "https://api.github.com/repos/$org/$data_repo/issues/$data_repo_pr_number"
   if [ $? -ne 0 ]; then

data/v2/csv/item_categories.csv

@@ -49,3 +49,7 @@ id,pocket_id,identifier
 49,1,dynamax-crystals
 50,2,nature-mints
 51,1,curry-ingredients
+52,1,tera-shard
+53,1,sandwich-ingredients
+54,1,tm-materials
+55,1,picnic

data/v2/csv/items.csv

@@ -1606,5 +1606,446 @@ id,identifier,category_id,cost,fling_power,fling_effect_id
 1656,carrot-seeds,22,20,,
 1657,ability-patch,26,20,,
 1658,reins-of-unity,22,0,,
+1659,adamant-crystal,21,0,,
+1660,lustrous-globe,21,0,,
+1661,griseous-core,21,0,,
+1662,blank-plate,17,0,,
+1663,strange-ball,20,0,,
+1664,legend-plate,17,0,,
+1665,rotom-phone,20,0,,
+1666,sandwich,20,0,,
+1667,koraidon’s-poké-ball,20,0,,
+1668,miraidon’s-poké-ball,20,0,,
+1669,tera-orb,20,0,,
+1670,scarlet-book,20,0,,
+1671,violet-book,20,0,,
+1672,kofu’s-wallet,22,0,,
+1673,tiny-bamboo-shoot,24,375,,
+1674,big-bamboo-shoot,24,1500,,
+1675,scroll-of-darkness,21,0,,
+1676,scroll-of-waters,21,0,,
+1677,malicious-armor,10,750,,
+1678,normal-tera-shard,52,500,,
+1679,fire-tera-shard,52,500,,
+1680,water-tera-shard,52,500,,
+1681,electric-tera-shard,52,500,,
+1682,grass-tera-shard,52,500,,
+1683,ice-tera-shard,52,500,,
+1684,fighting-tera-shard,52,500,,
+1685,poison-tera-shard,52,500,,
+1686,ground-tera-shard,52,500,,
+1687,flying-tera-shard,52,500,,
+1688,psychic-tera-shard,52,500,,
+1689,bug-tera-shard,52,500,,
+1690,rock-tera-shard,52,500,,
+1691,ghost-tera-shard,52,500,,
+1692,dragon-tera-shard,52,500,,
+1693,dark-tera-shard,52,500,,
+1694,steel-tera-shard,52,500,,
+1695,fairy-tera-shard,52,500,,
+1696,booster-energy,12,0,,
+1697,ability-shield,12,20000,,
+1698,clear-amulet,12,30000,,
+1699,mirror-herb,12,30000,,
+1700,punching-glove,12,15000,,
+1701,covert-cloak,12,20000,,
+1702,loaded-dice,12,20000,,
+1703,baguette,53,0,,
+1704,mayonnaise,53,120,,
+1705,ketchup,53,110,,
+1706,mustard,53,130,,
+1707,butter,53,250,,
+1708,peanut-butter,53,300,,
+1709,chili-sauce,53,320,,
+1710,salt,53,90,,
+1711,pepper,53,100,,
+1712,yogurt,53,140,,
+1713,whipped-cream,53,200,,
+1714,cream-cheese,53,280,,
+1715,jam,53,120,,
+1716,marmalade,53,260,,
+1717,olive-oil,53,300,,
+1718,vinegar,53,300,,
+1719,sweet-herba-mystica,53,0,,
+1720,salty-herba-mystica,53,0,,
+1721,sour-herba-mystica,53,0,,
+1722,bitter-herba-mystica,53,0,,
+1723,spicy-herba-mystica,53,0,,
+1724,lettuce,53,90,,
+1725,tomato,53,100,,
+1726,cherry-tomatoes,53,120,,
+1727,cucumber,53,130,,
+1728,pickle,53,90,,
+1729,onion,53,130,,
+1730,red-onion,53,230,,
+1731,green-bell-pepper,53,230,,
+1732,red-bell-pepper,53,240,,
+1733,yellow-bell-pepper,53,240,,
+1734,avocado,53,180,,
+1735,bacon,53,150,,
+1736,ham,53,170,,
+1737,prosciutto,53,200,,
+1738,chorizo,53,150,,
+1739,herbed-sausage,53,400,,
+1740,hamburger,53,380,,
+1741,klawf-stick,53,500,,
+1742,smoked-fillet,53,330,,
+1743,fried-fillet,53,360,,
+1744,egg,53,80,,
+1745,potato-tortilla,53,250,,
+1746,tofu,53,260,,
+1747,rice,53,280,,
+1748,noodles,53,280,,
+1749,potato-salad,53,110,,
+1750,cheese,53,120,,
+1751,banana,53,80,,
+1752,strawberry,53,140,,
+1753,apple,53,130,,
+1754,kiwi,53,180,,
+1755,pineapple,53,250,,
+1756,jalapeño,53,220,,
+1757,horseradish,53,410,,
+1758,curry-powder,53,450,,
+1759,wasabi,53,330,,
+1760,watercress,53,270,,
+1761,basil,53,280,,
+1762,venonat-fang,54,80,,
+1763,diglett-dirt,54,80,,
+1764,meowth-fur,54,80,,
+1765,psyduck-down,54,60,,
+1766,mankey-fur,54,80,,
+1767,growlithe-fur,54,80,,
+1768,slowpoke-claw,54,80,,
+1769,magnemite-screw,54,80,,
+1770,grimer-toxin,54,80,,
+1771,shellder-pearl,54,140,,
+1772,gastly-gas,54,80,,
+1773,drowzee-fur,54,60,,
+1774,voltorb-sparks,54,80,,
+1775,scyther-claw,54,100,,
+1776,tauros-hair,54,100,,
+1777,magikarp-scales,54,40,,
+1778,ditto-goo,54,300,,
+1779,eevee-fur,54,200,,
+1780,dratini-scales,54,200,,
+1781,pichu-fur,54,100,,
+1782,igglybuff-fluff,54,60,,
+1783,mareep-wool,54,60,,
+1784,hoppip-leaf,54,60,,
+1785,sunkern-leaf,54,60,,
+1786,murkrow-bauble,54,100,,
+1787,misdreavus-tears,54,80,,
+1788,girafarig-fur,54,100,,
+1789,pineco-husk,54,80,,
+1790,dunsparce-scales,54,120,,
+1791,qwilfish-spines,54,80,,
+1792,heracross-claw,54,100,,
+1793,sneasel-claw,54,80,,
+1794,teddiursa-claw,54,80,,
+1795,delibird-parcel,54,240,,
+1796,houndour-fang,54,80,,
+1797,phanpy-nail,54,80,,
+1798,stantler-hair,54,120,,
+1799,larvitar-claw,54,200,,
+1800,wingull-feather,54,60,,
+1801,ralts-dust,54,80,,
+1802,surskit-syrup,54,60,,
+1803,shroomish-spores,54,80,,
+1804,slakoth-fur,54,60,,
+1805,makuhita-sweat,54,80,,
+1806,azurill-fur,54,60,,
+1807,sableye-gem,54,200,,
+1808,meditite-sweat,54,80,,
+1809,gulpin-mucus,54,80,,
+1810,numel-lava,54,80,,
+1811,torkoal-coal,54,140,,
+1812,spoink-pearl,54,140,,
+1813,cacnea-needle,54,80,,
+1814,swablu-fluff,54,100,,
+1815,zangoose-claw,54,120,,
+1816,seviper-fang,54,120,,
+1817,barboach-slime,54,60,,
+1818,shuppet-scrap,54,80,,
+1819,tropius-leaf,54,140,,
+1820,snorunt-fur,54,80,,
+1821,luvdisc-scales,54,160,,
+1822,bagon-scales,54,200,,
+1823,starly-feather,54,60,,
+1824,kricketot-shell,54,40,,
+1825,shinx-fang,54,60,,
+1826,combee-honey,54,100,,
+1827,pachirisu-fur,54,100,,
+1828,buizel-fur,54,80,,
+1829,shellos-mucus,54,80,,
+1830,drifloon-gas,54,80,,
+1831,stunky-fur,54,80,,
+1832,bronzor-fragment,54,80,,
+1833,bonsly-tears,54,80,,
+1834,happiny-dust,54,300,,
+1835,spiritomb-fragment,54,240,,
+1836,gible-scales,54,200,,
+1837,riolu-fur,54,160,,
+1838,hippopotas-sand,54,80,,
+1839,croagunk-poison,54,80,,
+1840,finneon-scales,54,80,,
+1841,snover-berries,54,60,,
+1842,rotom-sparks,54,200,,
+1843,petilil-leaf,54,60,,
+1844,basculin-fang,54,80,,
+1845,sandile-claw,54,80,,
+1846,zorua-fur,54,140,,
+1847,gothita-eyelash,54,80,,
+1848,deerling-hair,54,60,,
+1849,foongus-spores,54,80,,
+1850,alomomola-mucus,54,120,,
+1851,tynamo-slime,54,80,,
+1852,axew-scales,54,200,,
+1853,cubchoo-fur,54,80,,
+1854,cryogonal-ice,54,100,,
+1855,pawniard-blade,54,80,,
+1856,rufflet-feather,54,80,,
+1857,deino-scales,54,200,,
+1858,larvesta-fuzz,54,200,,
+1859,fletchling-feather,54,60,,
+1860,scatterbug-powder,54,40,,
+1861,litleo-tuft,54,80,,
+1862,flabébé-pollen,54,80,,
+1863,skiddo-leaf,54,80,,
+1864,skrelp-kelp,54,100,,
+1865,clauncher-claw,54,100,,
+1866,hawlucha-down,54,100,,
+1867,dedenne-fur,54,100,,
+1868,goomy-goo,54,140,,
+1869,klefki-key,54,100,,
+1870,bergmite-ice,54,80,,
+1871,noibat-fur,54,80,,
+1872,yungoos-fur,54,60,,
+1873,crabrawler-shell,54,100,,
+1874,oricorio-feather,54,100,,
+1875,rockruff-rock,54,80,,
+1876,mareanie-spike,54,80,,
+1877,mudbray-mud,54,80,,
+1878,fomantis-leaf,54,80,,
+1879,salandit-gas,54,80,,
+1880,bounsweet-sweat,54,80,,
+1881,oranguru-fur,54,120,,
+1882,passimian-fur,54,120,,
+1883,sandygast-sand,54,80,,
+1884,komala-claw,54,100,,
+1885,mimikyu-scrap,54,40,,
+1886,bruxish-tooth,54,100,,
+1887,chewtle-claw,54,80,,
+1888,skwovet-fur,54,60,,
+1889,arrokuda-scales,54,80,,
+1890,rookidee-feather,54,80,,
+1891,toxel-sparks,54,80,,
+1892,falinks-sweat,54,120,,
+1893,cufant-tarnish,54,80,,
+1894,rolycoly-coal,54,80,,
+1895,silicobra-sand,54,80,,
+1896,indeedee-fur,54,120,,
+1897,pincurchin-spines,54,100,,
+1898,snom-thread,54,80,,
+1899,impidimp-hair,54,80,,
+1900,applin-juice,54,100,,
+1901,sinistea-chip,54,80,,
+1902,hatenna-dust,54,80,,
+1903,stonjourner-stone,54,120,,
+1904,eiscue-down,54,120,,
+1905,dreepy-powder,54,200,,
+1906,lechonk-hair,54,60,,
+1907,tarountula-thread,54,60,,
+1908,nymble-claw,54,60,,
+1909,rellor-mud,54,80,,
+1910,greavard-wax,54,80,,
+1911,flittle-down,54,80,,
+1912,wiglett-sand,54,80,,
+1913,dondozo-whisker,54,160,,
+1914,veluza-fillet,54,140,,
+1915,finizen-mucus,54,100,,
+1916,smoliv-oil,54,80,,
+1917,capsakid-seed,54,80,,
+1918,tadbulb-mucus,54,80,,
+1919,varoom-fume,54,80,,
+1920,orthworm-tarnish,54,200,,
+1921,tandemaus-fur,54,80,,
+1922,cetoddle-grease,54,80,,
+1923,frigibax-scales,54,200,,
+1924,tatsugiri-scales,54,200,,
+1925,cyclizar-scales,54,120,,
+1926,pawmi-fur,54,100,,
+1927,wattrel-feather,54,120,,
+1928,bombirdier-feather,54,200,,
+1929,squawkabilly-feather,54,80,,
+1930,flamigo-down,54,80,,
+1931,klawf-claw,54,200,,
+1932,nacli-salt,54,80,,
+1933,glimmet-crystal,54,120,,
+1934,shroodle-ink,54,80,,
+1935,fidough-fur,54,80,,
+1936,maschiff-fang,54,80,,
+1937,bramblin-twig,54,80,,
+1938,gimmighoul-coin,54,800,,
+1939,tinkatink-hair,54,80,,
+1940,charcadet-soot,54,160,,
+1941,toedscool-flaps,54,100,,
+1942,wooper-slime,54,60,,
+1943,tm100,37,0,,
+1944,tm101,37,0,,
+1945,tm102,37,0,,
+1946,tm103,37,0,,
+1947,tm104,37,0,,
+1948,tm105,37,0,,
+1949,tm106,37,0,,
+1950,tm107,37,0,,
+1951,tm108,37,0,,
+1952,tm109,37,0,,
+1953,tm110,37,0,,
+1954,tm111,37,0,,
+1955,tm112,37,0,,
+1956,tm113,37,0,,
+1957,tm114,37,0,,
+1958,tm115,37,0,,
+1959,tm116,37,0,,
+1960,tm117,37,0,,
+1961,tm118,37,0,,
+1962,tm119,37,0,,
+1963,tm120,37,0,,
+1964,tm121,37,0,,
+1965,tm122,37,0,,
+1966,tm123,37,0,,
+1967,tm124,37,0,,
+1968,tm125,37,0,,
+1969,tm126,37,0,,
+1970,tm127,37,0,,
+1971,tm128,37,0,,
+1972,tm129,37,0,,
+1973,tm130,37,0,,
+1974,tm131,37,0,,
+1975,tm132,37,0,,
+1976,tm133,37,0,,
+1977,tm134,37,0,,
+1978,tm135,37,0,,
+1979,tm136,37,0,,
+1980,tm137,37,0,,
+1981,tm138,37,0,,
+1982,tm139,37,0,,
+1983,tm140,37,0,,
+1984,tm141,37,0,,
+1985,tm142,37,0,,
+1986,tm143,37,0,,
+1987,tm144,37,0,,
+1988,tm145,37,0,,
+1989,tm146,37,0,,
+1990,tm147,37,0,,
+1991,tm148,37,0,,
+1992,tm149,37,0,,
+1993,tm150,37,0,,
+1994,tm151,37,0,,
+1995,tm152,37,0,,
+1996,tm153,37,0,,
+1997,tm154,37,0,,
+1998,tm155,37,0,,
+1999,tm156,37,0,,
+2000,tm157,37,0,,
+2001,tm158,37,0,,
+2002,tm159,37,0,,
+2003,tm160,37,0,,
+2004,tm161,37,0,,
+2005,tm162,37,0,,
+2006,tm163,37,0,,
+2007,tm164,37,0,,
+2008,tm165,37,0,,
+2009,tm166,37,0,,
+2010,tm167,37,0,,
+2011,tm168,37,0,,
+2012,tm169,37,0,,
+2013,tm170,37,0,,
+2014,tm171,37,0,,
+2015,picnic-set,55,0,,
+2016,academy-bottle,55,0,,
+2017,academy-bottle,55,0,,
+2018,polka-dot-bottle,55,1000,,
+2019,striped-bottle,55,1000,,
+2020,diamond-bottle,55,1000,,
+2021,academy-cup,55,0,,
+2022,academy-cup,55,0,,
+2023,striped-cup,55,800,,
+2024,polka-dot-cup,55,800,,
+2025,flower-pattern-cup,55,800,,
+2026,academy-tablecloth,55,0,,
+2027,academy-tablecloth,55,0,,
+2028,whimsical-tablecloth,55,2000,,
+2029,leafy-tablecloth,55,2000,,
+2030,spooky-tablecloth,55,4000,,
+2031,academy-ball,55,0,,
+2032,academy-ball,55,0,,
+2033,marill-ball,55,2000,,
+2034,yarn-ball,55,1000,,
+2035,cyber-ball,55,2000,,
+2036,gold-pick,55,400,,
+2037,silver-pick,55,40,,
+2038,red-flag-pick,55,120,,
+2039,blue-flag-pick,55,120,,
+2040,pika-pika-pick,55,480,,
+2041,winking-pika-pick,55,1200,,
+2042,vee-vee-pick,55,480,,
+2043,smiling-vee-pick,55,1200,,
+2044,blue-poké-ball-pick,55,200,,
+2045,auspicious-armor,55,3000,,
+2046,leader’s-crest,55,3000,,
+2047,pink-bottle,55,2000,,
+2048,blue-bottle,55,2000,,
+2049,yellow-bottle,55,2000,,
+2050,steel-bottle-(r),55,1500,,
+2051,steel-bottle-(y),55,1500,,
+2052,steel-bottle-(b),55,1500,,
+2053,silver-bottle,55,20000,,
+2054,barred-cup,55,800,,
+2055,diamond-pattern-cup,55,800,,
+2056,fire-pattern-cup,55,800,,
+2057,pink-cup,55,1500,,
+2058,blue-cup,55,1500,,
+2059,yellow-cup,55,1500,,
+2060,pikachu-cup,55,2000,,
+2061,eevee-cup,55,2000,,
+2062,slowpoke-cup,55,2000,,
+2063,silver-cup,55,20000,,
+2064,exercise-ball,55,2000,,
+2065,plaid-tablecloth-(y),55,3000,,
+2066,plaid-tablecloth-(b),55,3000,,
+2067,plaid-tablecloth-(r),55,3000,,
+2068,b&w-grass-tablecloth,55,0,,
+2069,battle-tablecloth,55,4000,,
+2070,monstrous-tablecloth,55,2000,,
+2071,striped-tablecloth,55,1500,,
+2072,diamond-tablecloth,55,1500,,
+2073,polka-dot-tablecloth,55,1500,,
+2074,lilac-tablecloth,55,1000,,
+2075,mint-tablecloth,55,1000,,
+2076,peach-tablecloth,55,1000,,
+2077,yellow-tablecloth,55,5000,,
+2078,blue-tablecloth,55,5000,,
+2079,pink-tablecloth,55,5000,,
+2080,gold-bottle,55,30000,,
+2081,bronze-bottle,55,10000,,
+2082,gold-cup,55,15000,,
+2083,bronze-cup,55,5000,,
+2084,green-poké-ball-pick,55,200,,
+2085,red-poké-ball-pick,55,200,,
+2086,party-sparkler-pick,55,1600,,
+2087,heroic-sword-pick,55,2000,,
+2088,magical-star-pick,55,600,,
+2089,magical-heart-pick,55,600,,
+2090,parasol-pick,55,800,,
+2091,blue-sky-flower-pick,55,1000,,
+2092,sunset-flower-pick,55,1000,,
+2093,sunrise-flower-pick,55,1000,,
+2094,blue-dish,55,0,,
+2095,green-dish,55,0,,
+2096,orange-dish,55,0,,
+2097,red-dish,55,0,,
+2098,white-dish,55,0,,
+2099,yellow-dish,55,0,,
 10001,black-augurite,10,0,,
 10002,peat-block,10,0,,

data/v2/sprites

@@ -1 +1 @@
-Subproject commit a0e2c217b87f650a7ff258b437a028b5cd1aadf4
+Subproject commit f301664fbbce6ccbe09f9561287e05653379f870