Merge pull request #47 from versx/quest-image-amount

Quest Reward Amount Image Support
WatWowMap · Aug 19, 2020 · d7ffe2e · d7ffe2e
2 parents 5de1e3d + b2b6937
commit d7ffe2e
Show file tree

Hide file tree

Showing 179 changed files with 11 additions and 4 deletions.
diff --git a/src/index.js b/src/index.js
@@ -15,7 +15,6 @@ const defaultData = require('./data/default.js');
 const apiRoutes = require('./routes/api.js');
 const discordRoutes = require('./routes/discord.js');
 const uiRoutes = require('./routes/ui.js');
-const utils = require('./services/utils.js');
 
 // TODO: Separate cluster layers by type
 // TODO: Use api endpoint for each model type instead of one for all. Update and clear based on layers of types
@@ -26,6 +25,7 @@ const utils = require('./services/utils.js');
 // TODO: Glow for top pvp ranks
 // TODO: Only clear layers if filter changed
 // TODO: Reset all settings (clear cache/session)
+// TODO: Filter candy/stardust quest by amount
 
 // Basic security protection middleware
 app.use(helmet());

diff --git a/src/views/index-js.mustache b/src/views/index-js.mustache
@@ -3862,13 +3862,20 @@ function getPokestopMarkerIcon (pokestop, ts) {
         let rewardString;
         let iconUrl;
         if (id === 1 && info !== undefined && info.amount !== undefined) {
+            // XP
             iconUrl = `${availableIconStyles[selectedIconStyle]}/item/-2.png`;
         } else if (id === 2 && info !== undefined && info.amount !== undefined && info.item_id !== undefined) {
-            iconUrl = `${availableIconStyles[selectedIconStyle]}/item/${info.item_id}.png`;
+            // Item
+            //iconUrl = `${availableIconStyles[selectedIconStyle]}/item/${info.item_id}.png`;
+            iconUrl = `${availableIconStyles[selectedIconStyle]}/reward/reward_${info.item_id}_${info.amount}.png`;
         } else if (id === 3 && info !== undefined && info.amount !== undefined) {
-            iconUrl = `${availableIconStyles[selectedIconStyle]}/item/-1.png`;
+            // Stardust
+            //iconUrl = `${availableIconStyles[selectedIconStyle]}/item/-1.png`;
+            iconUrl = `${availableIconStyles[selectedIconStyle]}/reward/reward_stardust${info.amount > 0 ? '_' + info.amount : ''}.png`;
         } else if (id === 4 && info !== undefined && info.amount !== undefined && info.pokemon_id !== undefined) {
-            iconUrl = `${availableIconStyles[selectedIconStyle]}/item/-3.png`;
+            // Candy
+            //iconUrl = `${availableIconStyles[selectedIconStyle]}/item/-3.png`;
+            iconUrl = `${availableIconStyles[selectedIconStyle]}/reward/reward_1301_${info.amount}.png`;
         } else if (id === 7 && info !== undefined && info.pokemon_id !== undefined) {
             if (info.form_id !== 0 && info.form_id !== null) {
                 const pokemonIdStringTmp = info.pokemon_id + '-' + info.form_id;

diff --git a/static/img/reward/reward_0_1.png b/static/img/reward/reward_0_1.png
diff --git a/static/img/reward/reward_1001_1.png b/static/img/reward/reward_1001_1.png
diff --git a/static/img/reward/reward_1002_1.png b/static/img/reward/reward_1002_1.png
diff --git a/static/img/reward/reward_101_1.png b/static/img/reward/reward_101_1.png
diff --git a/static/img/reward/reward_101_10.png b/static/img/reward/reward_101_10.png
diff --git a/static/img/reward/reward_101_2.png b/static/img/reward/reward_101_2.png
diff --git a/static/img/reward/reward_101_3.png b/static/img/reward/reward_101_3.png
diff --git a/static/img/reward/reward_101_5.png b/static/img/reward/reward_101_5.png
diff --git a/static/img/reward/reward_101_6.png b/static/img/reward/reward_101_6.png
diff --git a/static/img/reward/reward_101_8.png b/static/img/reward/reward_101_8.png
diff --git a/static/img/reward/reward_101_9.png b/static/img/reward/reward_101_9.png
diff --git a/static/img/reward/reward_102_1.png b/static/img/reward/reward_102_1.png
diff --git a/static/img/reward/reward_102_10.png b/static/img/reward/reward_102_10.png
diff --git a/static/img/reward/reward_102_2.png b/static/img/reward/reward_102_2.png
diff --git a/static/img/reward/reward_102_3.png b/static/img/reward/reward_102_3.png
diff --git a/static/img/reward/reward_102_5.png b/static/img/reward/reward_102_5.png
diff --git a/static/img/reward/reward_102_6.png b/static/img/reward/reward_102_6.png
diff --git a/static/img/reward/reward_102_8.png b/static/img/reward/reward_102_8.png
diff --git a/static/img/reward/reward_102_9.png b/static/img/reward/reward_102_9.png
diff --git a/static/img/reward/reward_103_1.png b/static/img/reward/reward_103_1.png
diff --git a/static/img/reward/reward_103_10.png b/static/img/reward/reward_103_10.png
diff --git a/static/img/reward/reward_103_2.png b/static/img/reward/reward_103_2.png
diff --git a/static/img/reward/reward_103_3.png b/static/img/reward/reward_103_3.png
diff --git a/static/img/reward/reward_103_5.png b/static/img/reward/reward_103_5.png
diff --git a/static/img/reward/reward_103_6.png b/static/img/reward/reward_103_6.png
diff --git a/static/img/reward/reward_103_8.png b/static/img/reward/reward_103_8.png
diff --git a/static/img/reward/reward_103_9.png b/static/img/reward/reward_103_9.png
diff --git a/static/img/reward/reward_104_1.png b/static/img/reward/reward_104_1.png
diff --git a/static/img/reward/reward_104_10.png b/static/img/reward/reward_104_10.png
diff --git a/static/img/reward/reward_104_2.png b/static/img/reward/reward_104_2.png
diff --git a/static/img/reward/reward_104_3.png b/static/img/reward/reward_104_3.png
diff --git a/static/img/reward/reward_104_5.png b/static/img/reward/reward_104_5.png
diff --git a/static/img/reward/reward_104_6.png b/static/img/reward/reward_104_6.png
diff --git a/static/img/reward/reward_104_8.png b/static/img/reward/reward_104_8.png
diff --git a/static/img/reward/reward_104_9.png b/static/img/reward/reward_104_9.png
diff --git a/static/img/reward/reward_1101_1.png b/static/img/reward/reward_1101_1.png
diff --git a/static/img/reward/reward_1102_1.png b/static/img/reward/reward_1102_1.png
diff --git a/static/img/reward/reward_1103_1.png b/static/img/reward/reward_1103_1.png
diff --git a/static/img/reward/reward_1104_1.png b/static/img/reward/reward_1104_1.png
diff --git a/static/img/reward/reward_1105_1.png b/static/img/reward/reward_1105_1.png
diff --git a/static/img/reward/reward_1106_1.png b/static/img/reward/reward_1106_1.png
diff --git a/static/img/reward/reward_1107.png b/static/img/reward/reward_1107.png
diff --git a/static/img/reward/reward_1107_1.png b/static/img/reward/reward_1107_1.png
diff --git a/static/img/reward/reward_1201_1.png b/static/img/reward/reward_1201_1.png
diff --git a/static/img/reward/reward_1201_2.png b/static/img/reward/reward_1201_2.png
diff --git a/static/img/reward/reward_1202_1.png b/static/img/reward/reward_1202_1.png
diff --git a/static/img/reward/reward_1202_2.png b/static/img/reward/reward_1202_2.png
diff --git a/static/img/reward/reward_1203.png b/static/img/reward/reward_1203.png
diff --git a/static/img/reward/reward_1204.png b/static/img/reward/reward_1204.png
diff --git a/static/img/reward/reward_1301_1.png b/static/img/reward/reward_1301_1.png
diff --git a/static/img/reward/reward_1301_2.png b/static/img/reward/reward_1301_2.png
diff --git a/static/img/reward/reward_1301_3.png b/static/img/reward/reward_1301_3.png
diff --git a/static/img/reward/reward_1301_4.png b/static/img/reward/reward_1301_4.png
diff --git a/static/img/reward/reward_1301_5.png b/static/img/reward/reward_1301_5.png
diff --git a/static/img/reward/reward_1401_1.png b/static/img/reward/reward_1401_1.png
diff --git a/static/img/reward/reward_1402_1.png b/static/img/reward/reward_1402_1.png
diff --git a/static/img/reward/reward_1403_1.png b/static/img/reward/reward_1403_1.png
diff --git a/static/img/reward/reward_1404_1.png b/static/img/reward/reward_1404_1.png
diff --git a/static/img/reward/reward_1405_1.png b/static/img/reward/reward_1405_1.png
diff --git a/static/img/reward/reward_1406_1.png b/static/img/reward/reward_1406_1.png
diff --git a/static/img/reward/reward_1408.png b/static/img/reward/reward_1408.png
diff --git a/static/img/reward/reward_1501_1.png b/static/img/reward/reward_1501_1.png
diff --git a/static/img/reward/reward_1502_1.png b/static/img/reward/reward_1502_1.png
diff --git a/static/img/reward/reward_1503_1.png b/static/img/reward/reward_1503_1.png
diff --git a/static/img/reward/reward_1600_01.png b/static/img/reward/reward_1600_01.png
diff --git a/static/img/reward/reward_1600_1.png b/static/img/reward/reward_1600_1.png
diff --git a/static/img/reward/reward_1_1.png b/static/img/reward/reward_1_1.png
diff --git a/static/img/reward/reward_1_10.png b/static/img/reward/reward_1_10.png
diff --git a/static/img/reward/reward_1_2.png b/static/img/reward/reward_1_2.png
diff --git a/static/img/reward/reward_1_3.png b/static/img/reward/reward_1_3.png
diff --git a/static/img/reward/reward_1_5.png b/static/img/reward/reward_1_5.png
diff --git a/static/img/reward/reward_1_6.png b/static/img/reward/reward_1_6.png
diff --git a/static/img/reward/reward_1_8.png b/static/img/reward/reward_1_8.png
diff --git a/static/img/reward/reward_1_9.png b/static/img/reward/reward_1_9.png
diff --git a/static/img/reward/reward_201_1.png b/static/img/reward/reward_201_1.png
diff --git a/static/img/reward/reward_201_10.png b/static/img/reward/reward_201_10.png
diff --git a/static/img/reward/reward_201_2.png b/static/img/reward/reward_201_2.png
diff --git a/static/img/reward/reward_201_3.png b/static/img/reward/reward_201_3.png
diff --git a/static/img/reward/reward_201_4.png b/static/img/reward/reward_201_4.png
diff --git a/static/img/reward/reward_201_5.png b/static/img/reward/reward_201_5.png
diff --git a/static/img/reward/reward_201_6.png b/static/img/reward/reward_201_6.png
diff --git a/static/img/reward/reward_201_8.png b/static/img/reward/reward_201_8.png
diff --git a/static/img/reward/reward_201_9.png b/static/img/reward/reward_201_9.png
diff --git a/static/img/reward/reward_202_1.png b/static/img/reward/reward_202_1.png
diff --git a/static/img/reward/reward_202_2.png b/static/img/reward/reward_202_2.png
diff --git a/static/img/reward/reward_202_3.png b/static/img/reward/reward_202_3.png
diff --git a/static/img/reward/reward_202_4.png b/static/img/reward/reward_202_4.png
diff --git a/static/img/reward/reward_202_5.png b/static/img/reward/reward_202_5.png
diff --git a/static/img/reward/reward_2_1.png b/static/img/reward/reward_2_1.png
diff --git a/static/img/reward/reward_2_10.png b/static/img/reward/reward_2_10.png
diff --git a/static/img/reward/reward_2_2.png b/static/img/reward/reward_2_2.png
diff --git a/static/img/reward/reward_2_3.png b/static/img/reward/reward_2_3.png
diff --git a/static/img/reward/reward_2_5.png b/static/img/reward/reward_2_5.png
diff --git a/static/img/reward/reward_2_6.png b/static/img/reward/reward_2_6.png
diff --git a/static/img/reward/reward_2_8.png b/static/img/reward/reward_2_8.png
diff --git a/static/img/reward/reward_2_9.png b/static/img/reward/reward_2_9.png
diff --git a/static/img/reward/reward_301_1.png b/static/img/reward/reward_301_1.png
diff --git a/static/img/reward/reward_3_1.png b/static/img/reward/reward_3_1.png
diff --git a/static/img/reward/reward_3_10.png b/static/img/reward/reward_3_10.png
diff --git a/static/img/reward/reward_3_2.png b/static/img/reward/reward_3_2.png
diff --git a/static/img/reward/reward_3_3.png b/static/img/reward/reward_3_3.png
diff --git a/static/img/reward/reward_3_5.png b/static/img/reward/reward_3_5.png
diff --git a/static/img/reward/reward_3_6.png b/static/img/reward/reward_3_6.png
diff --git a/static/img/reward/reward_3_8.png b/static/img/reward/reward_3_8.png
diff --git a/static/img/reward/reward_3_9.png b/static/img/reward/reward_3_9.png
diff --git a/static/img/reward/reward_401_1.png b/static/img/reward/reward_401_1.png
diff --git a/static/img/reward/reward_402_1.png b/static/img/reward/reward_402_1.png
diff --git a/static/img/reward/reward_403_1.png b/static/img/reward/reward_403_1.png
diff --git a/static/img/reward/reward_404_1.png b/static/img/reward/reward_404_1.png
diff --git a/static/img/reward/reward_4_1.png b/static/img/reward/reward_4_1.png
diff --git a/static/img/reward/reward_501_1.png b/static/img/reward/reward_501_1.png
diff --git a/static/img/reward/reward_502_1.png b/static/img/reward/reward_502_1.png
diff --git a/static/img/reward/reward_503_1.png b/static/img/reward/reward_503_1.png
diff --git a/static/img/reward/reward_504_1.png b/static/img/reward/reward_504_1.png
diff --git a/static/img/reward/reward_5_1.png b/static/img/reward/reward_5_1.png
diff --git a/static/img/reward/reward_602_1.png b/static/img/reward/reward_602_1.png
diff --git a/static/img/reward/reward_603_1.png b/static/img/reward/reward_603_1.png
diff --git a/static/img/reward/reward_604_1.png b/static/img/reward/reward_604_1.png
diff --git a/static/img/reward/reward_701_1.png b/static/img/reward/reward_701_1.png
diff --git a/static/img/reward/reward_701_10.png b/static/img/reward/reward_701_10.png
diff --git a/static/img/reward/reward_701_2.png b/static/img/reward/reward_701_2.png
diff --git a/static/img/reward/reward_701_3.png b/static/img/reward/reward_701_3.png
diff --git a/static/img/reward/reward_701_5.png b/static/img/reward/reward_701_5.png
diff --git a/static/img/reward/reward_701_6.png b/static/img/reward/reward_701_6.png
diff --git a/static/img/reward/reward_701_8.png b/static/img/reward/reward_701_8.png
diff --git a/static/img/reward/reward_701_9.png b/static/img/reward/reward_701_9.png
diff --git a/static/img/reward/reward_702_1.png b/static/img/reward/reward_702_1.png
diff --git a/static/img/reward/reward_702_10.png b/static/img/reward/reward_702_10.png
diff --git a/static/img/reward/reward_702_2.png b/static/img/reward/reward_702_2.png
diff --git a/static/img/reward/reward_702_3.png b/static/img/reward/reward_702_3.png
diff --git a/static/img/reward/reward_702_5.png b/static/img/reward/reward_702_5.png
diff --git a/static/img/reward/reward_702_6.png b/static/img/reward/reward_702_6.png
diff --git a/static/img/reward/reward_702_8.png b/static/img/reward/reward_702_8.png
diff --git a/static/img/reward/reward_702_9.png b/static/img/reward/reward_702_9.png
diff --git a/static/img/reward/reward_703_1.png b/static/img/reward/reward_703_1.png
diff --git a/static/img/reward/reward_703_10.png b/static/img/reward/reward_703_10.png
diff --git a/static/img/reward/reward_703_2.png b/static/img/reward/reward_703_2.png
diff --git a/static/img/reward/reward_703_3.png b/static/img/reward/reward_703_3.png
diff --git a/static/img/reward/reward_703_5.png b/static/img/reward/reward_703_5.png
diff --git a/static/img/reward/reward_703_6.png b/static/img/reward/reward_703_6.png
diff --git a/static/img/reward/reward_703_8.png b/static/img/reward/reward_703_8.png
diff --git a/static/img/reward/reward_703_9.png b/static/img/reward/reward_703_9.png
diff --git a/static/img/reward/reward_704_1.png b/static/img/reward/reward_704_1.png
diff --git a/static/img/reward/reward_705_1.png b/static/img/reward/reward_705_1.png
diff --git a/static/img/reward/reward_705_10.png b/static/img/reward/reward_705_10.png
diff --git a/static/img/reward/reward_705_2.png b/static/img/reward/reward_705_2.png
diff --git a/static/img/reward/reward_705_3.png b/static/img/reward/reward_705_3.png
diff --git a/static/img/reward/reward_705_4.png b/static/img/reward/reward_705_4.png
diff --git a/static/img/reward/reward_705_5.png b/static/img/reward/reward_705_5.png
diff --git a/static/img/reward/reward_705_6.png b/static/img/reward/reward_705_6.png
diff --git a/static/img/reward/reward_705_8.png b/static/img/reward/reward_705_8.png
diff --git a/static/img/reward/reward_705_9.png b/static/img/reward/reward_705_9.png
diff --git a/static/img/reward/reward_706_1.png b/static/img/reward/reward_706_1.png
diff --git a/static/img/reward/reward_706_2.png b/static/img/reward/reward_706_2.png
diff --git a/static/img/reward/reward_706_3.png b/static/img/reward/reward_706_3.png
diff --git a/static/img/reward/reward_706_4.png b/static/img/reward/reward_706_4.png
diff --git a/static/img/reward/reward_706_5.png b/static/img/reward/reward_706_5.png
diff --git a/static/img/reward/reward_707_1.png b/static/img/reward/reward_707_1.png
diff --git a/static/img/reward/reward_708_1.png b/static/img/reward/reward_708_1.png
diff --git a/static/img/reward/reward_708_2.png b/static/img/reward/reward_708_2.png
diff --git a/static/img/reward/reward_708_3.png b/static/img/reward/reward_708_3.png
diff --git a/static/img/reward/reward_708_4.png b/static/img/reward/reward_708_4.png
diff --git a/static/img/reward/reward_708_5.png b/static/img/reward/reward_708_5.png
diff --git a/static/img/reward/reward_709_1.png b/static/img/reward/reward_709_1.png
diff --git a/static/img/reward/reward_801_1.png b/static/img/reward/reward_801_1.png
diff --git a/static/img/reward/reward_901_1.png b/static/img/reward/reward_901_1.png
diff --git a/static/img/reward/reward_902_1.png b/static/img/reward/reward_902_1.png
diff --git a/static/img/reward/reward_903_1.png b/static/img/reward/reward_903_1.png
diff --git a/static/img/reward/reward_stardust.png b/static/img/reward/reward_stardust.png
diff --git a/static/img/reward/reward_stardust_1000.png b/static/img/reward/reward_stardust_1000.png
diff --git a/static/img/reward/reward_stardust_1200.png b/static/img/reward/reward_stardust_1200.png
diff --git a/static/img/reward/reward_stardust_1500.png b/static/img/reward/reward_stardust_1500.png
diff --git a/static/img/reward/reward_stardust_200.png b/static/img/reward/reward_stardust_200.png
diff --git a/static/img/reward/reward_stardust_2000.png b/static/img/reward/reward_stardust_2000.png
diff --git a/static/img/reward/reward_stardust_2500.png b/static/img/reward/reward_stardust_2500.png
diff --git a/static/img/reward/reward_stardust_500.png b/static/img/reward/reward_stardust_500.png
diff --git a/static/img/reward/reward_stardust_800.png b/static/img/reward/reward_stardust_800.png