Merge pull request cecpk#315 from wraythex/wraythex-patch-8

Add showcase support to RM-async
pki0 · Sep 6, 2023 · 1d1c910 · 1d1c910
2 parents 951bfd1 + d5f6fbe
commit 1d1c910
Show file tree

Hide file tree

Showing 48 changed files with 18 additions and 2 deletions.
diff --git a/rocketmad/models.py b/rocketmad/models.py
@@ -586,8 +586,12 @@ def get_pokestops(swLat, swLng, neLat, neLng, oSwLat=None, oSwLng=None,
 
             if incident_orm is not None:
                 pokestop['incident_expiration'] = incident_orm.incident_expiration
-                if incident_orm.incident_display_type == 8:
+                if incident_orm.incident_display_type == 7:
+                    pokestop['incident_grunt_type'] = 998
+                elif incident_orm.incident_display_type == 8:
                     pokestop['incident_grunt_type'] = 352
+                elif incident_orm.incident_display_type == 9:
+                    pokestop['incident_grunt_type'] = 9001
                 else:
                     pokestop['incident_grunt_type'] = incident_orm.character_display
             else:

diff --git a/static/data/invasions.json b/static/data/invasions.json
@@ -807,5 +807,13 @@
   "510": {
     "type": "",
     "grunt": "Savannah Trainer"
+  },
+  "998": {
+    "type": "",
+    "grunt": "Gimmighoul Coins"
+  },
+  "9001": {
+    "type": "",
+    "grunt": "Showcase"
   }
 }
diff --git a/static/images/invasion/9001.png b/static/images/invasion/9001.png
diff --git a/static/images/invasion/998.png b/static/images/invasion/998.png
diff --git a/static/images/invasion/999.png b/static/images/invasion/999.png
diff --git a/static/images/pokestop/stop_i_9001.png b/static/images/pokestop/stop_i_9001.png
diff --git a/static/images/pokestop/stop_i_9001_l_501.png b/static/images/pokestop/stop_i_9001_l_501.png
diff --git a/static/images/pokestop/stop_i_9001_l_502.png b/static/images/pokestop/stop_i_9001_l_502.png
diff --git a/static/images/pokestop/stop_i_9001_l_503.png b/static/images/pokestop/stop_i_9001_l_503.png
diff --git a/static/images/pokestop/stop_i_9001_l_504.png b/static/images/pokestop/stop_i_9001_l_504.png
diff --git a/static/images/pokestop/stop_i_9001_l_505.png b/static/images/pokestop/stop_i_9001_l_505.png
diff --git a/static/images/pokestop/stop_i_9001_l_506.png b/static/images/pokestop/stop_i_9001_l_506.png
diff --git a/static/images/pokestop/stop_i_998.png b/static/images/pokestop/stop_i_998.png
diff --git a/static/images/pokestop/stop_i_998_l_501.png b/static/images/pokestop/stop_i_998_l_501.png
diff --git a/static/images/pokestop/stop_i_998_l_502.png b/static/images/pokestop/stop_i_998_l_502.png
diff --git a/static/images/pokestop/stop_i_998_l_503.png b/static/images/pokestop/stop_i_998_l_503.png
diff --git a/static/images/pokestop/stop_i_998_l_504.png b/static/images/pokestop/stop_i_998_l_504.png
diff --git a/static/images/pokestop/stop_i_998_l_505.png b/static/images/pokestop/stop_i_998_l_505.png
diff --git a/static/images/pokestop/stop_i_998_l_506.png b/static/images/pokestop/stop_i_998_l_506.png
diff --git a/static/images/pokestop/stop_i_999.png b/static/images/pokestop/stop_i_999.png
diff --git a/static/images/pokestop/stop_i_999_l_501.png b/static/images/pokestop/stop_i_999_l_501.png
diff --git a/static/images/pokestop/stop_i_999_l_502.png b/static/images/pokestop/stop_i_999_l_502.png
diff --git a/static/images/pokestop/stop_i_999_l_503.png b/static/images/pokestop/stop_i_999_l_503.png
diff --git a/static/images/pokestop/stop_i_999_l_504.png b/static/images/pokestop/stop_i_999_l_504.png
diff --git a/static/images/pokestop/stop_i_999_l_505.png b/static/images/pokestop/stop_i_999_l_505.png
diff --git a/static/images/pokestop/stop_i_999_l_506.png b/static/images/pokestop/stop_i_999_l_506.png
diff --git a/static/images/pokestop/stop_q_i_9001.png b/static/images/pokestop/stop_q_i_9001.png
diff --git a/static/images/pokestop/stop_q_i_9001_l_501.png b/static/images/pokestop/stop_q_i_9001_l_501.png
diff --git a/static/images/pokestop/stop_q_i_9001_l_502.png b/static/images/pokestop/stop_q_i_9001_l_502.png
diff --git a/static/images/pokestop/stop_q_i_9001_l_503.png b/static/images/pokestop/stop_q_i_9001_l_503.png
diff --git a/static/images/pokestop/stop_q_i_9001_l_504.png b/static/images/pokestop/stop_q_i_9001_l_504.png
diff --git a/static/images/pokestop/stop_q_i_9001_l_505.png b/static/images/pokestop/stop_q_i_9001_l_505.png
diff --git a/static/images/pokestop/stop_q_i_9001_l_506.png b/static/images/pokestop/stop_q_i_9001_l_506.png
diff --git a/static/images/pokestop/stop_q_i_998.png b/static/images/pokestop/stop_q_i_998.png
diff --git a/static/images/pokestop/stop_q_i_998_l_501.png b/static/images/pokestop/stop_q_i_998_l_501.png
diff --git a/static/images/pokestop/stop_q_i_998_l_502.png b/static/images/pokestop/stop_q_i_998_l_502.png
diff --git a/static/images/pokestop/stop_q_i_998_l_503.png b/static/images/pokestop/stop_q_i_998_l_503.png
diff --git a/static/images/pokestop/stop_q_i_998_l_504.png b/static/images/pokestop/stop_q_i_998_l_504.png
diff --git a/static/images/pokestop/stop_q_i_998_l_505.png b/static/images/pokestop/stop_q_i_998_l_505.png
diff --git a/static/images/pokestop/stop_q_i_998_l_506.png b/static/images/pokestop/stop_q_i_998_l_506.png
diff --git a/static/images/pokestop/stop_q_i_999.png b/static/images/pokestop/stop_q_i_999.png
diff --git a/static/images/pokestop/stop_q_i_999_l_501.png b/static/images/pokestop/stop_q_i_999_l_501.png
diff --git a/static/images/pokestop/stop_q_i_999_l_502.png b/static/images/pokestop/stop_q_i_999_l_502.png
diff --git a/static/images/pokestop/stop_q_i_999_l_503.png b/static/images/pokestop/stop_q_i_999_l_503.png
diff --git a/static/images/pokestop/stop_q_i_999_l_504.png b/static/images/pokestop/stop_q_i_999_l_504.png
diff --git a/static/images/pokestop/stop_q_i_999_l_505.png b/static/images/pokestop/stop_q_i_999_l_505.png
diff --git a/static/images/pokestop/stop_q_i_999_l_506.png b/static/images/pokestop/stop_q_i_999_l_506.png
diff --git a/static/js/map/map.settings.js b/static/js/map/map.settings.js
@@ -2277,7 +2277,11 @@ function initItemFilters() {
 }
 
 function initInvasionFilters() {
-    const invasionIds = new Set([41, 42, 43, 44, 5, 4, 6, 7, 10, 11, 12, 13, 49, 50, 14, 15, 16, 17, 18, 19, 20, 21, 47, 48, 22, 23, 24, 25, 26, 27, 30, 31, 32, 33, 34, 35, 36, 37, 28, 29, 38, 39, 352, 500, 501, 502, 504, 506, 507])
+    const invasionIds = new Set([41, 42, 43, 44, 5, 4, 6, 7, 10, 11, 12, 13,
+                                 49, 50, 14, 15, 16, 17, 18, 19, 20, 21, 47,
+                                 48, 22, 23, 24, 25, 26, 27, 30, 31, 32, 33,
+                                 34, 35, 36, 37, 28, 29, 38, 39, 352, 998,
+                                 9001, 500, 501, 502, 504, 506, 507])
 
     class InvasionFilterManager extends FilterManager {
         getListSelector() { return '.invasion-filter-list' }