Skip to content

Commit

Permalink
Update 25.09.2023: Protos and older merge
Browse files Browse the repository at this point in the history 
Squashed commit of the following:

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 Sep 25, 2023
1 parent 5aaf95f commit 0825b6e
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 18 deletions.
18 changes: 9 additions & 9 deletions rocketmad/pogo_protos_pb2.py
View file

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions scripts/protos/vdisplayproto.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ message PokemonDisplayProto {
SPRING_2023_INSTINCT = 66;
NIGHTCAP = 67;
MAY_2023 = 68;
PI = 69;
FALL_2023 = 70;
FALL_2023_NOEVOLVE = 71;
}

enum Form {
Expand Down
10 changes: 3 additions & 7 deletions static/js/map/map.pokemon.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pokemonNotifiedZIndex, pokemonRareZIndex, pokemonUltraRareZIndex,
pokemonUncommonZIndex, pokemonVeryRareZIndex, pokemonZIndex, removeMarker,
removeRangeCircle, sendNotification, settings, setupRangeCircle,
updateRangeCircle, weatherClassesDay, weatherNames, updateMarkerLayer,
createPokemonMarker, filterManagers, serverSettings
createPokemonMarker, filterManagers, serverSettings, getSizeDisplay
*/
/* exported processPokemon, updatePokemons */

Expand Down Expand Up @@ -54,8 +54,7 @@ function isPokemonMeetsFilters(pokemon, isNotifPokemon) {
}
}


if(settings.filterPokemonBySize && settings.filterPokemonBySizeOptions && !settings.filterPokemonBySizeOptions.includes(pokemon.size)){
if (settings.filterPokemonBySize && settings.filterPokemonBySizeOptions && !settings.filterPokemonBySizeOptions.includes(pokemon.size)) {
return false
}

Expand Down Expand Up @@ -208,6 +207,7 @@ function pokemonLabel(item) {
var verifiedDisplay = ''
var typesDisplay = ''
var statsDisplay = ''
var sizeDisplay = ''
var nearbyStopWarning = ''

if (id === 29 || id === 32) {
Expand Down Expand Up @@ -261,8 +261,6 @@ function pokemonLabel(item) {
var move2Name = getMoveName(item.move_2)
var move1Type = getMoveTypeNoI8ln(item.move_1)
var move2Type = getMoveTypeNoI8ln(item.move_2)
var weight = item.weight.toFixed(2)
var height = item.height.toFixed(2)

var catchRatesDisplay = ''
if (serverSettings.catchRates && item.catch_prob_1) {
Expand All @@ -274,7 +272,6 @@ function pokemonLabel(item) {
</div>`
}


var sizeDisplay = ''
if(size){
sizeDisplay = `
Expand All @@ -284,7 +281,6 @@ function pokemonLabel(item) {
`
}


statsDisplay = `
<div class='info-container'>
<div>
Expand Down
1 change: 0 additions & 1 deletion static/js/map/map.settings.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,6 @@ function initSettingsSidebar() {
updatePokemons()
Store.set('pokemonIconSizeModifier', iconSize)
})

}

if (serverSettings.pokemonValues) {
Expand Down
8 changes: 7 additions & 1 deletion static/js/utils/utils.pokemon.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@ getMoveName, getMoveType, getMoveTypeNoI8ln, getPokemonGen, getPokemonIds,
getPokemonLevel, getPokemonNameWithForm, getPokemonRarity,
getPokemonRarityName, getLocationNearStop, getLocationInCell,
getPokemonRawIconUrl, getPokemonTypes, initMoveData, initPokemonData,
searchPokemon, createPokemonMarker, updatePokemonRarities
searchPokemon, createPokemonMarker, updatePokemonRarities,
getSizeDisplay
*/

var pokemonData = {}
var moveData = {}
var pokemonRarities = {}
const rarityNames = ['Common', 'Uncommon', 'Rare', 'Very Rare', 'Ultra Rare', 'New Spawn']
const pokemonSizes = ['Unknown', 'XXS', 'XS', 'M', 'XL', 'XXL']
// FontAwesome gender classes.
const genderClasses = ['fa-mars', 'fa-venus', 'fa-neuter']
var pokemonSearchList = []
Expand Down Expand Up @@ -229,6 +231,10 @@ function getPokemonMapIconUrl(pokemon, generateImages) {
return `pkm_img?pkm=${pokemon.pokemon_id}${genderParam}${formParam}${costumeParam}${evolutionParam}${weatherParam}${perfectParam}`
}

function getSizeDisplay(size) {
return i18n(pokemonSizes[size]) ?? i18n('Unknown Size')
}

function getIvsPercentage(atk, def, sta) {
// Round to 1 decimal place.
return Math.round(1000 * (atk + def + sta) / 45) / 10
Expand Down

0 comments on commit 0825b6e

Please sign in to comment.