Merge branch 'master' into oras-mirage-spots

Author: ItsMeJoji

Resources/docker/app/Dockerfile

@@ -12,6 +12,8 @@ RUN apk add --no-cache --virtual .build-deps gcc g++ musl-dev \
     python3 -m pip install -r requirements.txt --no-cache-dir
 
 FROM python:3.13.7-alpine
+# git is a dependency for the meta endpoint
+RUN apk add --no-cache git
 
 ENV PYTHONUNBUFFERED=1
 ENV DJANGO_SETTINGS_MODULE='config.docker-compose'

data/v2/build.py

@@ -660,7 +660,10 @@ def csv_record_to_objects(info):
                 sprites[generation][game] = {
                     "name_icon": file_path_or_none(
                         f"types/{generation}/{game}/{info[0]}.png"
-                    )
+                    ),
+                    "symbol_icon": file_path_or_none(
+                        f"types/{generation}/{game}/small/{info[0]}.png"
+                    ),
                 }
 
         yield TypeSprites(type_id=int(info[0]), sprites=sprites)

data/v2/csv/items.csv

@@ -1619,7 +1619,7 @@ id,identifier,category_id,cost,fling_power,fling_effect_id
 1669,tera-orb,20,0,,
 1670,scarlet-book,20,0,,
 1671,violet-book,20,0,,
-1672,kofu’s-wallet,22,0,,
+1672,kofus-wallet,22,0,,
 1673,tiny-bamboo-shoot,24,375,,
 1674,big-bamboo-shoot,24,1500,,
 1675,scroll-of-darkness,21,0,,
@@ -1703,7 +1703,7 @@ id,identifier,category_id,cost,fling_power,fling_effect_id
 1753,apple,53,130,,
 1754,kiwi,53,180,,
 1755,pineapple,53,250,,
-1756,jalapeño,53,220,,
+1756,jalapeno,53,220,,
 1757,horseradish,53,410,,
 1758,curry-powder,53,450,,
 1759,wasabi,53,330,,
@@ -1988,13 +1988,13 @@ id,identifier,category_id,cost,fling_power,fling_effect_id
 2043,smiling-vee-pick,55,1200,,
 2044,blue-poke-ball-pick,55,200,,
 2045,auspicious-armor,55,3000,,
-2046,leader’s-crest,55,3000,,
+2046,leaders-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,,
+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,,
@@ -2007,10 +2007,10 @@ id,identifier,category_id,cost,fling_power,fling_effect_id
 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,,
+2065,plaid-tablecloth-y,55,3000,,
+2066,plaid-tablecloth-b,55,3000,,
+2067,plaid-tablecloth-r,55,3000,,
+2068,bw-grass-tablecloth,55,0,,
 2069,battle-tablecloth,55,4000,,
 2070,monstrous-tablecloth,55,2000,,
 2071,striped-tablecloth,55,1500,,

data/v2/csv/locations.csv

@@ -591,7 +591,7 @@ id,region_id,identifier
 607,6,palais-lane
 608,6,parfum-palace
 609,6,kalos-route-7
-610,6,rivière-walk
+610,6,riviere-walk
 611,6,cyllage-city
 612,6,kalos-route-8
 613,6,muraille-coast
@@ -635,7 +635,7 @@ id,region_id,identifier
 651,6,winding-woods
 652,6,pokemon-village
 653,6,kalos-route-21
-654,6,dernière-way
+654,6,derniere-way
 655,6,kalos-route-22
 656,6,detourner-way
 657,6,kalos-victory-road

data/v2/csv/move_meta_categories.csv

@@ -3,11 +3,11 @@ id,identifier
 1,ailment
 2,net-good-stats
 3,heal
-4,damage+ailment
+4,damage-ailment
 5,swagger
-6,damage+lower
-7,damage+raise
-8,damage+heal
+6,damage-lower
+7,damage-raise
+8,damage-heal
 9,ohko
 10,whole-field-effect
 11,field-effect

data/v2/sprites

@@ -731,7 +731,8 @@ def setup_type_sprites_data(cls, type):
                     sprites[generation][game] = None
                 else:
                     sprites[generation][game] = {
-                        "name_icon": f"https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/types/{generation}/{game}/{type.id}.png"
+                        "name_icon": f"https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/types/{generation}/{game}/{type.id}.png",
+                        "symbol_icon": f"https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/types/{generation}/{game}/small/{type.id}.png",
                     }
 
         type_sprites = TypeSprites.objects.create(
@@ -3659,6 +3660,12 @@ def test_type_api(self):
                     json.loads(response.data["sprites"])[generation][game]["name_icon"],
                     sprites_data[generation][game]["name_icon"],
                 )
+                self.assertEqual(
+                    json.loads(response.data["sprites"])[generation][game][
+                        "symbol_icon"
+                    ],
+                    sprites_data[generation][game]["symbol_icon"],
+                )
 
     # Pokedex Tests
     def test_pokedex_api(self):