From d9f2a5a0e688e9c069964cfbba2431a152823faf Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Sat, 12 Sep 2020 23:20:13 -0400
Subject: [PATCH 1/4] Initial minigame for finding shinies on map

Currently only Magikarp have their shinies released. Just like Pokemon GO.
---
 src/configs/default.json |  5 ++++-
 src/data/default.js      |  1 -
 src/routes/ui.js         |  3 +++
 src/views/index.mustache |  2 ++
 static/js/index.js       | 29 ++++++++++++++++++++++++++---
 5 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/src/configs/default.json b/src/configs/default.json
index c6e587fb..a101f48e 100644
--- a/src/configs/default.json
+++ b/src/configs/default.json
@@ -256,5 +256,8 @@
             407,416,424,429,430,433,438,439,440,442,446,447,448,458,461,462,463,464,465,466,467,468,469,470,471,472,473,474,475,476,477,478,479,532,533,534,559,
             560,599,600,601,627,628
             ]
-        }
+    },
+    "shinyRates": {
+        "129-f253": 512
+    }
 }
diff --git a/src/data/default.js b/src/data/default.js
index c35270e7..89c00b72 100644
--- a/src/data/default.js
+++ b/src/data/default.js
@@ -38,6 +38,5 @@ data.default_show_submission_cells = config.map.filters.submissionCells;
 data.default_show_nests = config.map.filters.nests;
 data.default_show_scan_areas = config.map.filters.scanAreas;
 data.default_show_devices = config.map.filters.devices;
-data.pokemon_rarity_json = JSON.stringify(config.rarity);
 
 module.exports = data;
diff --git a/src/routes/ui.js b/src/routes/ui.js
index dd31668f..e2c6515a 100644
--- a/src/routes/ui.js
+++ b/src/routes/ui.js
@@ -193,6 +193,9 @@ const handlePage = async (req, res) => {
     data.min_zoom = config.map.minZoom || 10;
     data.max_zoom = config.map.maxZoom || 18;
 
+    data.pokemon_rarity_json = JSON.stringify(config.rarity);
+    data.pokemon_shiny_rates_json = JSON.stringify(config.shinyRates);
+
     data.locale_last_modified = (await fs.promises.stat(path.resolve(__dirname, `../../static/locales/${data.locale}.json`))).mtimeMs;
     data.css_last_modified = (await fs.promises.stat(path.resolve(__dirname, '../../static/css/index.css'))).mtimeMs;
     data.js_last_modified = (await fs.promises.stat(path.resolve(__dirname, '../../static/js/index.js'))).mtimeMs;
diff --git a/src/views/index.mustache b/src/views/index.mustache
index 7c51a52d..c44eb28c 100644
--- a/src/views/index.mustache
+++ b/src/views/index.mustache
@@ -2,6 +2,7 @@
 {{> navbar}}
 
     <script type="text/javascript">
+        const myUsername = '{{{username}}}';
         const defaultStartLocation = ['{{lat}}', '{{lon}}'];
         const defaultStartZoom = '{{zoom}}';
         let clusterPokemon = '{{cluster_pokemon}}' === 'true';
@@ -35,6 +36,7 @@
         const defaultShowDevices = '{{default_show_devices}}' === 'true';
 
         const pokemonRarity = JSON.parse('{{{pokemon_rarity_json}}}');
+        const pokemonShinyRates = JSON.parse('{{{pokemon_shiny_rates_json}}}');
 
         const locale = '{{{locale}}}';
         const localeLastModified = '{{{locale_last_modified}}}';
diff --git a/static/js/index.js b/static/js/index.js
index 8fb1aeba..c1921dfb 100644
--- a/static/js/index.js
+++ b/static/js/index.js
@@ -3660,7 +3660,7 @@ function calcIV(atk, def, sta) {
 
 function getPokemonMarkerIcon (pokemon, ts) {
     const size = getPokemonSize(pokemon.pokemon_id, pokemon.form);
-    const pokemonIdString = getPokemonIcon(pokemon.pokemon_id, pokemon.form, 0, pokemon.gender, pokemon.costume);
+    const pokemonIdString = getPokemonIcon(pokemon.pokemon_id, pokemon.form, 0, pokemon.gender, pokemon.costume, didIFindAShinyPokemon(pokemon.pokemon_id, pokemon.form, `wild-${pokemon.id}`));
     const color = glowColor; // TODO: settings['pokemon-glow'].color;
     const iv = calcIV(pokemon.atk_iv, pokemon.def_iv, pokemon.sta_iv);
     const bestRank = getPokemonBestRank(pokemon.pvp_rankings_great_league, pokemon.pvp_rankings_ultra_league);
@@ -3778,7 +3778,7 @@ function getPokestopMarkerIcon (pokestop, ts) {
             // Pokemon
             rewardString = 'p' + info.pokemon_id;
             // TODO: evolution https://github.com/versx/DataParser/issues/10
-            iconUrl = `${availableIconStyles[selectedIconStyle].path}/${getPokemonIcon(info.pokemon_id, info.form_id, 0, info.gender_id, info.costume_id, info.shiny)}.png`;
+            iconUrl = `${availableIconStyles[selectedIconStyle].path}/${getPokemonIcon(info.pokemon_id, info.form_id, 0, info.gender_id, info.costume_id, info.shiny || info.form_id && didIFindAShinyPokemon(info.pokemon_id, info.form_id, `quest-${pokestop.id}-${pokestop.quest_timestamp}`))}.png`;
         } else if (id === 8) {
             // Pokecoin
             rewardString = 'i-6';
@@ -3908,7 +3908,7 @@ function getGymMarkerIcon (gym, ts) {
         if (gym.raid_pokemon_id !== 0 && gym.raid_pokemon_id !== null) {
             // Raid Boss
             raidSize = getRaidSize('p' + gym.raid_pokemon_id);
-            raidIcon = `${availableIconStyles[selectedIconStyle].path}/${getPokemonIcon(gym.raid_pokemon_id, gym.raid_pokemon_form, gym.raid_pokemon_evolution, gym.raid_pokemon_gender, gym.raid_pokemon_costume)}.png`;
+            raidIcon = `${availableIconStyles[selectedIconStyle].path}/${getPokemonIcon(gym.raid_pokemon_id, gym.raid_pokemon_form, gym.raid_pokemon_evolution, gym.raid_pokemon_gender, gym.raid_pokemon_costume, didIFindAShinyPokemon(gym.raid_pokemon_id, gym.raid_pokemon_form, `raid-${gym.id}-${gym.raid_battle_timestamp}`))}.png`;
         } else {
             // Egg
             raidSize = getRaidSize('l' + raidLevel);
@@ -7304,3 +7304,26 @@ function setPokemonFilters(type, show) {
 
     $('#table-filter-pokemon').DataTable().rows().invalidate('data').draw(false);
 }
+
+// MARK: minigames that nobody asks for
+
+function didIFindAShinyPokemon(pokemonId, form, description) {
+    const rate = pokemonShinyRates[form ? `${pokemonId}-f${form}` : `${pokemonId}`];
+    if (!rate) {
+        return false;
+    }
+    // https://stackoverflow.com/a/52171480/2245107
+    const cyrb53 = function(str, seed = 0) {
+        let h1 = 0xdeadbeef ^ seed, h2 = 0x41c6ce57 ^ seed;
+        for (let i = 0, ch; i < str.length; i++) {
+            ch = str.charCodeAt(i);
+            h1 = Math.imul(h1 ^ ch, 2654435761);
+            h2 = Math.imul(h2 ^ ch, 1597334677);
+        }
+        h1 = Math.imul(h1 ^ (h1>>>16), 2246822507) ^ Math.imul(h2 ^ (h2>>>13), 3266489909);
+        h2 = Math.imul(h2 ^ (h2>>>16), 2246822507) ^ Math.imul(h1 ^ (h1>>>13), 3266489909);
+        return 4294967296 * (2097151 & h2) + (h1>>>0);
+    };
+    const lottery = `${myUsername}-${description}`;
+    return cyrb53(lottery) % rate === 0;
+}

From 5e082a6756f31b7c7db5a488146699c42008a4fe Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Sun, 13 Sep 2020 00:24:33 -0400
Subject: [PATCH 2/4] Support nonzero default rates via default

---
 static/js/index.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/static/js/index.js b/static/js/index.js
index c1921dfb..31d595fc 100644
--- a/static/js/index.js
+++ b/static/js/index.js
@@ -7308,7 +7308,10 @@ function setPokemonFilters(type, show) {
 // MARK: minigames that nobody asks for
 
 function didIFindAShinyPokemon(pokemonId, form, description) {
-    const rate = pokemonShinyRates[form ? `${pokemonId}-f${form}` : `${pokemonId}`];
+    let rate = pokemonShinyRates[form ? `${pokemonId}-f${form}` : `${pokemonId}`];
+    if (!rate) {
+        rate = pokemonShinyRates['default'];
+    }
     if (!rate) {
         return false;
     }

From 6b348eb1ab22e622e6e9dfc95f350974ef4d8f51 Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Sun, 13 Sep 2020 00:26:47 -0400
Subject: [PATCH 3/4] Add shiny to pokemon/raid popup

---
 static/js/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/static/js/index.js b/static/js/index.js
index 31d595fc..547ab871 100644
--- a/static/js/index.js
+++ b/static/js/index.js
@@ -2610,7 +2610,7 @@ function getPokemonPopupContent (pokemon) {
     }
 
     // TODO: add evolution https://github.com/versx/DataParser/issues/9
-    const pokemonIcon = getPokemonIcon(pokemon.pokemon_id, pokemon.form, 0, pokemon.gender, pokemon.costume);
+    const pokemonIcon = getPokemonIcon(pokemon.pokemon_id, pokemon.form, 0, pokemon.gender, pokemon.costume, didIFindAShinyPokemon(pokemon.pokemon_id, pokemon.form, `wild-${pokemon.id}`));
 
     content +=
     '<div class="row">' + // START 1ST ROW
@@ -3056,7 +3056,7 @@ function getGymPopupContent (gym) {
         } else {
             pokemonName = 'Level ' + gym.raid_level + ' Egg';
         }
-        const pokemonIcon = getPokemonIcon(gym.raid_pokemon_id, gym.raid_pokemon_form, gym.raid_pokemon_evolution, gym.raid_pokemon_gender, gym.raid_pokemon_costume);
+        const pokemonIcon = getPokemonIcon(gym.raid_pokemon_id, gym.raid_pokemon_form, gym.raid_pokemon_evolution, gym.raid_pokemon_gender, gym.raid_pokemon_costume, didIFindAShinyPokemon(gym.raid_pokemon_id, gym.raid_pokemon_form, `raid-${gym.id}-${gym.raid_battle_timestamp}`));
         content +=
         '<div class="row" style="margin:auto;">' + // START 1ST ROW
             '<div class="col-6 col-md-4">' + // START 1ST COL

From eb0d944e875cf374190c6d97a44872c7c2e7c2ea Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Sun, 13 Sep 2020 00:27:21 -0400
Subject: [PATCH 4/4] Distinguish undefined shiny rates

---
 static/js/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/js/index.js b/static/js/index.js
index 547ab871..f4edee73 100644
--- a/static/js/index.js
+++ b/static/js/index.js
@@ -7309,7 +7309,7 @@ function setPokemonFilters(type, show) {
 
 function didIFindAShinyPokemon(pokemonId, form, description) {
     let rate = pokemonShinyRates[form ? `${pokemonId}-f${form}` : `${pokemonId}`];
-    if (!rate) {
+    if (rate === undefined) {
         rate = pokemonShinyRates['default'];
     }
     if (!rate) {