Merge pull request #328 from wraythex/update-protos-2023-11-19-a

Update protos 2023-11-19 (async)
cecpk · Nov 19, 2023 · beef0c8 · beef0c8
2 parents 9e8164e + cfeb7da
commit beef0c8
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 39 deletions.
diff --git a/rocketmad/pogo_protos_pb2.py b/rocketmad/pogo_protos_pb2.py
diff --git a/scripts/protos/vdisplayproto.proto b/scripts/protos/vdisplayproto.proto
@@ -2424,6 +2424,8 @@ message PokemonDisplayProto {
 		PIKACHU_GOTOUR_2024_B = 2826;
 		PIKACHU_GOTOUR_2024_A_02 = 2827;
 		PIKACHU_GOTOUR_2024_B_02 = 2828;
+		DIALGA_ORIGIN = 2829;
+		PALKIA_ORIGIN = 2830;
 		ROCKRUFF_NORMAL = 2831;
 		OINKOLOGNE_NORMAL = 2981;
 		OINKOLOGNE_FEMALE = 2982;

diff --git a/static/data/pokemon.json b/static/data/pokemon.json
@@ -708,100 +708,114 @@
     ],
     "forms": {
       "598": {
-        "formName": "",
-        "assetId": "00"
+        "formName": ""
       },
       "894": {
         "formName": "",
-        "assetSuffix": "pm0025_00_pgo_fall2019"
+        "genderDiff": true
       },
       "901": {
         "formName": "Libre",
         "assetId": "16"
       },
       "949": {
         "formName": "Clone",
-        "assetSuffix": "pm0025_00_pgo_copy2019"
+        "genderDiff": true
       },
       "977": {
-        "formName": "Shadow",
-        "assetId": "00"
+        "formName": "Shadow"
       },
       "978": {
-        "formName": "Purified",
-        "assetId": "00"
+        "formName": "Purified"
       },
       "2332": {
         "formName": "Flying",
-        "assetSuffix": "pm0025_00_pgo_4thanniversary"
+        "genderDiff": true
       },
       "2669": {
         "formName": "",
-        "assetSuffix": "pm0025_00_pgo_movie2020"
+        "genderDiff": true
       },
       "2670": {
         "formName": "",
-        "assetSuffix": "pm0025_00_pgo_winter2020"
+        "genderDiff": true
       },
       "2675": {
         "formName": "Kariyushi",
-        "assetSuffix": "pm0025_00_pikachu_pgo_kariyushi"
+        "genderDiff": true
       },
       "2676": {
-        "formName": "Popstar",
-        "assetSuffix": "pm0025_00_pgo_popstar"
+        "formName": "Popstar"
       },
       "2677": {
-        "formName": "Rockstar",
-        "assetSuffix": "pm0025_00_pgo_rockstar"
+        "formName": "Rockstar"
       },
       "2678": {
         "formName": "Flying",
-        "assetSuffix": "pm0025_00_pgo_5thanniversary"
+        "genderDiff": true
       },
       "2736": {
         "formName": "Flying Okinawa",
-        "assetId": "00"
+        "genderDiff": true
       },
       "2805": {
         "formName": "GO Fest 2022",
-        "assetId": "00"
+        "genderDiff": true
+      },
+      "2806": {
+        "formName": "Wcs 2022",
+        "genderDiff": true
       },
       "2813": {
         "formName": "T-shirt 1",
-        "assetId": "00"
+        "genderDiff": true
       },
       "2814": {
         "formName": "T-shirt 2",
-        "assetId": "00"
+        "genderDiff": true
       },
       "2815": {
         "formName": "Flying 1",
-        "assetId": "00"
+        "genderDiff": true
       },
       "2816": {
         "formName": "Flying 2",
-        "assetId": "00"
+        "genderDiff": true
       },
       "3002": {
         "formName": "Summer 2023 A",
-        "assetId": "00"
+        "genderDiff": true
       },
       "3003": {
         "formName": "Summer 2023 B",
-        "assetId": "00"
+        "genderDiff": true
       },
       "3004": {
         "formName": "Summer 2023 C",
-        "assetId": "00"
+        "genderDiff": true
       },
       "3005": {
         "formName": "Summer 2023 D",
-        "assetId": "00"
+        "genderDiff": true
       },
       "3010": {
         "formName": "Summer 2023 E",
-        "assetId": "00"
+        "genderDiff": true
+      },
+      "3011": {
+        "formName": "Flying 3",
+        "genderDiff": true
+      },
+      "3012": {
+        "formName": "Jeju Island",
+        "genderDiff": true
+      },
+      "3013": {
+        "formName": "Doctor"
+      },
+      "3014": {
+        "formName": "Wcs 2023",
+        "genderDiff": true
       }
     }
   },
@@ -6399,7 +6413,8 @@
             "color": "#8a8a59"
           }
         ],
-        "assetId": "00"
+        "assetId": "00",
+        "genderDiff": true
       }
     }
   },
@@ -13744,6 +13759,9 @@
       "1858": {
         "formName": "Purified",
         "assetId": "00"
+      },
+      "2829": {
+        "formName": "Origin"
       }
     }
   },
@@ -13773,6 +13791,9 @@
       "1861": {
         "formName": "Purified",
         "assetId": "00"
+      },
+      "2830": {
+        "formName": "Origin"
       }
     }
   },
@@ -22756,13 +22777,7 @@
         "type": "Rock",
         "color": "#ffffff"
       }
-    ],
-    "forms": {
-      "2806": {
-        "formName": "",
-        "assetId": "00"
-      }
-    }
+    ]
   },
   "901": {
     "name": "Ursaluna",