Merge pull request #370 from LordJavi/rainy-lure

Add support for Rainy lure module

Author: TurtIeSocks

src/data/item.js

@@ -21,6 +21,7 @@ const InventoryItemId = {
     ITEM_TROY_DISK_GLACIAL: 502,
     ITEM_TROY_DISK_MOSSY: 503,
     ITEM_TROY_DISK_MAGNETIC: 504,
+    ITEM_TROY_DISK_RAINY: 505,
     //ITEM_X_ATTACK: 602,
     //ITEM_X_DEFENSE: 603,
     //ITEM_X_MIRACLE: 604,
@@ -64,4 +65,4 @@ const InventoryItemId = {
     //ITEM_GLOBAL_EVENT_TICKET: 1600
 };
 
-module.exports = InventoryItemId;
+module.exports = InventoryItemId;

src/routes/api.js

@@ -826,7 +826,7 @@ const getData = async (perms, filter) => {
         });
 
         if (permShowLures) {
-            for (let i = 1; i <= 4; i++) {
+            for (let i = 1; i <= 5; i++) {
                 const pokestopLure = i18n.__('filter_pokestop_lure_' + i);
                 pokestopData.push({
                     'id': {

static/css/index.css

@@ -233,7 +233,9 @@ fieldset[disabled] .btn-size.active {
 .lure-magnetic {
     border: 4px solid yellow;
 }
-
+.lure-rainy {
+    border: 4px solid rgb(66, 79, 248);
+}
 .team-mystic {
     border: 4px solid blue;
 }

static/data/masterfile.json

@@ -43226,6 +43226,13 @@
 			"category": "Disk",
 			"min_trainer_level": 1
 		},
+		"505": {
+			"name": "Troy Disk Rainy",
+			"proto": "ITEM_TROY_DISK_RAINY",
+			"type": "Disk",
+			"category": "Disk",
+			"min_trainer_level": 1
+		},
 		"602": {
 			"name": "X Attack",
 			"proto": "ITEM_X_ATTACK",

static/img/pokestop/5.png

@@ -950,7 +950,7 @@ function loadStorage () {
             defaultPokestopFilter.normal = { show: true, size: 'normal' };
         }
         let i;
-        for (i = 1; i < 5; i++) {
+        for (i = 1; i < 6; i++) {
             if (defaultPokestopFilter['l' + i] === undefined) {
                 defaultPokestopFilter['l' + i] = { show: true, size: 'normal' };
             }
@@ -964,7 +964,7 @@ function loadStorage () {
             pokestopFilter.normal = { show: true, size: 'normal' };
         }
         let i;
-        for (i = 1; i < 5; i++) {
+        for (i = 1; i < 6; i++) {
             if (pokestopFilter['l' + i] === undefined) {
                 pokestopFilter['l' + i] = { show: true, size: 'normal' };
             }
@@ -2097,7 +2097,7 @@ function loadData () {
         if (pokestopFilter.normal.show === false) {
             pokestopFilterExclude.push('normal');
         }
-        for (let i = 1; i < 5; i++) {
+        for (let i = 1; i < 6; i++) {
             if (pokestopFilter['l' + i].show === false) {
                 pokestopFilterExclude.push('l' + i);
             }
@@ -3385,7 +3385,9 @@ function getPokestopPopupContent (pokestop) {
                         ? 'lure-mossy'
                         : pokestop.lure_id === 504
                             ? 'lure-magnetic'
-                            : 'lure-normal')
+                            : pokestop.lure_id === 505
+                                ? 'lure-rainy'
+                                : 'lure-normal')
             : '';
         content += '<img src="' + pokestop.url.replace('http://', 'https://') + '" class="circle-image ' + lureClass + '"/><br><br>';
     }
@@ -5930,6 +5932,8 @@ function getLureIconId (lureId) {
         return 3;
     case 504:
         return 4;
+    case 505:
+        return 5;
     }
     return 1;
 }
@@ -7856,7 +7860,7 @@ function registerFilterButtonCallbacks() {
     $('#reset-pokestop-filter').on('click', function (event) {
         const defaultPokestopFilter = {};
         defaultPokestopFilter.normal = { show: true, size: 'normal' };
-        for (let i = 1; i < 5; i++) {
+        for (let i = 1; i < 6; i++) {
             defaultPokestopFilter['l' + i] = { show: true, size: 'normal' };
         }
 
@@ -7869,7 +7873,7 @@ function registerFilterButtonCallbacks() {
     $('#disable-all-pokestop-filter').on('click', function (event) {
         const defaultPokestopFilter = {};
         defaultPokestopFilter.normal = { show: false, size: pokestopFilterNew.normal.size };
-        for (let i = 1; i < 5; i++) {
+        for (let i = 1; i < 6; i++) {
             defaultPokestopFilter['l' + i] = { show: false, size: pokestopFilterNew['l' + i].size };
         }
 

static/img/pokestop/i5.png

@@ -154,6 +154,7 @@
     "filter_pokestop_lure_2": "Glacial Lure",
     "filter_pokestop_lure_3": "Mossy Lure",
     "filter_pokestop_lure_4": "Magnetic Lure",
+    "filter_pokestop_lure_5": "Rainy Lure",
     "filter_pokestop_invasion": "Team Rocket Invasions",
     "filter_invasion_timers": "Invasion Timers",
     "filter_spawnpoint_options": "Options",
@@ -353,4 +354,4 @@
     "and_result": "All Pokemon with IVs between 80-100, are L25-30, AND have stats of 15/10/10",
     "advanced": "Advanced",
     "advanced_result": "Returns all Pokemon that have either CP1400-1500 OR CP2400-2500 AND have 0-1 Attack, 15 Defense, 15 Stamina, OR level 34-35 OR 90-100% IVs OR PVP Great or Ultra league rank between 1-3."
- }
+ }