add animated forms to handle different variant suffix

Author: anhthang

scripts/forms-animated.json

@@ -0,0 +1,18 @@
+{
+    "19": "raticate-alola",
+    "20_1": "raticate-alola",
+    "26_1": "raichu-alola",
+    "27_1": "sandshrew-alola",
+    "28_1": "sandslash-alola",
+    "37_1": "vulpix-alola",
+    "50_1": "dugtrio-alola",
+    "51_1": "dugtrio-alola",
+    "52_1": "meowth-alola",
+    "53_1": "persian-alola",
+    "74_1": "geodude-alola",
+    "75_1": "graveler-alola",
+    "76_1": "golem-alola",
+    "88_1": "grimer-alola",
+    "89_1": "muk-alola",
+    "105_1": "marowak-alola"
+}

scripts/renameSmogon.sh

@@ -36,7 +36,13 @@ convert(){
     # Folder where images downloaded from the Smogon spreadsheet are stored.
     local files="downloads/"
     local formDS
+    local formDSAnimated
     formDS=$(jq . forms.json)
+    formDSAnimated="$formDS"  # default to same as formDS
+    if [ -f forms-animated.json ]; then
+        # Merge forms-animated.json into forms.json (animated overrides original)
+        formDSAnimated=$(jq -n --argjson base "$formDS" --argjson animated "$(jq . forms-animated.json)" '$base * $animated')
+    fi
     # echo "$formDS" | jq -r '.["885"]'
 
     cd "$files" || exit
@@ -95,13 +101,18 @@ convert(){
                 else
                     echo "[+] Copying GMax $smogonName to $bwDestination/$pokemonID.$fileExt"
                     if [ "$fileExt" == "png" ]; then
-                        cp "$smogonName" "$destination/$pokemonID.$fileExt"
+                        mv "$smogonName" "$destination/$pokemonID.$fileExt"
                     fi
-                    cp "$smogonName" "$bwDestination/$pokemonID.$fileExt"
+                    mv "$smogonName" "$bwDestination/$pokemonID.$fileExt"
                 fi
             fi
             if [ "$form" ]; then
-                pokemonName=$(echo "$formDS" | jq -r ".[\"${id}_${form}\"]")
+                # Use animated forms for .gif, regular forms for .png
+                if [ "$fileExt" == "gif" ]; then
+                    pokemonName=$(echo "$formDSAnimated" | jq -r ".[\"${id}_${form}\"]")
+                else
+                    pokemonName=$(echo "$formDS" | jq -r ".[\"${id}_${form}\"]")
+                fi
 
                 if [ $? -ne 0 ] || [ "$pokemonName" == 'null' ]; then
                     echo "[-] Form ${id}_${form} wasn't found in the JSON mapping"
@@ -113,9 +124,9 @@ convert(){
                     if [ -n "$pokemonID" ] && [ "$pokemonID" != "null" ]; then
                         echo "[+] Found variety by name: Moving $smogonName to $bwDestination/$pokemonID.$fileExt"
                         if [ "$fileExt" == "png" ]; then
-                            cp "$smogonName" "$destination/$pokemonID.$fileExt"
+                            mv "$smogonName" "$destination/$pokemonID.$fileExt"
                         fi
-                        cp "$smogonName" "$bwDestination/$pokemonID.$fileExt"
+                        mv "$smogonName" "$bwDestination/$pokemonID.$fileExt"
                     else
                         # Search all forms from Pokémon API
                         echo "[!] Variety '$pokemonName' not found directly. Searching in Pokémon forms..."
@@ -134,9 +145,9 @@ convert(){
 
                             echo "[+] Found in forms: Moving $smogonName to $bwDestination/$destFile"
                             if [ "$fileExt" == "png" ]; then
-                                cp "$smogonName" "$destination/$destFile"
+                                mv "$smogonName" "$destination/$destFile"
                             fi
-                            cp "$smogonName" "$bwDestination/$destFile"
+                            mv "$smogonName" "$bwDestination/$destFile"
                         else
                             echo "[!] No matching form found for $pokemonName."
                         fi
@@ -148,9 +159,9 @@ convert(){
                 mkdir -p "$destination"
                 mkdir -p "$bwDestination"
                 if [ "$fileExt" == "png" ]; then
-                    cp "$smogonName" "$destination/$id.$fileExt"
+                    mv "$smogonName" "$destination/$id.$fileExt"
                 fi
-                cp "$smogonName" "$bwDestination/$id.$fileExt"
+                mv "$smogonName" "$bwDestination/$id.$fileExt"
             fi
         fi
     done

scripts/smogon_download.py

@@ -9,22 +9,18 @@
 # Smogon thread:
 # https://www.smogon.com/forums/threads/smogon-sprite-project.3647722/
 urls = [
-    "https://play.pokemonshowdown.com/sprites/gen5ani/comfey.gif",
-    "https://play.pokemonshowdown.com/sprites/gen5ani-back/comfey.gif",
-    "https://play.pokemonshowdown.com/sprites/gen5ani-shiny/comfey.gif",
-    "https://play.pokemonshowdown.com/sprites/gen5ani-back-shiny/comfey.gif",
-    "https://www.smogon.com/forums/attachments/762-gif.369401/",
-    "https://www.smogon.com/forums/attachments/762b-gif.369402/",
-    "https://www.smogon.com/forums/attachments/762s-gif.369403/",
-    "https://www.smogon.com/forums/attachments/762sb-gif.369404/",
+    "https://www.smogon.com/forums/attachments/019-gif.171350/",
+    "https://www.smogon.com/forums/attachments/19b-gif.177101/",
+    "https://www.smogon.com/forums/attachments/019s-gif.173309/",
+    "https://www.smogon.com/forums/attachments/19sb-gif.177103/",
 ]
 
 # Set a User-Agent to prevent Smogon from blocking the request
 HEADERS = {
     "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/86.0.4240.111 Safari/537.31"
 }
 
-# Mapping Showdown directories to your filename suffixes
+# Mapping Showdown directories to filename suffixes
 SHOWDOWN_SUFFIX_MAP = {
     "gen5ani": "",
     "gen5ani-back": "b",
@@ -51,7 +47,6 @@ def download_sprites():
     download_dir = script_dir / "downloads"
     download_dir.mkdir(exist_ok=True)
 
-    # Load and invert the name map
     name_to_id = load_forms_map(script_dir)
 
     print(f"📁 Directory ready: {download_dir.absolute()}")