Merge branch 'master' into use-uv

Author: phalt

Resources/docker/app/Dockerfile

@@ -22,6 +22,8 @@ RUN apk add --no-cache --virtual .build-deps gcc g++ musl-dev \
     uv sync --frozen
 
 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

@@ -756,7 +756,10 @@ def csv_record_to_objects(info):
             for game in game_map[generation]:
                 if generation not in sprites:
                     sprites[generation] = {}
-                sprites[generation][game] = {"name_icon": file_path_or_none(f"types/{generation}/{game}/{info[0]}.png")}
+                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/encounter_condition_prose.csv

@@ -25,3 +25,11 @@ encounter_condition_id,local_language_id,name
 9,9,Story Progress
 10,5,Divers
 10,9,Miscellaneous
+11,5,Objet
+11,9,Item
+12,5,Jour de la semaine
+12,9,Weekday
+13,5,Premier Pokemon de l'équipe
+13,9,First party Pokemon
+14,5,Rencontre spéciale
+14,9,Special encounter

data/v2/csv/encounter_method_prose.csv

@@ -79,8 +79,23 @@ encounter_method_id,local_language_id,name
 31,9,Fishing in a Feebas Tile
 31,5,En pêchant sur une tuile à Barpau
 38,9,Walking in the overworld
+38,5,En marchant dans le monde extérieur
 39,9,Surfing in the overworld
+39,5,En surfant dans le monde extérieur
 40,9,Flying Pokemon in the sky
+40,5,Pokemon volant dans le ciel
 41,9,Rare spawn in grass with lure or catch combo
+41,5,Apparition rare dans les herbes avec un parfum ou un combo capture
+42,5,Apparition rare dans le ciel avec un parfum ou un combo capture
 42,9,Rare spawn in the sky with lure or catch combo
-43,9,Rare spawn in water with lure or catch combo
+43,5,Apparition rare dans l'eau avec un parfum ou un combo capture
+43,9,Rare spawn in water with lure or catch combo
+44,9,"Encountering 5 Pokemon within grass, flowers, or within a cave"
+45,9,Receiving a Jirachi from the USA Colosseum Bonus Disc
+46,9,Receiving a Celebi or Pikachu from the Japanese Colosseum Bonus Disc
+47,9,Receiving a Jirachi from the PAL copy of Pokemon channel
+48,9,Receiving a Manaphy from Pokemon Ranger
+49,9,"Receiving a Pikachu, Electivire, or Magmar from Pokemon Battle Revolution"
+50,9,Receiving an egg from the Pokemon center in New York City that contains the special move Wish.
+51,9,"Snagging a Pokemon from a trainer in Pokemon Colosseum or Pokemon XD: Gale of Darkness."
+52,9,"Snagging a Pokemon from a trainer in Pokemon Colosseum or Pokemon XD: Gale of Darkness, after you have failed to capture them once."

data/v2/csv/encounter_methods.csv

@@ -41,4 +41,13 @@ id,identifier,order
 40,overworld-flying,40
 41,overworld-special,41
 42,overworld-flying-special,42
-43,overworld-water-special,43
+43,overworld-water-special,43
+44,horde,44
+45,colosseum-bonus-disc-us, 45
+46,colosseum-bonus-disc-jpn, 46
+47,pokemon-channel-pal, 47
+48,pokemon-ranger, 48
+49,pokemon-battle-revolution, 49
+50,new-york-pokecenter-wish-eggs,50
+51,snag,51
+52,snag-rematch,52

data/v2/csv/encounter_slots.csv

@@ -1178,4 +1178,190 @@ id,version_group_id,encounter_method_id,slot,rarity
 1177,19,18,,100
 1178,19,42,,100
 1179,19,36,,100
-1180,19,43,,100
+1180,19,43,,100
+1181,15,44,1,35
+1182,15,44,2,60
+1183,15,44,3,5
+1184,15,44,1,60
+1185,15,44,2,35
+1186,15,44,3,5
+1187,15,44,4,5
+1188,15,44,1,35
+1189,15,44,2,5
+1190,15,44,3,60
+1191,15,44,1,5
+1192,15,44,2,60
+1193,15,44,3,35
+1194,15,44,1,35
+1195,15,44,2,5
+1196,15,44,3,5
+1197,15,44,4,60
+1198,15,44,1,35
+1199,15,44,2,5
+1200,15,44,3,60
+1201,15,44,1,60
+1202,15,44,2,35
+1203,15,44,3,5
+1204,15,44,4,35
+1205,15,44,1,5
+1206,15,44,2,5
+1207,15,44,3,60
+1208,15,44,4,35
+1209,15,44,1,35
+1210,15,44,2,60
+1211,15,44,3,5
+1212,15,44,1,5
+1213,15,44,2,60
+1214,15,44,3,35
+1215,15,44,4,35
+1216,15,44,1,35
+1217,15,44,2,5
+1218,15,44,3,60
+1219,15,44,4,5
+1220,15,44,1,60
+1221,15,44,2,60
+1222,15,44,3,5
+1223,15,44,4,35
+1224,15,44,1,5
+1225,15,44,2,35
+1226,15,44,3,5
+1227,15,44,4,60
+1228,15,44,1,5
+1229,15,44,2,60
+1230,15,44,3,35
+1231,15,44,1,60
+1232,15,44,2,35
+1233,15,44,3,5
+1234,15,44,1,60
+1235,15,44,2,5
+1236,15,44,3,35
+1237,15,44,4,5
+1238,15,44,1,5
+1239,15,44,2,60
+1240,15,44,3,35
+1241,15,44,1,5
+1242,15,44,2,60
+1243,15,44,3,35
+1244,15,44,4,5
+1245,15,44,1,5
+1246,15,44,2,60
+1247,15,44,3,35
+1248,16,44,1,35
+1249,16,44,2,60
+1250,16,44,3,5
+1251,16,44,1,100
+1252,16,44,1,60
+1253,16,44,2,35
+1254,16,44,3,35
+1255,16,44,4,5
+1256,16,44,1,60
+1257,16,44,2,40
+1258,16,44,1,60
+1259,16,44,2,5
+1260,16,44,3,5
+1261,16,44,4,35
+1262,16,44,1,35
+1263,16,44,2,65
+1264,16,44,1,35
+1265,16,44,2,35
+1266,16,44,3,5
+1267,16,44,4,60
+1268,16,44,1,65
+1269,16,44,2,35
+1270,16,44,1,100
+1271,16,44,1,95
+1272,16,44,2,5
+1273,16,44,1,100
+1274,16,44,1,35
+1275,16,44,2,5
+1276,16,44,3,60
+1277,16,44,1,100
+1278,16,44,1,5
+1279,16,44,2,35
+1280,16,44,3,60
+1281,16,44,1,40
+1282,16,44,2,60
+1283,16,44,1,60
+1284,16,44,2,5
+1285,16,44,3,35
+1286,16,44,1,100
+1287,16,44,1,60
+1288,16,44,2,35
+1289,16,44,3,5
+1290,16,44,1,60
+1291,16,44,2,5
+1292,16,44,3,35
+1293,16,44,1,5
+1294,16,44,2,95
+1295,16,44,1,60
+1296,16,44,2,35
+1297,16,44,3,35
+1298,16,44,4,5
+1299,16,44,1,35
+1300,16,44,2,60
+1301,16,44,3,5
+1302,16,44,1,95
+1303,16,44,2,5
+1304,16,44,3,5
+1305,16,44,1,60
+1306,16,44,2,35
+1307,16,44,3,5
+1308,16,44,4,35
+1309,16,44,5,5
+1310,16,44,1,100
+1311,16,44,1,35
+1312,16,44,2,65
+1313,16,44,1,5
+1314,16,44,2,95
+1315,16,44,1,35
+1316,16,44,2,35
+1317,16,44,3,5
+1318,16,44,4,65
+1319,16,44,1,100
+1320,16,44,1,60
+1321,16,44,2,35
+1322,16,44,3,5
+1323,16,44,1,60
+1324,16,44,2,5
+1325,16,44,3,60
+1326,16,44,4,35
+1327,16,44,1,35
+1328,16,44,2,60
+1329,16,44,3,5
+1330,16,44,1,100
+1331,16,44,1,60
+1332,16,44,2,35
+1333,16,44,3,5
+1334,16,44,1,35
+1335,16,44,2,5
+1336,16,44,3,60
+1337,5,46,,100
+1338,6,46,,100
+1339,5,45,,100
+1340,5,47,,100
+1341,7,46,,100
+1342,8,48,,100
+1343,9,48,,100
+1344,10,48,,100
+1345,5,46,,100
+1346,6,46,,100
+1347,7,46,,100
+1348,16,1,1,30
+1349,16,1,2,30
+1350,16,1,3,30
+1351,16,1,4,10
+1352,16,1,1,60
+1353,16,1,2,40
+1354,16,1,1,90
+1355,16,1,2,10
+1356,16,6,1,85
+1357,16,6,2,15
+1358,5,1,1,100
+1359,6,1,2,100
+1360,16,1,1,60
+1361,16,1,2,30
+1362,16,1,3,10
+1363,16,6,1,100
+1364,12,51,,100
+1365,12,18,,100
+1366,12,52,,100