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.

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

add pokemon showcase #850

Merged
merged 79 commits into from
Jul 28, 2023
Merged
Show file tree
Hide file tree
Changes from 61 commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
7958c52
Update package.json
ReuschelCGN Jan 3, 2023
33ddd61
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN Jan 11, 2023
bddec9a
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN Jan 11, 2023
a85b683
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN Jan 12, 2023
9e6e707
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN Jan 13, 2023
e299b9a
Update de.json
ReuschelCGN Jan 16, 2023
3ae5340
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN Jan 30, 2023
888a57c
Update default.json
ReuschelCGN Jan 31, 2023
383fc43
Update default.json
ReuschelCGN Jan 31, 2023
0a0aaab
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN Feb 7, 2023
2074605
Update invasion.js
ReuschelCGN Feb 7, 2023
1096439
Update invasion.js
ReuschelCGN Feb 7, 2023
b4fffc6
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN Feb 14, 2023
74044b1
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN Feb 19, 2023
763ef50
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN Feb 22, 2023
bf8b78f
Update de.json
ReuschelCGN Feb 22, 2023
75b2a98
Update testdata.json
ReuschelCGN Feb 22, 2023
8f2e099
Update testdata.json
ReuschelCGN Feb 22, 2023
751dda9
Update testdata.json
ReuschelCGN Feb 22, 2023
c3a9298
Update mon.txt
ReuschelCGN Feb 22, 2023
875577c
Update dts_all.json
ReuschelCGN Feb 22, 2023
e2396f8
Update testdata.json
ReuschelCGN Feb 22, 2023
2074c6d
Update de.json
ReuschelCGN Feb 23, 2023
6b6e58a
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN Feb 23, 2023
b4a7fa5
Update apiTrackingEgg.js
ReuschelCGN Feb 24, 2023
953dab3
Update apiTrackingRaid.js
ReuschelCGN Feb 24, 2023
8496679
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN Feb 24, 2023
45e00f9
Update util.json
ReuschelCGN Feb 27, 2023
9b5b37c
Update de.json
ReuschelCGN Feb 27, 2023
0bb9e23
Update apiTrackingLure.js
ReuschelCGN Feb 27, 2023
dc36cf3
Update script.js
ReuschelCGN Feb 27, 2023
014f056
Update lure.js
ReuschelCGN Feb 27, 2023
61edf1e
Update testdata.json
ReuschelCGN Feb 27, 2023
44f5f4e
Update de.json
ReuschelCGN Feb 27, 2023
46d08fc
Update de.json
ReuschelCGN Feb 28, 2023
03960b5
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN Feb 28, 2023
76375bc
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN Mar 2, 2023
923b1d3
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN Mar 2, 2023
b174369
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN Mar 4, 2023
799bdfa
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN Mar 19, 2023
6aab040
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN Mar 26, 2023
4183aa1
Update pokestop.js
ReuschelCGN Mar 26, 2023
7ba5035
Update pokestop.js
ReuschelCGN Mar 26, 2023
4fdbd35
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN Apr 6, 2023
7ea827f
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN Apr 9, 2023
6450701
Update package.json
ReuschelCGN Apr 16, 2023
f4538be
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN May 23, 2023
2aeda7b
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN May 26, 2023
d459af9
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN Jun 2, 2023
4866fdf
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN Jun 2, 2023
ec50a5b
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN Jun 7, 2023
c56a1c4
Update de.json
ReuschelCGN Jun 16, 2023
d191bc2
Update de.json
ReuschelCGN Jun 16, 2023
679ba39
Update de.json
ReuschelCGN Jun 16, 2023
968f8eb
Update de.json
ReuschelCGN Jul 6, 2023
84b02e5
Update util.json
ReuschelCGN Jul 6, 2023
ec80aa3
Update de.json
ReuschelCGN Jul 6, 2023
3573e99
Update de.json
ReuschelCGN Jul 6, 2023
eec16f5
Update pokestop.js
ReuschelCGN Jul 9, 2023
ccf6723
Update pokestop.js
ReuschelCGN Jul 10, 2023
c9a9317
Update pokestop.js
ReuschelCGN Jul 10, 2023
00b5978
Update de.json
ReuschelCGN Jul 11, 2023
5567718
Update util.json
ReuschelCGN Jul 11, 2023
58591fc
Update util.json
ReuschelCGN Jul 11, 2023
038f4a0
Update invasion.js
ReuschelCGN Jul 11, 2023
be27286
Add files via upload
ReuschelCGN Jul 11, 2023
cb8a132
Update invasion.js
ReuschelCGN Jul 11, 2023
57ff508
Add files via upload
ReuschelCGN Jul 11, 2023
12b4493
Update info.js
ReuschelCGN Jul 11, 2023
eb82968
Delete invasion.js
ReuschelCGN Jul 11, 2023
6ac4fad
Add files via upload
ReuschelCGN Jul 11, 2023
bff8fae
Update pokestop.js
ReuschelCGN Jul 11, 2023
bc21476
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN Jul 20, 2023
9c452b7
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN Jul 20, 2023
df3f2b3
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN Jul 21, 2023
67939c4
Update pokestop.js
ReuschelCGN Jul 27, 2023
123e297
Update Telegram.js
ReuschelCGN Jul 27, 2023
377aee4
Update discordWorker.js
ReuschelCGN Jul 27, 2023
bfc3de4
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN Jul 27, 2023
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
19 changes: 12 additions & 7 deletions locale/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@
"add":"hinzufügen",
"Added areas:":"Hinzugefügte Gebiete:",
"Adventure Hat 2020":"Forscher",
"all items":"alle items",
"all pokemon":"alle pokemon",
"All team's":"alle teams",
"allprofiles":"alleprofile",
"all items":"alle Items",
"all level":"alle Level",
"all pokemon":"alle Pokemon",
"All team's":"alle Teams",
"allprofiles":"alle Profile",
"Alola":"Alola",
"Altered":"Wandel",
"and":"und",
Expand All @@ -31,7 +32,7 @@
"Aria":"Gesang",
"Arlo":"Arlo",
"Armored":"Rüstung",
"at gym ":"an der Arena ",
"at gym ":"an der Arena",
"atk":"Atk",
"Attack":"Angriff",
"Autumn":"Herbst",
Expand Down Expand Up @@ -321,7 +322,11 @@
"Land 3 throws":"Lande 3 Würfe",
"language":"Sprache",
"Legendary":"Legendär",
"level":"level",
"level":"Level",
"Level 1 Shadow":"Crypto Level 1",
"Level 2 Shadow":"Crypto Level 2",
"Level 3 Shadow":"Crypto Level 3",
"Level 4 Shadow":"Crypto Level 4",
"Level {0} CP {1}": "Level {0} WP {1}",
"list":"auflisten",
"little":"little",
Expand Down Expand Up @@ -444,7 +449,6 @@
"Poffin":"Knursp",
"Poison":"Gift",
"Poké Ball":"Pokéball",
"Pokemon-Contest":"Pokemon-Wettbewerb",
"polish":"Polnisch",
"poracle":"poracle",
"Possible weather change at":"Möglicher Wetterwechsel um",
Expand Down Expand Up @@ -505,6 +509,7 @@
"Shiny Stats (Last few hours)":"Shiny Statistik (der letzen Stunden)",
"Shock":"Blitzmodul",
"show":"zeigen",
"Showcase":"Showcase",
"Sierra":"Sierra",
"Silver Pinap Berry":"Silberne Sananabeere",
"Sinnoh Stone":"Sinnoh-Stein",
Expand Down
9 changes: 7 additions & 2 deletions src/controllers/pokestop.js
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,6 @@ class Invasion extends Controller {
data.displayTypeId = 8
}

data.gruntTypeColor = 'BABABA'

data.gender = 0
data.gruntName = ''
data.gruntTypeColor = 'BABABA'
Expand Down Expand Up @@ -147,6 +145,13 @@ class Invasion extends Controller {
data.gruntName = data.displayTypeId && this.GameData.utilData.pokestopEvent[data.displayTypeId] ? this.GameData.utilData.pokestopEvent[data.displayTypeId] : ''
data.gruntType = data.displayTypeId && this.GameData.utilData.pokestopEvent[data.displayTypeId] ? this.GameData.utilData.pokestopEvent[data.displayTypeId].toLowerCase() : ''
data.gruntRewards = ''
if (data.displayTypeId === 7) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These should be in util.json - see plenty of other examples.
Maybe the color and an emoji reference should be there?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

like this?
im actually working on it
"3": {
"name": "Instinct",
"color": "FFDE00",
"emoji": "team-instinct"
},

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, exactly

data.gruntTypeColor = 'F9E418'
} else if (data.displayTypeId === 8) {
data.gruntTypeColor = 'B3CA78'
} else if (data.displayTypeId === 9) {
data.gruntTypeColor = '03AEB6'
}
}

const whoCares = data.poracleTest ? [{
Expand Down
2 changes: 1 addition & 1 deletion src/util/util.json
Original file line number Diff line number Diff line change
Expand Up @@ -936,6 +936,6 @@
"pokestopEvent": {
"7": "Gold-Stop",
"8": "Kecleon",
"9": "Pokemon-Contest"
"9": "Showcase"
}
}