Merge pull request #63 from ReuschelCGN/development

merge develop
ReuschelCGN · May 8, 2024 · 0da9117 · 0da9117
2 parents 86aef47 + d7e9f24
commit 0da9117
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# RealDeviceMap
+# RealDeviceMap 
 
 <strong>The contents of this repo is a proof of concept and is for educational use only!</strong>
 

diff --git a/Sources/RealDeviceMapLib/API/ApiRequestHandler.swift b/Sources/RealDeviceMapLib/API/ApiRequestHandler.swift
@@ -717,7 +717,7 @@ public class ApiRequestHandler {
                 ])
 
             // Level
-            for i in [1, 3, 4, 5, 6, 7, 8, 9, 10] {
+            for i in [1, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15] {
 
                 let raidLevel = Localizer.global.get(value: "filter_raid_level_\(i)")
 

diff --git a/resources/webroot/index.js.mustache b/resources/webroot/index.js.mustache
@@ -51,7 +51,7 @@ let spawnpointFilterNew = {}
 const hiddenPokemonIds = []
 
 const availableEggs = [
-  1,3,4,5,6,7,8,9,10
+  1,3,4,5,6,7,8,9,10,11,13,15
 ]
 const availableGrunts = [
   1,2,3,4,5,6,7,10,11,12,13,14,15,16,17,18,
@@ -2761,6 +2761,12 @@ function getGymPopupContent (gym) {
       pokemonName = i18n('egg_9')
     } else if (gym.raid_level === 10) {
       pokemonName = i18n('egg_10')
+    } else if (gym.raid_level === 11) {
+      pokemonName = i18n('egg_11')
+    } else if (gym.raid_level === 13) {
+      pokemonName = i18n('egg_13')
+    } else if (gym.raid_level === 15) {
+      pokemonName = i18n('egg_15')
     } else {
       pokemonName = i18n('map_egg_level', { egglevel: gym.raid_level })
     }
@@ -2821,6 +2827,12 @@ function getGymPopupContent (gym) {
           content += '<b>'+i18n('map_gym_level')+': </b>'+i18n('map_gym_type_elite')+'<br>'
         } else if (gym.raid_level === 10) {
           content += '<b>'+i18n('map_gym_level')+': </b>'+i18n('map_gym_type_primal')+'<br>'
+        } else if (gym.raid_level === 11) {
+          content += '<b>'+i18n('map_gym_level')+': </b>'+i18n('map_gym_type_shadow_1')+'<br>'
+        } else if (gym.raid_level === 13) {
+          content += '<b>'+i18n('map_gym_level')+': </b>'+i18n('map_gym_type_shadow_3')+'<br>'
+        } else if (gym.raid_level === 15) {
+          content += '<b>'+i18n('map_gym_level')+': </b>'+i18n('map_gym_type_shadow_legendary')+'<br>'
         } else {
           content += '<b>'+i18n('map_gym_level')+': </b>' + gym.raid_level + '<br>'
         }

diff --git a/resources/webroot/static/data/en.json b/resources/webroot/static/data/en.json
@@ -43,6 +43,9 @@
         "map_gym_type_ultra_beast": "Ultra Beast",
         "map_gym_type_elite": "Elite",
         "map_gym_type_primal": "Primal",
+        "map_gym_type_shadow_1": "Shadow Tier 1",
+        "map_gym_type_shadow_3": "Shadow Tier 3",
+        "map_gym_type_shadow_legendary": "Shadow Legendary",
         "map_power_up_level": "Power Up Level",
         "map_power_up_end": "Power Up End",
         "map_first_seen": "First Seen",
@@ -248,16 +251,19 @@
         "unauthorized_discord": "Link your Discord account <a href=\"%{href}\">here</a>!",
         "unauthorized_verifymail": "Verify your email address <a href=\"%{href}\">here</a>!",
         "filter_raid_timers": "Raid Timers",
-        "filter_raid_level_1": "Level 1",
-        "filter_raid_level_2": "Level 2",
-        "filter_raid_level_3": "Level 3",
-        "filter_raid_level_4": "Level 4",
+        "filter_raid_level_1": "Tier 1",
+        "filter_raid_level_2": "Tier 2",
+        "filter_raid_level_3": "Tier 3",
+        "filter_raid_level_4": "Tier 4",
         "filter_raid_level_5": "Legendary",
         "filter_raid_level_6": "Mega",
         "filter_raid_level_7": "Mega Legendary",
         "filter_raid_level_8": "Ultra Beasts",
         "filter_raid_level_9": "Elite",
         "filter_raid_level_10": "Primal",
+        "filter_raid_level_11": "Shadow Tier 1",
+        "filter_raid_level_13": "Shadow Tier 3",
+        "filter_raid_level_15": "Shadow Legendary",
         "filter_raid_levels": "Raid Levels",
         "filter_raid_ex": "Only EX Raids",
         "filter_gym_team": "Team",