From 28bb0eded5f83a59d7ca0864387ba3f88dc4452b Mon Sep 17 00:00:00 2001 From: sora10pls Date: Mon, 10 Aug 2020 21:44:19 -0400 Subject: [PATCH] Misc big sprite fixes/additions Match with latest PKHeX --- pkNX.Sprites/Properties/Resources.Designer.cs | 98 ++++++++++-------- pkNX.Sprites/Properties/Resources.resx | 59 ++++++----- pkNX.Sprites/SpriteBuilder.cs | 4 +- pkNX.Sprites/SpriteName.cs | 3 + .../{b_25-1c.png => b_25-1cf.png} | Bin .../{b_25-2c.png => b_25-2cf.png} | Bin .../{b_25-3c.png => b_25-3cf.png} | Bin .../{b_25-4c.png => b_25-4cf.png} | Bin .../{b_25-5c.png => b_25-5cf.png} | Bin .../{b_25-6c.png => b_25-6cf.png} | Bin .../Sprites/Big Pokemon Sprites/b_490-e.png | Bin 0 -> 250 bytes .../{b_0-1.png => b_egg.png} | Bin .../{b_0.png => b_unknown.png} | Bin .../{b_25-1cs.png => b_25-1cfs.png} | Bin .../{b_25-2cs.png => b_25-2cfs.png} | Bin .../{b_25-3cs.png => b_25-3cfs.png} | Bin .../{b_25-4cs.png => b_25-4cfs.png} | Bin .../{b_25-5cs.png => b_25-5cfs.png} | Bin .../{b_25-6cs.png => b_25-6cfs.png} | Bin pkNX.Sprites/pkNX.Sprites.csproj | 31 +++--- 20 files changed, 107 insertions(+), 88 deletions(-) rename pkNX.Sprites/Sprites/Big Pokemon Sprites/{b_25-1c.png => b_25-1cf.png} (100%) rename pkNX.Sprites/Sprites/Big Pokemon Sprites/{b_25-2c.png => b_25-2cf.png} (100%) rename pkNX.Sprites/Sprites/Big Pokemon Sprites/{b_25-3c.png => b_25-3cf.png} (100%) rename pkNX.Sprites/Sprites/Big Pokemon Sprites/{b_25-4c.png => b_25-4cf.png} (100%) rename pkNX.Sprites/Sprites/Big Pokemon Sprites/{b_25-5c.png => b_25-5cf.png} (100%) rename pkNX.Sprites/Sprites/Big Pokemon Sprites/{b_25-6c.png => b_25-6cf.png} (100%) create mode 100644 pkNX.Sprites/Sprites/Big Pokemon Sprites/b_490-e.png rename pkNX.Sprites/Sprites/Big Pokemon Sprites/{b_0-1.png => b_egg.png} (100%) rename pkNX.Sprites/Sprites/Big Pokemon Sprites/{b_0.png => b_unknown.png} (100%) rename pkNX.Sprites/Sprites/Big Shiny Sprites/{b_25-1cs.png => b_25-1cfs.png} (100%) rename pkNX.Sprites/Sprites/Big Shiny Sprites/{b_25-2cs.png => b_25-2cfs.png} (100%) rename pkNX.Sprites/Sprites/Big Shiny Sprites/{b_25-3cs.png => b_25-3cfs.png} (100%) rename pkNX.Sprites/Sprites/Big Shiny Sprites/{b_25-4cs.png => b_25-4cfs.png} (100%) rename pkNX.Sprites/Sprites/Big Shiny Sprites/{b_25-5cs.png => b_25-5cfs.png} (100%) rename pkNX.Sprites/Sprites/Big Shiny Sprites/{b_25-6cs.png => b_25-6cfs.png} (100%) diff --git a/pkNX.Sprites/Properties/Resources.Designer.cs b/pkNX.Sprites/Properties/Resources.Designer.cs index 75e07b9a..eeea2206 100644 --- a/pkNX.Sprites/Properties/Resources.Designer.cs +++ b/pkNX.Sprites/Properties/Resources.Designer.cs @@ -21300,26 +21300,6 @@ public class Resources { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap b_0 { - get { - object obj = ResourceManager.GetObject("b_0", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap b_0_1 { - get { - object obj = ResourceManager.GetObject("b_0_1", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -25753,9 +25733,9 @@ public class Resources { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap b_25_1c { + public static System.Drawing.Bitmap b_25_1cf { get { - object obj = ResourceManager.GetObject("b_25_1c", resourceCulture); + object obj = ResourceManager.GetObject("b_25_1cf", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -25763,9 +25743,9 @@ public class Resources { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap b_25_1cs { + public static System.Drawing.Bitmap b_25_1cfs { get { - object obj = ResourceManager.GetObject("b_25_1cs", resourceCulture); + object obj = ResourceManager.GetObject("b_25_1cfs", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -25793,9 +25773,9 @@ public class Resources { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap b_25_2c { + public static System.Drawing.Bitmap b_25_2cf { get { - object obj = ResourceManager.GetObject("b_25_2c", resourceCulture); + object obj = ResourceManager.GetObject("b_25_2cf", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -25803,9 +25783,9 @@ public class Resources { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap b_25_2cs { + public static System.Drawing.Bitmap b_25_2cfs { get { - object obj = ResourceManager.GetObject("b_25_2cs", resourceCulture); + object obj = ResourceManager.GetObject("b_25_2cfs", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -25833,9 +25813,9 @@ public class Resources { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap b_25_3c { + public static System.Drawing.Bitmap b_25_3cf { get { - object obj = ResourceManager.GetObject("b_25_3c", resourceCulture); + object obj = ResourceManager.GetObject("b_25_3cf", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -25843,9 +25823,9 @@ public class Resources { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap b_25_3cs { + public static System.Drawing.Bitmap b_25_3cfs { get { - object obj = ResourceManager.GetObject("b_25_3cs", resourceCulture); + object obj = ResourceManager.GetObject("b_25_3cfs", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -25873,9 +25853,9 @@ public class Resources { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap b_25_4c { + public static System.Drawing.Bitmap b_25_4cf { get { - object obj = ResourceManager.GetObject("b_25_4c", resourceCulture); + object obj = ResourceManager.GetObject("b_25_4cf", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -25883,9 +25863,9 @@ public class Resources { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap b_25_4cs { + public static System.Drawing.Bitmap b_25_4cfs { get { - object obj = ResourceManager.GetObject("b_25_4cs", resourceCulture); + object obj = ResourceManager.GetObject("b_25_4cfs", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -25913,9 +25893,9 @@ public class Resources { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap b_25_5c { + public static System.Drawing.Bitmap b_25_5cf { get { - object obj = ResourceManager.GetObject("b_25_5c", resourceCulture); + object obj = ResourceManager.GetObject("b_25_5cf", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -25923,9 +25903,9 @@ public class Resources { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap b_25_5cs { + public static System.Drawing.Bitmap b_25_5cfs { get { - object obj = ResourceManager.GetObject("b_25_5cs", resourceCulture); + object obj = ResourceManager.GetObject("b_25_5cfs", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -25953,9 +25933,9 @@ public class Resources { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap b_25_6c { + public static System.Drawing.Bitmap b_25_6cf { get { - object obj = ResourceManager.GetObject("b_25_6c", resourceCulture); + object obj = ResourceManager.GetObject("b_25_6cf", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -25963,9 +25943,9 @@ public class Resources { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap b_25_6cs { + public static System.Drawing.Bitmap b_25_6cfs { get { - object obj = ResourceManager.GetObject("b_25_6cs", resourceCulture); + object obj = ResourceManager.GetObject("b_25_6cfs", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -32570,6 +32550,16 @@ public class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_490_e { + get { + object obj = ResourceManager.GetObject("b_490_e", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -45980,6 +45970,26 @@ public class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_egg { + get { + object obj = ResourceManager.GetObject("b_egg", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_unknown { + get { + object obj = ResourceManager.GetObject("b_unknown", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/pkNX.Sprites/Properties/Resources.resx b/pkNX.Sprites/Properties/Resources.resx index 22589d95..eb6ad6ef 100644 --- a/pkNX.Sprites/Properties/Resources.resx +++ b/pkNX.Sprites/Properties/Resources.resx @@ -7624,11 +7624,11 @@ ..\Sprites\Big Items\bitem_tr.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Sprites\Big Pokemon Sprites\b_0.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_unknown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Sprites\Big Pokemon Sprites\b_0-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_egg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Sprites\Big Pokemon Sprites\b_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -11272,56 +11272,56 @@ ..\Sprites\Big Shiny Sprites\b_25s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Sprites\Big Pokemon Sprites\b_25-1c.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_25-1cf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Sprites\Big Shiny Sprites\b_25-1cs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Shiny Sprites\b_25-1cfs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Sprites\Big Shiny Sprites\b_25-1s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Sprites\Big Pokemon Sprites\b_25-2c.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_25-2cf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Sprites\Big Shiny Sprites\b_25-2cs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Shiny Sprites\b_25-2cfs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Sprites\Big Shiny Sprites\b_25-2s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Sprites\Big Pokemon Sprites\b_25-3c.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_25-3cf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Sprites\Big Shiny Sprites\b_25-3cs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Shiny Sprites\b_25-3cfs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Sprites\Big Shiny Sprites\b_25-3s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Sprites\Big Pokemon Sprites\b_25-4c.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_25-4cf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Sprites\Big Shiny Sprites\b_25-4cs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Shiny Sprites\b_25-4cfs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Sprites\Big Shiny Sprites\b_25-4s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Sprites\Big Pokemon Sprites\b_25-5c.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_25-5cf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Sprites\Big Shiny Sprites\b_25-5cs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Shiny Sprites\b_25-5cfs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Sprites\Big Shiny Sprites\b_25-5s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Sprites\Big Pokemon Sprites\b_25-6c.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_25-6cf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Sprites\Big Shiny Sprites\b_25-6cs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Shiny Sprites\b_25-6cfs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Sprites\Big Shiny Sprites\b_25-6s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -15760,4 +15760,7 @@ ..\Sprites\Big Shiny Sprites\b_25-8pfs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_490-e.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/pkNX.Sprites/SpriteBuilder.cs b/pkNX.Sprites/SpriteBuilder.cs index 11c2905f..ae83aed1 100644 --- a/pkNX.Sprites/SpriteBuilder.cs +++ b/pkNX.Sprites/SpriteBuilder.cs @@ -180,8 +180,8 @@ public class SpriteBuilder5668 : SpriteBuilder protected override string GetSpriteStringSpeciesOnly(int species) => 'b' + $"_{species}"; protected override string GetSpriteAll(int species, int form, int gender, bool shiny, bool gmax, int generation) => 'b' + SpriteName.GetResourceStringSprite(species, form, gender, generation, shiny, gmax); protected override string GetItemResourceName(int item) => 'b' + $"item_{item}"; - protected override Image Unknown => Resources.b_0; - protected override Image GetEggSprite(int species) => Resources.egg; // no manaphy egg sprite (yet) + protected override Image Unknown => Resources.b_unknown; + protected override Image GetEggSprite(int species) => species == (int)Species.Manaphy ? Resources.b_490_e : Resources.b_egg; public override Bitmap Hover => Resources.slotHover68; public override Bitmap View => Resources.slotView68; diff --git a/pkNX.Sprites/SpriteName.cs b/pkNX.Sprites/SpriteName.cs index 9426728e..01ff2066 100644 --- a/pkNX.Sprites/SpriteName.cs +++ b/pkNX.Sprites/SpriteName.cs @@ -48,7 +48,10 @@ public static string GetResourceStringSprite(int species, int form, int gender, if (species == (int)Species.Pikachu) { if (generation == 6) + { sb.Append(Cosplay); + gender = 2; // Cosplay Pikachu gift can only be Female, but personal entries are set to be either Gender + } else if (form == 8) sb.Append(GGStarter); } diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_25-1c.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_25-1cf.png similarity index 100% rename from pkNX.Sprites/Sprites/Big Pokemon Sprites/b_25-1c.png rename to pkNX.Sprites/Sprites/Big Pokemon Sprites/b_25-1cf.png diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_25-2c.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_25-2cf.png similarity index 100% rename from pkNX.Sprites/Sprites/Big Pokemon Sprites/b_25-2c.png rename to pkNX.Sprites/Sprites/Big Pokemon Sprites/b_25-2cf.png diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_25-3c.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_25-3cf.png similarity index 100% rename from pkNX.Sprites/Sprites/Big Pokemon Sprites/b_25-3c.png rename to pkNX.Sprites/Sprites/Big Pokemon Sprites/b_25-3cf.png diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_25-4c.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_25-4cf.png similarity index 100% rename from pkNX.Sprites/Sprites/Big Pokemon Sprites/b_25-4c.png rename to pkNX.Sprites/Sprites/Big Pokemon Sprites/b_25-4cf.png diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_25-5c.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_25-5cf.png similarity index 100% rename from pkNX.Sprites/Sprites/Big Pokemon Sprites/b_25-5c.png rename to pkNX.Sprites/Sprites/Big Pokemon Sprites/b_25-5cf.png diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_25-6c.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_25-6cf.png similarity index 100% rename from pkNX.Sprites/Sprites/Big Pokemon Sprites/b_25-6c.png rename to pkNX.Sprites/Sprites/Big Pokemon Sprites/b_25-6cf.png diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_490-e.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_490-e.png new file mode 100644 index 0000000000000000000000000000000000000000..6e97dc9727dfc50e13144b5cd4b9410be039d0f5 GIT binary patch literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^E^iEuz`R};PlB% zA?8&8j(sW`RPW)l#W_rHpypj@i2zTvczi;;+tpGshC^PoKX2{Bch1WR~}*w-(zJ zliw_U&*{if#CIv`_A$MVeZrEe$r&QE+e>BMFIO53%zvt_c;FFg - + @@ -2911,7 +2911,7 @@ - + @@ -4876,10 +4876,10 @@ - + - + @@ -4942,16 +4942,16 @@ - + - + - + - + @@ -5347,37 +5347,37 @@ - + - + - + - + - + - + @@ -9111,5 +9111,8 @@ + + + \ No newline at end of file