Skip to content

Commit

Permalink
Update 27.02.2024
Browse files Browse the repository at this point in the history 
Squashed commit of the following:

commit a6bdc9b
Merge: 0c6c7d6 49b47eb
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Mon Feb 5 14:31:12 2024 -0600

    Merge pull request cecpk#332 from wraythex/update-protos-2024-02-05

    Add new forms and moves

commit 0c6c7d6
Merge: bba4fa0 7509ce3
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Mon Feb 5 14:15:44 2024 -0600

    Merge pull request cecpk#331 from JimBim89/patch-11

    Add another new item bundle to items.json

commit 49b47eb
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Mon Feb 5 14:12:55 2024 -0600

    Add new forms

commit 700866d
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Mon Feb 5 14:12:14 2024 -0600

    Add new moves

commit e8244d3
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Mon Feb 5 14:11:22 2024 -0600

    Update protos for new forms

commit 06fca1f
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Mon Feb 5 14:09:34 2024 -0600

    Update protos for new forms

commit 7509ce3
Author: Thorben Otto <thorben_otto@gmx.de>
Date:   Mon Feb 5 11:24:08 2024 +0100

    Add new item bundle to items.json

commit bba4fa0
Merge: d373f57 be8e3ea
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Wed Jan 31 09:42:41 2024 -0600

    Merge pull request cecpk#330 from wraythex/update-protos-2024-01-31

    Update protos for new forms

commit be8e3ea
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Wed Jan 31 07:30:26 2024 -0600

    Add new forms

commit 0c1799f
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Wed Jan 31 07:29:09 2024 -0600

    Update pogo_protos_pb2.py

commit c056720
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Wed Jan 31 07:27:49 2024 -0600

    Update new forms

commit d373f57
Merge: beef0c8 11a82aa
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Wed Jan 31 06:54:07 2024 -0600

    Merge pull request cecpk#329 from JimBim89/patch-10

    Add new item bundle to items.json

commit 11a82aa
Author: Thorben Otto <thorben_otto@gmx.de>
Date:   Wed Jan 24 11:55:37 2024 +0100

    Add new item bundle to items.json

commit beef0c8
Merge: 9e8164e cfeb7da
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Sun Nov 19 08:37:20 2023 -0600

    Merge pull request cecpk#328 from wraythex/update-protos-2023-11-19-a

    Update protos 2023-11-19 (async)

commit cfeb7da
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Sun Nov 19 08:13:53 2023 -0600

    Update protos

commit c031b3e
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Sun Nov 19 08:13:15 2023 -0600

    Update genderDiff and Forms

commit c7bb0fa
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Sun Nov 19 08:12:17 2023 -0600

    Add Origin forms

commit 9e8164e
Merge: d4b3150 7b25f8b
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Sat Nov 4 12:06:48 2023 -0500

    Merge pull request cecpk#326 from wraythex/new-moves-2

    Add 4 new moves

commit 7b25f8b
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Sat Nov 4 11:14:54 2023 -0500

    Add 4 new moves

commit d4b3150
Merge: 64ead19 6f05936
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Wed Oct 25 22:06:09 2023 -0500

    Merge pull request cecpk#323 from wraythex/update-protos-async

    Update protos async

commit 6f05936
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Sun Oct 22 21:36:22 2023 -0500

    Update protos py file

commit 4b72b88
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Sun Oct 22 21:34:18 2023 -0500

    Update protos

commit cc1338b
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Sun Oct 22 21:28:27 2023 -0500

    Add genderDiff info

commit 64ead19
Merge: c91c739 d1b4628
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Fri Oct 6 18:47:26 2023 -0500

    Merge pull request cecpk#322 from wraythex/wraythex-patch-14

    Add new costume, update UBs, add new move (async)

commit d1b4628
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Fri Oct 6 14:35:29 2023 -0500

    Add new move

commit 02f1ffd
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Fri Oct 6 14:34:56 2023 -0500

    Ultra Beasts are not Legendary

commit ffd48e5
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Fri Oct 6 14:33:11 2023 -0500

    Add new costume

commit ecc860c
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Fri Oct 6 14:32:18 2023 -0500

    Add new costume

commit c91c739
Merge: cb3ec54 09ea63f
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Sun Sep 24 21:05:15 2023 -0500

    Merge pull request cecpk#320 from wraythex/wraythex-patch-12

    Update protos for new forms (async)

commit 09ea63f
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Tue Sep 19 22:00:47 2023 -0500

    Update protos for new forms (async)

commit 07c91ec
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Tue Sep 19 21:59:57 2023 -0500

    Update protos for new forms (async)

commit cb3ec54
Merge: 4776548 4f507f0
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Mon Sep 18 21:01:52 2023 -0500

    Merge pull request cecpk#318 from wraythex/wraythex-patch-10

    Add size display and filters to RM-async

commit 4f507f0
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Fri Sep 15 14:25:38 2023 -0500

    Fix size filter options display

commit a89530c
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Wed Sep 13 16:17:23 2023 -0500

    Remove old data

commit 5cb4c09
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Wed Sep 13 16:09:18 2023 -0500

    Add translation to returned size

commit 4dc97b4
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Wed Sep 13 16:07:32 2023 -0500

    Add size filter to map

commit fc223eb
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Wed Sep 13 16:06:11 2023 -0500

    Add size filter options

commit 0af7515
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Wed Sep 13 16:05:06 2023 -0500

    Add size settings

commit 9eaae78
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Wed Sep 13 16:00:40 2023 -0500

    Add size names

commit e21978d
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Wed Sep 13 15:55:24 2023 -0500

    Add size display info

commit f1ef8f0
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Wed Sep 13 15:48:22 2023 -0500

    Add size filter options

commit 8589119
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Wed Sep 13 15:45:59 2023 -0500

    Query db for size stat

commit 4776548
Merge: 6c33450 f486a93
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Fri Sep 8 13:03:32 2023 -0500

    Merge pull request cecpk#317 from JimBim89/patch-9

    Update updateLabelDiffTime to include days left

commit f486a93
Author: Thorben Otto <thorben_otto@gmx.de>
Date:   Fri Sep 8 13:56:43 2023 +0200

    Update map.pokestop.js to only show time

commit 6c33450
Merge: 1d1c910 bf98196
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Thu Sep 7 16:21:58 2023 -0500

    Merge pull request cecpk#316 from wraythex/wraythex-patch-9

    Add detailed invasion stats in the sidebar (async)

commit f31e8a9
Author: Thorben Otto <thorben_otto@gmx.de>
Date:   Thu Sep 7 14:07:28 2023 +0200

    Adjust dummy text for better spacing

commit ed6c697
Author: Thorben Otto <thorben_otto@gmx.de>
Date:   Thu Sep 7 14:06:33 2023 +0200

    Remove leading zero for days

commit af9981d
Author: Thorben Otto <thorben_otto@gmx.de>
Date:   Thu Sep 7 09:23:35 2023 +0200

    Update map.pokestop.js to show date and time

commit aee3dea
Author: Thorben Otto <thorben_otto@gmx.de>
Date:   Thu Sep 7 08:30:39 2023 +0200

    Update updateLabelDiffTime to include days left

commit bf98196
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Wed Sep 6 16:40:04 2023 -0500

    Update map.stats.js

commit 0216709
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Wed Sep 6 16:25:53 2023 -0500

    Add detailed invasion stats in the sidebar (async)

commit 1d1c910
Merge: 951bfd1 d5f6fbe
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Wed Sep 6 16:10:37 2023 -0500

    Merge pull request cecpk#315 from wraythex/wraythex-patch-8

    Add showcase support to RM-async

commit d5f6fbe
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Wed Sep 6 06:40:55 2023 -0500

    Update coin incident image

commit 108cbfd
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Wed Sep 6 06:37:00 2023 -0500

    Add coin only incident stops

commit 617b0cf
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Wed Sep 6 06:35:22 2023 -0500

    Add coin incident image

commit 2262822
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Wed Sep 6 06:34:40 2023 -0500

    Add coin only incident to filter

commit 58d0363
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Wed Sep 6 06:34:01 2023 -0500

    Create coin only invasion

commit 1db5084
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Wed Sep 6 06:32:12 2023 -0500

    Switch to coin only incident

commit 5c53e41
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Wed Sep 6 06:01:19 2023 -0500

    Update Gimmighoul incident image

commit b5e7236
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Wed Sep 6 05:54:48 2023 -0500

    Add Gimmighoul stop images

commit 13e5cf4
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Wed Sep 6 05:53:20 2023 -0500

    Add Gimmighoul incident image

commit 5f16e4b
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Wed Sep 6 05:52:17 2023 -0500

    Add Gimmighoul to incident filter

commit d6ba340
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Wed Sep 6 05:51:04 2023 -0500

    Process Gimmighoul incident

commit 6f44745
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Wed Sep 6 05:50:06 2023 -0500

    Add Gimmighoul to invasions.json

commit 10d89e1
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Tue Sep 5 22:15:09 2023 -0500

    Upload new showcase stop images

commit d3607d1
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Tue Sep 5 22:08:55 2023 -0500

    Add showcase invasion image

commit f493781
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Tue Sep 5 22:07:26 2023 -0500

    Add showcase to invasion filter

commit 22fecda
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Tue Sep 5 22:03:17 2023 -0500

    Add showcase to invasion list

commit 46d4d11
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Tue Sep 5 22:01:52 2023 -0500

    Convert showcase to grunt

commit 951bfd1
Merge: adc5579 754c144
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Tue Sep 5 14:26:00 2023 -0500

    Merge pull request cecpk#314 from wraythex/wraythex-patch-7

    Add i18n for translation (async)

commit adc5579
Merge: 6e58e6d 78c089d
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Tue Sep 5 14:20:25 2023 -0500

    Merge pull request cecpk#313 from wraythex/wraythex-patch-6

    Translation Nests, Forms and more (async)

commit 6e58e6d
Merge: 4ec8b42 a20e8d7
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Tue Sep 5 14:14:38 2023 -0500

    Merge pull request cecpk#312 from wraythex/wraythex-patch-5

    Settings panel translation support (async)

commit 754c144
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Tue Sep 5 14:05:34 2023 -0500

    Add i18n for translation (async)

    Update map.nest.js, based on PR 278 by ClawOfDead

commit 78c089d
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Tue Sep 5 13:59:17 2023 -0500

    Translation Nests, Forms and more (async)

    Updating fr.json, based on PR 277 by ClawOfDead

commit a20e8d7
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Tue Sep 5 13:55:39 2023 -0500

    Settings panel translation support (async)

    based on PR 276 by ClawOfDead

commit 4ec8b42
Merge: 2ee3f75 1af28bf
Author: wraythex <59678213+wraythex@users.noreply.github.com>
Date:   Tue Sep 5 13:04:14 2023 -0500

    Merge pull request cecpk#310 from zastel1983/async

    add german Gen 9

commit 1af28bf
Author: zastel1983 <61865780+zastel1983@users.noreply.github.com>
Date:   Tue Sep 5 20:01:22 2023 +0200

    Corrected final bracket

commit cdcc7d3
Author: zastel1983 <61865780+zastel1983@users.noreply.github.com>
Date:   Tue Sep 5 18:14:26 2023 +0200

    add german Gen 9

    adds german Gen 9 names
  • Loading branch information
@pki0
pki0 committed Feb 27, 2024
1 parent 1be542d commit ad5fdc6
Show file tree
Hide file tree
Showing 7 changed files with 285 additions and 58 deletions.
10 changes: 5 additions & 5 deletions rocketmad/pogo_protos_pb2.py
View file

Large diffs are not rendered by default.

22 changes: 22 additions & 0 deletions scripts/protos/vdisplayproto.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@ message PokemonDisplayProto {
PI = 69;
FALL_2023 = 70;
FALL_2023_NOEVOLVE = 71;
PI_NOEVOLVE = 72;
HOLIDAY_2023 = 73;
JAN_2024 = 74;
SPRING_2024 = 75;
}

enum Form {
Expand Down Expand Up @@ -2417,6 +2421,24 @@ message PokemonDisplayProto {
LATIOS_S = 2822;
ZYGARDE_COMPLETE_TEN_PERCENT = 2823;
ZYGARDE_COMPLETE_FIFTY_PERCENT = 2824;
PIKACHU_GOTOUR_2024_A = 2825;
PIKACHU_GOTOUR_2024_B = 2826;
PIKACHU_GOTOUR_2024_A_02 = 2827;
PIKACHU_GOTOUR_2024_B_02 = 2828;
DIALGA_ORIGIN = 2829;
PALKIA_ORIGIN = 2830;
ROCKRUFF_NORMAL = 2831;
PIKACHU_TSHIRT_03 = 2832;
PIKACHU_FLYING_04 = 2833;
PIKACHU_TSHIRT_04 = 2834;
PIKACHU_TSHIRT_05 = 2835;
PIKACHU_TSHIRT_06 = 2836;
PIKACHU_TSHIRT_07 = 2837;
PIKACHU_FLYING_05 = 2838;
PIKACHU_FLYING_06 = 2839;
PIKACHU_FLYING_07 = 2840;
PIKACHU_FLYING_08 = 2841;
PIKACHU_HORIZONS = 2842;
OINKOLOGNE_NORMAL = 2981;
OINKOLOGNE_FEMALE = 2982;
MAUSHOLD_FAMILY_OF_THREE = 2983;
Expand Down
4 changes: 2 additions & 2 deletions static/data/items.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"2": {
"name": "Great Ball",
"questBundles": [3, 5, 7, 10, 15]
"questBundles": [2, 3, 5, 7, 10, 15]
},
"3": {
"name": "Ultra Ball",
Expand Down Expand Up @@ -49,7 +49,7 @@
},
"103": {
"name": "Hyper Potion",
"questBundles": [2, 3]
"questBundles": [2, 3, 5]
},
"104": {
"name": "Max Potion",
Expand Down
42 changes: 41 additions & 1 deletion static/data/moves.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1312,7 +1312,7 @@
"type": "Flying"
},
"390": {
"name": "Natures Madness",
"name": "Nature's Madness",
"type": "Fairy"
},
"391": {
Expand All @@ -1326,5 +1326,45 @@
"393": {
"name": "Scorching Sands",
"type": "Ground"
},
"394": {
"name": "Roar of Time",
"type": "Dragon"
},
"395": {
"name": "Bleakwind Storm",
"type": "Flying"
},
"396": {
"name": "Sandsear Storm",
"type": "Ground"
},
"397": {
"name": "Wildbolt Storm",
"type": "Electric"
},
"398": {
"name": "Spirit Shackle",
"type": "Ghost"
},
"399": {
"name": "Volt Tackle",
"type": "Electric"
},
"400": {
"name": "Darkest Lariat",
"type": "Dark"
},
"401": {
"name": "Psywave",
"type": "Psychic"
},
"402": {
"name": "Metal Sound",
"type": "Steel"
},
"403": {
"name": "Sand Attack",
"type": "Ground"
}
}
Loading

0 comments on commit ad5fdc6

Please sign in to comment.