Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge develop #62

Merged
merged 6 commits into from
May 8, 2024
Merged

merge develop #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d3de54a
Merge pull request #547 from RealDeviceMap/development
Fabio1988 Jan 24, 2024
9b6b36c
Update README.md
ReuschelCGN Jan 30, 2024
97ea98a
Add raid levels 11, 13, and 15 for shadow raids
dripdropper Apr 11, 2024
3e999a6
Update gym pop-up text for levels of shadow eggs and bosses
dripdropper Apr 29, 2024
d3cc800
Merge pull request #549 from dripdropper/add-shadow-raid-support
Fabio1988 May 7, 2024
d7e9f24
Merge branch 'RealDeviceMap:development' into development
ReuschelCGN May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# RealDeviceMap
# RealDeviceMap

<strong>The contents of this repo is a proof of concept and is for educational use only!</strong>

Expand Down
2 changes: 1 addition & 1 deletion Sources/RealDeviceMapLib/API/ApiRequestHandler.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)")

Expand Down
14 changes: 13 additions & 1 deletion resources/webroot/index.js.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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 })
}
Expand Down Expand Up @@ -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>'
}
Expand Down
14 changes: 10 additions & 4 deletions resources/webroot/static/data/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
Loading