Skip to content

Commit

Permalink
Update For Mega Edition Client
Browse files Browse the repository at this point in the history
  • Loading branch information
SSinist3r committed Aug 11, 2020
1 parent 37373a6 commit 160f310
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion SSinProtocol/GameClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ public class GameClient
public event Action ActivePokemonChanged;
public event Action OpponentChanged;

private const string Version = "Spring20";
private const string Version = "Mega";

private GameConnection _connection;
private DateTime _lastMovement;
Expand Down
2 changes: 1 addition & 1 deletion SSinSS/App.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public static void InitializeVersion()
Assembly assembly = typeof(App).Assembly;
AssemblyName assemblyName = assembly.GetName();
Name = assemblyName.Name;
Version = assemblyName.Version.ToString(3) + "-beta8_d2";
Version = assemblyName.Version.ToString(3) + "-beta8_d3";
IsBeta = true;
Author = ((AssemblyCompanyAttribute)Attribute.GetCustomAttribute(assembly, typeof(AssemblyCompanyAttribute), false)).Company;
Description = ((AssemblyDescriptionAttribute)Attribute.GetCustomAttribute(assembly, typeof(AssemblyDescriptionAttribute), false)).Description;
Expand Down
10 changes: 5 additions & 5 deletions SSinSS/Views/BattleView.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public partial class BattleView : UserControl
private string _lastActiveName;
private string _lastOpponentName;
private Regex _nameCleaner = new Regex("'| |\\."); // Removes invalid characters
private const string _spriteDatabasePrefix = "http://pokestadium.com/sprites/xy";
private const string _spriteDatabasePrefix = "https://www.pkparaiso.com/imagenes/xy/sprites";

public BattleView(BotClient bot, MainWindow parent)
{
Expand Down Expand Up @@ -59,9 +59,9 @@ public void BattleUpdated()
_lastOpponentName = opponent;
string sprite = _nameCleaner.Replace(opponent.ToLowerInvariant(), "");
if (_bot.Game.ActiveBattle.IsShiny)
sprite = $"{_spriteDatabasePrefix}/shiny/{sprite}.gif";
sprite = $"{_spriteDatabasePrefix}/animados-shiny/{sprite}.gif";
else
sprite = $"{_spriteDatabasePrefix}/{sprite}.gif";
sprite = $"{_spriteDatabasePrefix}/animados/{sprite}.gif";
AnimationBehavior.SetSourceUri(OpponentGraphic, new Uri(sprite));
}

Expand Down Expand Up @@ -110,9 +110,9 @@ public void BattleUpdated()
_lastActiveName = active.Name;
string sprite = _nameCleaner.Replace(active.Name.ToLowerInvariant(), "");
if (active.IsShiny)
sprite = $"{_spriteDatabasePrefix}/shiny/back/{sprite}.gif";
sprite = $"{_spriteDatabasePrefix}/animados-espalda-shiny/{sprite}.gif"; // shiny back
else
sprite = $"{_spriteDatabasePrefix}/back/{sprite}.gif";
sprite = $"{_spriteDatabasePrefix}/animados-espalda/{sprite}.gif";
AnimationBehavior.SetSourceUri(PlayerGraphic, new Uri(sprite));
}

Expand Down

0 comments on commit 160f310

Please sign in to comment.