Add Shiny Sprites Display

* Update PokemonDataViewModel.cs * Update PokemonImageConverter.cs * Update PokemonIdToImageConverter.cs * Update PokemonViewModelBase.cs * Update MapPokemonMarker.xaml * Update PokemonIdToImageConverter.cs * Update PokemonImageConverter.cs * Update PokemonDataViewModel.cs
Necrobot-Private · Mar 29, 2017 · 7e7e183 · 7e7e183
1 parent 59bef99
commit 7e7e183
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/PoGo.Necrobot.Window/Controls/MapMarkers/MapPokemonMarker.xaml b/PoGo.Necrobot.Window/Controls/MapMarkers/MapPokemonMarker.xaml
@@ -6,7 +6,7 @@
     <Grid>
         <Button Background="Transparent" BorderThickness="0">
             <Image Name="icon" 
-               Source="{Binding Path=PokemonIcon, FallbackValue=http://www.serebii.net/pokemongo/pokemon/145.png}" 
+               Source="{Binding Path=PokemonIcon, FallbackValue=https://raw.githubusercontent.com/Necrobot-Private/PokemonGO-Assets/master/pokemon/145.png}" 
                VerticalAlignment="Center" 
                HorizontalAlignment="Center" 
                IsHitTestVisible="false" 

diff --git a/PoGo.Necrobot.Window/Converters/PokemonIdToImageConverter.cs b/PoGo.Necrobot.Window/Converters/PokemonIdToImageConverter.cs
@@ -17,7 +17,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
         {
             var pokemonId = (PokemonId)value;
 
-            return $"http://www.serebii.net/pokemongo/pokemon/{(int)pokemonId:000}.png";
+            return $"https://raw.githubusercontent.com/Necrobot-Private/PokemonGO-Assets/master/pokemon/{(int)pokemonId:000}.png";
 
         }
 

diff --git a/PoGo.Necrobot.Window/Converters/PokemonImageConverter.cs b/PoGo.Necrobot.Window/Converters/PokemonImageConverter.cs
@@ -14,7 +14,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
         {
             var id = (int)value;
 
-            return $"http://www.serebii.net/pokemongo/pokemon/{id:000}.png";
+            return $"https://raw.githubusercontent.com/Necrobot-Private/PokemonGO-Assets/master/pokemon/{id:000}.png";
 
         }
 

diff --git a/PoGo.Necrobot.Window/Model/PokemonDataViewModel.cs b/PoGo.Necrobot.Window/Model/PokemonDataViewModel.cs
@@ -310,7 +310,11 @@ public string PokemonIcon
         {
             get
             {
-                return $"http://assets.pokemon.com/assets/cms2/img/pokedex/full/{(int)PokemonData.PokemonId:000}.png";
+                if (pokemonData.PokemonDisplay.Shiny)
+                {
+                    return $"https://raw.githubusercontent.com/Necrobot-Private/PokemonGO-Assets/master/pokemon-shiny/{(int)PokemonData.PokemonId:000}.png";
+                }
+                return $"https://raw.githubusercontent.com/Necrobot-Private/PokemonGO-Assets/master/pokemon/{(int)PokemonData.PokemonId:000}.png";
             }
         }
 

diff --git a/PoGo.Necrobot.Window/Model/PokemonViewModelBase.cs b/PoGo.Necrobot.Window/Model/PokemonViewModelBase.cs
@@ -21,7 +21,7 @@ public string PokemonIcon
         {
             get
             {
-                return $"http://www.serebii.net/pokemongo/pokemon/{(int)PokemonId:000}.png";
+                return $"https://raw.githubusercontent.com/Necrobot-Private/PokemonGO-Assets/master/pokemon/{(int)PokemonId:000}.png";
             }
         }
-Original file line number
+Diff line change
@@ Expand Up @@
             {
                 var pokemonId = (PokemonId)value;
-                return $"http://www.serebii.net/pokemongo/pokemon/{(int)pokemonId:000}.png";
+                return $"https://raw.githubusercontent.com/Necrobot-Private/PokemonGO-Assets/master/pokemon/{(int)pokemonId:000}.png";
             }
@@ Expand Down @@