From a00a97412b6f347c0858a4e09b6689e76ba30d7c Mon Sep 17 00:00:00 2001 From: JappaWakka Date: Sat, 16 Apr 2022 20:17:09 +0200 Subject: [PATCH] =?UTF-8?q?Fixed=20Save=20Screen=20font,=20scale=20&=20Pok?= =?UTF-8?q?=C3=A9mon=20icons?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- P3D/Dialogues/ChooseBox.vb | 2 +- P3D/Screens/SaveScreen.vb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/P3D/Dialogues/ChooseBox.vb b/P3D/Dialogues/ChooseBox.vb index 478625b29..368ad19d4 100644 --- a/P3D/Dialogues/ChooseBox.vb +++ b/P3D/Dialogues/ChooseBox.vb @@ -147,7 +147,7 @@ With Core.SpriteBatch 'Bounding box If DrawBox Then - Canvas.DrawImageBorder(TextureManager.GetTexture("GUI\Overworld\ChooseBox", New Rectangle(0, 0, 72, 48), ""), 3, New Rectangle(CInt(Position.X), CInt(Position.Y), 360, CInt(48 * Options.Count)), True) + Canvas.DrawImageBorder(TextureManager.GetTexture("GUI\Overworld\ChooseBox", New Rectangle(0, 0, 72, 48), ""), 3, New Rectangle(CInt(Position.X), CInt(Position.Y), CInt(360 * Size), CInt((48 * Size) * Options.Count)), True) End If 'Text For i = 0 To Options.Count - 1 diff --git a/P3D/Screens/SaveScreen.vb b/P3D/Screens/SaveScreen.vb index 63263e3b2..8ac55176b 100644 --- a/P3D/Screens/SaveScreen.vb +++ b/P3D/Screens/SaveScreen.vb @@ -116,16 +116,16 @@ End If For i = 0 To Core.Player.Pokemons.Count - 1 - Dim Pos As New Vector2(Delta_X + 390 + (i Mod 3) * 80, Delta_Y + 50 + CInt(Math.Floor(i / 3)) * 64) + Dim Pos As New Vector2(Delta_X + 390 + (i Mod 3) * 80, Delta_Y + 50 + CInt(Math.Floor(i / 3)) * 80) Dim pokeTexture = Core.Player.Pokemons(i).GetMenuTexture() - .Draw(pokeTexture, New Rectangle(CInt(Pos.X) - CInt(pokeTexture.Width - 32), CInt(Pos.Y), pokeTexture.Width * 2, 64), Color.White) + .Draw(pokeTexture, New Rectangle(CInt(Pos.X), CInt(Pos.Y), 64, 64), Color.White) If Not Core.Player.Pokemons(i).Item Is Nothing And Core.Player.Pokemons(i).IsEgg() = False Then .Draw(Core.Player.Pokemons(i).Item.Texture, New Rectangle(CInt(Pos.X) + 36, CInt(Pos.Y) + 36, 32, 32), Color.White) End If Next - .DrawString(FontManager.MiniFont, Localization.GetString("save_screen_name") & ": " & Core.Player.Name & Environment.NewLine & Environment.NewLine & Localization.GetString("save_screen_badges") & ": " & Core.Player.Badges.Count.ToString() & Environment.NewLine & Environment.NewLine & Localization.GetString("save_screen_money") & ": " & Core.Player.Money & Environment.NewLine & Environment.NewLine & Localization.GetString("save_screen_time") & ": " & TimeHelpers.GetDisplayTime(TimeHelpers.GetCurrentPlayTime(), True), New Vector2(Delta_X + 400, Delta_Y + 215), Color.DarkBlue) + .DrawString(FontManager.MainFont, Localization.GetString("save_screen_name") & ": " & Core.Player.Name & Environment.NewLine & Environment.NewLine & Localization.GetString("save_screen_badges") & ": " & Core.Player.Badges.Count.ToString() & Environment.NewLine & Environment.NewLine & Localization.GetString("save_screen_money") & ": " & Core.Player.Money & Environment.NewLine & Environment.NewLine & Localization.GetString("save_screen_time") & ": " & TimeHelpers.GetDisplayTime(TimeHelpers.GetCurrentPlayTime(), True), New Vector2(Delta_X + 400, Delta_Y + 215), Color.DarkBlue) End If End With Screen.ChooseBox.Draw(New Vector2(Delta_X + 115, Delta_Y + 155), False, 1.5F)