WatWowMap · versx · Jul 8, 2022 · Feb 17, 2022 · Feb 17, 2022 · Feb 17, 2022
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/routes/api.js b/src/routes/api.js
@@ -885,19 +885,21 @@ const getData = async (perms, filter) => {
         const invasionData = [];
 
         // Grunt Type
-        for (let i = 1; i <= 50; i++) {
-            (i >= 41 && i <= 44 ? invasionLeaderData : invasionData).push({
+        for (const i of Object.entries(masterfile.invasions)) {
+            // Skip unset, Jesse, James, & extra grunts
+            if (['0', '45', '46', '53', '54'].includes(i[0])) { continue; }
+            (i[0] >= 41 && i[0] <= 44 ? invasionLeaderData : invasionData).push({
                 'id': {
-                    'formatted': utils.zeroPad(i, 3),
-                    'sort': i
+                    'formatted': utils.zeroPad(i[0], 3),
+                    'sort': i[0]
                 },
-                'name': i18n.__('grunt_' + i),
+                'name': i18n.__('grunt_' + i[0]),
                 'image': {
                     type: 'img',
-                    path: `/grunt/${i}.png`
+                    path: `/grunt/${i[0]}.png`
                 },
-                'filter': generateShowHideButtons(i, 'invasion-grunt'),
-                'size': generateSizeButtons(i, 'invasion-grunt'),
+                'filter': generateShowHideButtons(i[0], 'invasion-grunt'),
+                'size': generateSizeButtons(i[0], 'invasion-grunt'),
                 'type': gruntTypeString
             });
         }

diff --git a/static/img/grunt/0.png b/static/img/grunt/0.png
diff --git a/static/img/grunt/500.png b/static/img/grunt/500.png
diff --git a/static/img/grunt/501.png b/static/img/grunt/501.png
diff --git a/static/img/grunt/502.png b/static/img/grunt/502.png
diff --git a/static/img/grunt/503.png b/static/img/grunt/503.png
diff --git a/static/img/grunt/504.png b/static/img/grunt/504.png
diff --git a/static/img/grunt/505.png b/static/img/grunt/505.png
diff --git a/static/img/grunt/506.png b/static/img/grunt/506.png
diff --git a/static/img/grunt/507.png b/static/img/grunt/507.png
diff --git a/static/img/grunt/508.png b/static/img/grunt/508.png
diff --git a/static/img/grunt/509.png b/static/img/grunt/509.png
diff --git a/static/img/grunt/510.png b/static/img/grunt/510.png
diff --git a/static/img/grunt/511.png b/static/img/grunt/511.png
diff --git a/static/img/grunt/512.png b/static/img/grunt/512.png
diff --git a/static/img/grunt/513.png b/static/img/grunt/513.png
diff --git a/static/img/invasion/i0.png b/static/img/invasion/i0.png
diff --git a/static/img/invasion/i0_0.png b/static/img/invasion/i0_0.png
diff --git a/static/img/invasion/i0_500.png b/static/img/invasion/i0_500.png
diff --git a/static/img/invasion/i0_501.png b/static/img/invasion/i0_501.png
diff --git a/static/img/invasion/i0_502.png b/static/img/invasion/i0_502.png
diff --git a/static/img/invasion/i0_503.png b/static/img/invasion/i0_503.png
diff --git a/static/img/invasion/i0_504.png b/static/img/invasion/i0_504.png
diff --git a/static/img/invasion/i0_505.png b/static/img/invasion/i0_505.png
diff --git a/static/img/invasion/i0_506.png b/static/img/invasion/i0_506.png
diff --git a/static/img/invasion/i0_507.png b/static/img/invasion/i0_507.png
diff --git a/static/img/invasion/i0_509.png b/static/img/invasion/i0_509.png
diff --git a/static/img/invasion/i1_0.png b/static/img/invasion/i1_0.png
diff --git a/static/img/invasion/i1_500.png b/static/img/invasion/i1_500.png
diff --git a/static/img/invasion/i1_501.png b/static/img/invasion/i1_501.png
diff --git a/static/img/invasion/i1_502.png b/static/img/invasion/i1_502.png
diff --git a/static/img/invasion/i1_503.png b/static/img/invasion/i1_503.png
diff --git a/static/img/invasion/i1_504.png b/static/img/invasion/i1_504.png
diff --git a/static/img/invasion/i1_505.png b/static/img/invasion/i1_505.png
diff --git a/static/img/invasion/i1_506.png b/static/img/invasion/i1_506.png
diff --git a/static/img/invasion/i1_507.png b/static/img/invasion/i1_507.png
diff --git a/static/img/invasion/i1_509.png b/static/img/invasion/i1_509.png
diff --git a/static/img/invasion/i2_0.png b/static/img/invasion/i2_0.png
diff --git a/static/img/invasion/i2_500.png b/static/img/invasion/i2_500.png
diff --git a/static/img/invasion/i2_501.png b/static/img/invasion/i2_501.png
diff --git a/static/img/invasion/i2_502.png b/static/img/invasion/i2_502.png
diff --git a/static/img/invasion/i2_503.png b/static/img/invasion/i2_503.png
diff --git a/static/img/invasion/i2_504.png b/static/img/invasion/i2_504.png
diff --git a/static/img/invasion/i2_505.png b/static/img/invasion/i2_505.png
diff --git a/static/img/invasion/i2_506.png b/static/img/invasion/i2_506.png
diff --git a/static/img/invasion/i2_507.png b/static/img/invasion/i2_507.png
diff --git a/static/img/invasion/i2_509.png b/static/img/invasion/i2_509.png
diff --git a/static/img/invasion/i3_0.png b/static/img/invasion/i3_0.png
diff --git a/static/img/invasion/i3_500.png b/static/img/invasion/i3_500.png
diff --git a/static/img/invasion/i3_501.png b/static/img/invasion/i3_501.png
diff --git a/static/img/invasion/i3_502.png b/static/img/invasion/i3_502.png
diff --git a/static/img/invasion/i3_503.png b/static/img/invasion/i3_503.png
diff --git a/static/img/invasion/i3_504.png b/static/img/invasion/i3_504.png
diff --git a/static/img/invasion/i3_505.png b/static/img/invasion/i3_505.png
diff --git a/static/img/invasion/i3_506.png b/static/img/invasion/i3_506.png
diff --git a/static/img/invasion/i3_507.png b/static/img/invasion/i3_507.png
diff --git a/static/img/invasion/i3_509.png b/static/img/invasion/i3_509.png
diff --git a/static/img/invasion/i4_0.png b/static/img/invasion/i4_0.png
diff --git a/static/img/invasion/i4_500.png b/static/img/invasion/i4_500.png
diff --git a/static/img/invasion/i4_501.png b/static/img/invasion/i4_501.png
diff --git a/static/img/invasion/i4_502.png b/static/img/invasion/i4_502.png
diff --git a/static/img/invasion/i4_503.png b/static/img/invasion/i4_503.png
diff --git a/static/img/invasion/i4_504.png b/static/img/invasion/i4_504.png
diff --git a/static/img/invasion/i4_505.png b/static/img/invasion/i4_505.png
diff --git a/static/img/invasion/i4_506.png b/static/img/invasion/i4_506.png
diff --git a/static/img/invasion/i4_507.png b/static/img/invasion/i4_507.png
diff --git a/static/img/invasion/i4_509.png b/static/img/invasion/i4_509.png
diff --git a/static/img/invasion/i5_0.png b/static/img/invasion/i5_0.png
diff --git a/static/img/invasion/i5_500.png b/static/img/invasion/i5_500.png
diff --git a/static/img/invasion/i5_501.png b/static/img/invasion/i5_501.png
diff --git a/static/img/invasion/i5_502.png b/static/img/invasion/i5_502.png
diff --git a/static/img/invasion/i5_503.png b/static/img/invasion/i5_503.png
diff --git a/static/img/invasion/i5_504.png b/static/img/invasion/i5_504.png
diff --git a/static/img/invasion/i5_505.png b/static/img/invasion/i5_505.png
diff --git a/static/img/invasion/i5_506.png b/static/img/invasion/i5_506.png
diff --git a/static/img/invasion/i5_507.png b/static/img/invasion/i5_507.png
diff --git a/static/img/invasion/i5_509.png b/static/img/invasion/i5_509.png
diff --git a/static/js/index.js b/static/js/index.js
@@ -2119,9 +2119,9 @@ function loadData () {
 
     const invasionFilterExclude = [];
     if (showInvasions) {
-        for (let i = 1; i <= 50; i++) {
-            if (invasionFilter['i' + i].show === false) {
-                invasionFilterExclude.push('i' + i);
+        for (const i of Object.entries(masterfile.invasions)) {
+            if (invasionFilter['i' + i[0]].show === false) {
+                invasionFilterExclude.push('i' + i[0]);
             }
         }
     }
@@ -7985,8 +7985,8 @@ function registerFilterButtonCallbacks() {
     // Invasion filter buttons
     $('#reset-invasion-filter').on('click', function (event) {
         const defaultInvasionFilter = {};
-        for (let i = 1; i <= 50; i++) {
-            defaultInvasionFilter['i' + i] = { show: true, size: 'normal' };
+        for (const i of Object.entries(masterfile.invasions)) {
+            defaultInvasionFilter['i' + i[0]] = { show: true, size: 'normal' };
         }
 
         store('invasion_filter', JSON.stringify(defaultInvasionFilter));
@@ -7997,8 +7997,8 @@ function registerFilterButtonCallbacks() {
 
     $('#disable-all-invasion-filter').on('click', function (event) {
         const defaultInvasionFilter = {};
-        for (let i = 1; i <= 50; i++) {
-            defaultInvasionFilter['i' + i] = { show: false, size: invasionFilterNew['i' + i].size };
+        for (const i of Object.entries(masterfile.invasions)) {
+            defaultInvasionFilter['i' + i[0]] = { show: false, size: invasionFilterNew['i' + i[0]].size };
         }
 
         store('invasion_filter', JSON.stringify(defaultInvasionFilter));