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

Add size display and filters to RM-async
cecpk · Sep 19, 2023 · cb3ec54 · cb3ec54
2 parents 4776548 + 4f507f0
commit cb3ec54
Show file tree

Hide file tree

Showing 7 changed files with 82 additions and 9 deletions.
diff --git a/rocketmad/models.py b/rocketmad/models.py
@@ -54,6 +54,7 @@ class Pokemon(db.Model):
     last_modified = db.Column(db.DateTime)
     seen_type = db.Column(db.String)
     fort_id = db.Column(db.String)
+    size = db.Column(db.SmallInteger)
 
     __table_args__ = (
         Index('pokemon_spawnpoint_id', 'spawnpoint_id'),
@@ -77,7 +78,8 @@ def get_active(swLat, swLng, neLat, neLng, oSwLat=None, oSwLng=None,
             Pokemon.cp, Pokemon.cp_multiplier, Pokemon.weight, Pokemon.height,
             Pokemon.gender, Pokemon.form, Pokemon.costume,
             Pokemon.catch_prob_1, Pokemon.catch_prob_2, Pokemon.catch_prob_3,
-            Pokemon.weather_boosted_condition, Pokemon.last_modified, Pokemon.seen_type
+            Pokemon.weather_boosted_condition, Pokemon.last_modified, Pokemon.seen_type,
+            Pokemon.size
         ]
 
         if verified_despawn_time:

diff --git a/static/js/map/map.js b/static/js/map/map.js
@@ -150,7 +150,9 @@ const settings = {
     startLocationMarkerStyle: null,
     userLocationMarkerStyle: null,
     darkMode: null,
-    clusterZoomLevel: null
+    clusterZoomLevel: null,
+    filterPokemonBySize: null,
+    filterPokemonBySizeOptions: null
 }
 
 const notifiedPokemonData = {}

diff --git a/static/js/map/map.pokemon.js b/static/js/map/map.pokemon.js
@@ -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 */
 
@@ -54,6 +54,10 @@ function isPokemonMeetsFilters(pokemon, isNotifPokemon) {
         }
     }
 
+    if (settings.filterPokemonBySize && settings.filterPokemonBySizeOptions && !settings.filterPokemonBySizeOptions.includes(pokemon.size)) {
+        return false
+    }
+
     if (settings.excludeNearbyCells && pokemon.seen_type === 'nearby_cell') {
         return false
     }
@@ -191,6 +195,7 @@ function pokemonLabel(item) {
     var cp = item.cp
     var cpMultiplier = item.cp_multiplier
     var weatherBoostedCondition = item.weather_boosted_condition
+    var size = getSizeDisplay(item.size)
 
     var pokemonIcon = getPokemonRawIconUrl(item, serverSettings.generateImages)
     var gen = getPokemonGen(id)
@@ -202,6 +207,7 @@ function pokemonLabel(item) {
     var verifiedDisplay = ''
     var typesDisplay = ''
     var statsDisplay = ''
+    var sizeDisplay = ''
     var nearbyStopWarning = ''
 
     if (id === 29 || id === 32) {
@@ -255,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) {
@@ -268,6 +272,14 @@ function pokemonLabel(item) {
                 </div>`
         }
 
+        if (size) {
+            sizeDisplay = `
+                <div>
+                    ${i18n('Size')}: <strong>${size}</strong>
+                </div>
+            `
+        }
+
         statsDisplay = `
             <div class='info-container'>
               <div>
@@ -282,10 +294,8 @@ function pokemonLabel(item) {
               <div>
                ${i18n('Charge')}: <strong>${move2Name}</strong> <img class='move-type-icon' src='static/images/types/${move2Type.toLowerCase()}.png' title='${i18n(move2Type)}' width='15'>
               </div>
-              <div>
-                ${i18n('Weight')}: <strong>${weight}kg</strong> | ${i18n('Height')}: <strong>${height}m</strong>
-              </div>
               ${catchRatesDisplay}
+              ${sizeDisplay}
             </div>`
 
         let rarityDisplay = ''

diff --git a/static/js/map/map.settings.js b/static/js/map/map.settings.js
@@ -28,6 +28,8 @@ function initSettings() {
     }
     if (serverSettings.pokemonValues) {
         settings.filterPokemonByValues = Store.get('filterPokemonByValues')
+        settings.filterPokemonBySize = Store.get('filterPokemonBySize')
+        settings.filterPokemonBySizeOptions = Store.get('filterPokemonBySizeOptions')
         settings.noFilterValuesPokemon = Store.get('noFilterValuesPokemon')
         settings.minIvs = Store.get('minIvs')
         settings.maxIvs = Store.get('maxIvs')
@@ -237,6 +239,25 @@ function initSettingsSidebar() {
             updatePokemons()
             Store.set('pokemonIconSizeModifier', iconSize)
         })
+
+        $('#filter-by-size-switch').on('change', function () {
+            settings.filterPokemonBySize = this.checked
+            const sizeFilterOptions = $('#filter-by-size-select').closest('.form-control')
+            if (this.checked) {
+                sizeFilterOptions.show()
+            } else {
+                sizeFilterOptions.hide()
+                updateMap({ loadAllPokemon: true })
+            }
+            updatePokemons()
+            Store.set('filterPokemonBySize', this.checked)
+        })
+
+        $('#filter-by-size-select').on('change', function () {
+            settings.filterPokemonBySizeOptions = $(this).val().map(Number)
+            updateMap({ loadAllPokemon: true })
+            Store.set('filterPokemonBySizeOptions', $(this).val().map(Number))
+        })
     }
 
     if (serverSettings.pokemonValues) {
@@ -1621,6 +1642,9 @@ function initSettingsSidebar() {
         $('#hundo-ivs-pokemon-switch-wrapper').toggle(settings.maxIvs < 100)
         $('#pokemon-level-slider-title').text(`${i18n('Levels')} (${settings.minLevel} - ${settings.maxLevel})`)
         $('#pokemon-level-slider-wrapper').toggle(settings.filterPokemonByValues)
+        $('#filter-by-size-switch').prop('checked', settings.filterPokemonBySize)
+        $('#filter-by-size-select').val(settings.filterPokemonBySizeOptions)
+        $('#filter-by-size-select').closest('.form-control').toggle(settings.filterPokemonBySize)
         if (serverSettings.highlightPokemon) {
             $('#pokemon-highlight-switch').prop('checked', settings.highlightPokemon)
             $('#highlight-pokemon-wrapper').toggle(settings.highlightPokemon)

diff --git a/static/js/utils/utils.pokemon.js b/static/js/utils/utils.pokemon.js
@@ -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 = []
@@ -219,6 +221,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

diff --git a/static/js/utils/utils.store.js b/static/js/utils/utils.store.js
@@ -59,6 +59,14 @@ const StoreOptions = {
         default: false,
         type: StoreTypes.Boolean
     },
+    filterPokemonBySize: {
+        default: false,
+        type: StoreTypes.Boolean
+    },
+    filterPokemonBySizeOptions: {
+        default: [1, 2, 3, 4, 5],
+        type: StoreTypes.JSON
+    },
     excludedPokemon: {
         default: new Set(),
         type: StoreTypes.Set

diff --git a/templates/map.html b/templates/map.html
@@ -694,6 +694,27 @@ <h4>{{ i18n('Export Pokémon lists') }}</h4>
                     </div>
                   </div>
                 </div>
+                <div class="form-control">
+                  <div class="switch">
+                    <label>
+                      <input type="checkbox" id="filter-by-size-switch">
+                      <span class="lever"></span>
+                      {{ i18n('Filter by size') }}
+                    </label>
+                  </div>
+                </div>
+                <div class="form-control">
+                  <div class="input-field">
+                    <div class="select-title">{{ i18n('Pokemon Size') }}</div>
+                    <select id="filter-by-size-select" multiple>
+                      <option value="1">{{ i18n('XXS') }}</option>
+                      <option value="2">{{ i18n('XS') }}</option>
+                      <option value="3">{{ i18n('M') }}</option>
+                      <option value="4">{{ i18n('XL') }}</option>
+                      <option value="5">{{ i18n('XXL') }}</option>
+                    </select>
+                  </div>
+                </div>
                 {% if settings.highlightPokemon %}
                 <div class="form-control">
                   <div class="switch">