diff --git a/P3D/Network/GameJolt/GTS/GTSInboxScreen.vb b/P3D/Network/GameJolt/GTS/GTSInboxScreen.vb index 23158e8e2..205620e72 100644 --- a/P3D/Network/GameJolt/GTS/GTSInboxScreen.vb +++ b/P3D/Network/GameJolt/GTS/GTSInboxScreen.vb @@ -244,7 +244,7 @@ End If 'Pokemon image/data: - Core.SpriteBatch.Draw(D.Pokemon.GetTexture(True), New Rectangle(500, 164, 128, 128), Color.White) + Core.SpriteBatch.Draw(D.Pokemon.GetTexture(True), New Rectangle(500, 164, MathHelper.Min(CInt(D.Pokemon.GetTexture(True).Width * 2), 256), MathHelper.Min(CInt(D.Pokemon.GetTexture(True).Height * 2), 256)), Color.White) If D.Pokemon.GetDisplayName() <> D.Pokemon.OriginalName Then Core.SpriteBatch.DrawString(FontManager.MainFont, D.Pokemon.GetDisplayName(), New Vector2(630, 190), Color.Black) diff --git a/P3D/Network/GameJolt/GTS/GTSSearchScreen.vb b/P3D/Network/GameJolt/GTS/GTSSearchScreen.vb index 7615d36d9..7987a1603 100644 --- a/P3D/Network/GameJolt/GTS/GTSSearchScreen.vb +++ b/P3D/Network/GameJolt/GTS/GTSSearchScreen.vb @@ -155,7 +155,7 @@ End If 'Pokemon image/data: - Core.SpriteBatch.Draw(D.Pokemon.GetTexture(True), New Rectangle(500, 164, 128, 128), Color.White) + Core.SpriteBatch.Draw(D.Pokemon.GetTexture(True), New Rectangle(500, 164, MathHelper.Min(CInt(D.Pokemon.GetTexture(True).Width * 2), 256), MathHelper.Min(CInt(D.Pokemon.GetTexture(True).Height * 2), 256)), Color.White) If D.Pokemon.GetDisplayName() <> D.Pokemon.OriginalName Then Core.SpriteBatch.DrawString(FontManager.MainFont, D.Pokemon.GetDisplayName(), New Vector2(630, 190), Color.Black) @@ -181,7 +181,7 @@ 'RequestPokemon: Dim p As Pokemon = TempPokemon - Core.SpriteBatch.Draw(p.GetTexture(True), New Rectangle(800, 164, 128, 128), Color.White) + Core.SpriteBatch.Draw(p.GetTexture(True), New Rectangle(800, 164, MathHelper.Min(CInt(p.GetTexture(True).Width * 2), 256), MathHelper.Min(CInt(p.GetTexture(True).Height * 2), 256)), Color.White) If D.Pokemon.GetDisplayName() <> p.OriginalName Then Core.SpriteBatch.DrawString(FontManager.MainFont, p.GetDisplayName(), New Vector2(930, 190), Color.Black) diff --git a/P3D/Network/GameJolt/GTS/GTSSetupScreen.vb b/P3D/Network/GameJolt/GTS/GTSSetupScreen.vb index a6e54605a..723d2fec8 100644 --- a/P3D/Network/GameJolt/GTS/GTSSetupScreen.vb +++ b/P3D/Network/GameJolt/GTS/GTSSetupScreen.vb @@ -86,7 +86,7 @@ End If 'Pokemon image/data: - Core.SpriteBatch.Draw(D.Pokemon.GetTexture(True), New Rectangle(500, 164, 128, 128), Color.White) + Core.SpriteBatch.Draw(D.Pokemon.GetTexture(True), New Rectangle(500, 164, MathHelper.Min(CInt(D.Pokemon.GetTexture(True).Width * 2), 256), MathHelper.Min(CInt(D.Pokemon.GetTexture(True).Height * 2), 256)), Color.White) If D.Pokemon.GetDisplayName() <> D.Pokemon.OriginalName Then Core.SpriteBatch.DrawString(FontManager.MainFont, D.Pokemon.GetDisplayName(), New Vector2(630, 190), Color.Black) @@ -113,7 +113,7 @@ 'RequestPokemon: Dim p As Pokemon = TempPokemon - Core.SpriteBatch.Draw(p.GetTexture(True), New Rectangle(800, 164, 128, 128), Color.White) + Core.SpriteBatch.Draw(p.GetTexture(True), New Rectangle(800, 164, MathHelper.Min(CInt(p.GetTexture(True).Width * 2), 256), MathHelper.Min(CInt(p.GetTexture(True).Height * 2), 256)), Color.White) If D.Pokemon.GetDisplayName() <> p.OriginalName Then Core.SpriteBatch.DrawString(FontManager.MainFont, p.GetDisplayName(), New Vector2(930, 190), Color.Black) @@ -437,7 +437,7 @@ Canvas.DrawRectangle(New Rectangle(400, 100, 750, 500), New Color(255, 255, 255, 150)) If Not D.Pokemon Is Nothing Then - Core.SpriteBatch.Draw(D.Pokemon.GetTexture(True), New Rectangle(50, 120, 128, 128), Color.White) + Core.SpriteBatch.Draw(D.Pokemon.GetTexture(True), New Rectangle(50, 120, MathHelper.Min(CInt(D.Pokemon.GetTexture(True).Width * 2), 256), MathHelper.Min(CInt(D.Pokemon.GetTexture(True).Height * 2), 256)), Color.White) If D.Pokemon.GetDisplayName() <> D.Pokemon.OriginalName Then Core.SpriteBatch.DrawString(FontManager.MainFont, D.Pokemon.GetDisplayName(), New Vector2(180, 146), Color.Black) @@ -496,7 +496,7 @@ End If Dim p As Pokemon = TempPokemon - Core.SpriteBatch.Draw(p.GetTexture(True), New Rectangle(800, 120, 128, 128), Color.White) + Core.SpriteBatch.Draw(p.GetTexture(True), New Rectangle(800, 120, MathHelper.Min(CInt(p.GetTexture(True).Width * 2), 256), MathHelper.Min(CInt(p.GetTexture(True).Height * 2), 256)), Color.White) Core.SpriteBatch.DrawString(FontManager.MainFont, p.OriginalName, New Vector2(180 + 750, 176), Color.Black) 'Stars: diff --git a/P3D/Network/GameJolt/GTS/GTSTradeScreen.vb b/P3D/Network/GameJolt/GTS/GTSTradeScreen.vb index 481544aa3..7b8525c53 100644 --- a/P3D/Network/GameJolt/GTS/GTSTradeScreen.vb +++ b/P3D/Network/GameJolt/GTS/GTSTradeScreen.vb @@ -130,7 +130,7 @@ If Not P Is Nothing Then 'Pokemon image/data: - Core.SpriteBatch.Draw(P.GetTexture(True), New Rectangle(100 + OwnX, 164, 128, 128), Color.White) + Core.SpriteBatch.Draw(P.GetTexture(True), New Rectangle(100 + OwnX, 164, MathHelper.Min(CInt(P.GetTexture(True).Width * 2), 256), MathHelper.Min(CInt(P.GetTexture(True).Height * 2), 256)), Color.White) If P.GetDisplayName() <> P.OriginalName Then Core.SpriteBatch.DrawString(FontManager.MainFont, P.GetDisplayName(), New Vector2(230 + OwnX, 190), Color.Black) @@ -187,7 +187,7 @@ If Not D.Pokemon Is Nothing Then 'Pokemon image/data: - Core.SpriteBatch.Draw(D.Pokemon.GetTexture(True), New Rectangle(100 + OppX, 164, 128, 128), Color.White) + Core.SpriteBatch.Draw(D.Pokemon.GetTexture(True), New Rectangle(100 + OppX, 164, MathHelper.Min(CInt(D.Pokemon.GetTexture(True).Width * 2), 256), MathHelper.Min(CInt(D.Pokemon.GetTexture(True).Height * 2), 256)), Color.White) If D.Pokemon.GetDisplayName() <> D.Pokemon.OriginalName Then Core.SpriteBatch.DrawString(FontManager.MainFont, D.Pokemon.GetDisplayName(), New Vector2(230 + OppX, 190), Color.Black) @@ -402,8 +402,8 @@ Core.SpriteBatch.DrawString(FontManager.MiniFont, "Version " & GTSMainScreen.GTSVersion, New Vector2(4, Core.windowSize.Height - 1 - FontManager.MiniFont.MeasureString("Version " & GTSMainScreen.GTSVersion).Y), Color.DarkGray) Else Fur.Draw() - Core.SpriteBatch.Draw(D.Pokemon.GetTexture(True), New Rectangle(CInt(P1Pos.X), CInt(P1Pos.Y), 128, 128), Color.White) - Core.SpriteBatch.Draw(P.GetTexture(True), New Rectangle(CInt(P2Pos.X), CInt(P2Pos.Y), 128, 128), Color.White) + Core.SpriteBatch.Draw(D.Pokemon.GetTexture(True), New Rectangle(CInt(P1Pos.X), CInt(P1Pos.Y), MathHelper.Min(CInt(D.Pokemon.GetTexture(True).Width * 2), 256), MathHelper.Min(CInt(D.Pokemon.GetTexture(True).Height * 2), 256)), Color.White) + Core.SpriteBatch.Draw(P.GetTexture(True), New Rectangle(CInt(P2Pos.X), CInt(P2Pos.Y), MathHelper.Min(CInt(P.GetTexture(True).Width * 2), 256), MathHelper.Min(CInt(P.GetTexture(True).Height * 2), 256)), Color.White) End If End Sub diff --git a/P3D/Network/GameJolt/GTS/WonderTradeScreen.vb b/P3D/Network/GameJolt/GTS/WonderTradeScreen.vb index 4727e70f7..bdb589bc1 100644 --- a/P3D/Network/GameJolt/GTS/WonderTradeScreen.vb +++ b/P3D/Network/GameJolt/GTS/WonderTradeScreen.vb @@ -127,7 +127,7 @@ Me.PartnerEmblem.Draw(New Vector2(CInt(Core.windowSize.Width / 2), Core.windowSize.Height - 160), 2) Dim p As Pokemon = Me.SelectedPokemon - Core.SpriteBatch.Draw(p.GetTexture(True), New Rectangle(CInt(Core.windowSize.Width / 2 - 128), 80, 256, 256), Color.White) + Core.SpriteBatch.Draw(p.GetTexture(True), New Rectangle(CInt(Core.windowSize.Width / 2 - MathHelper.Min(CInt(p.GetTexture(True).Width * 3 / 2), 144)), 80, MathHelper.Min(p.GetTexture(True).Width * 3, 288), MathHelper.Min(p.GetTexture(True).Height * 3, 288)), Color.White) Canvas.DrawRectangle(New Rectangle(CInt(Core.windowSize.Width / 2 - 300), 350, 600, 40), New Color(135, 168, 20, 100)) Core.SpriteBatch.DrawString(FontManager.MainFont, p.GetDisplayName(), New Vector2(CInt(Core.windowSize.Width / 2 - 298), 355), Color.White) @@ -338,19 +338,19 @@ Private Sub DrawTrading() Select Case tState Case 0 - Core.SpriteBatch.Draw(Me.SelectedPokemon.GetTexture(True), New Rectangle(CInt(Core.windowSize.Width / 2 - 128), ownPokemonPosition, 256, 256), Color.White) + Core.SpriteBatch.Draw(Me.SelectedPokemon.GetTexture(True), New Rectangle(CInt(MathHelper.Min(CInt(SelectedPokemon.GetTexture(True).Width * 3 / 2), 144)), ownPokemonPosition, MathHelper.Min(SelectedPokemon.GetTexture(True).Width * 3, 288), MathHelper.Min(SelectedPokemon.GetTexture(True).Height * 3, 288)), Color.White) Case 1 - Core.SpriteBatch.Draw(Me.SelectedPokemon.GetTexture(False), New Rectangle(CInt(Core.windowSize.Width / 2 - 128), CInt(Core.windowSize.Height / 2 - 128), 256, 256), Color.White) + Core.SpriteBatch.Draw(Me.SelectedPokemon.GetTexture(False), New Rectangle(CInt(MathHelper.Min(CInt(SelectedPokemon.GetTexture(False).Width * 3 / 2), 144)), CInt(Core.windowSize.Height / 2 - MathHelper.Min(CInt(SelectedPokemon.GetTexture(False).Height * 3 / 2), 144)), MathHelper.Min(SelectedPokemon.GetTexture(False).Width * 3, 288), MathHelper.Min(SelectedPokemon.GetTexture(False).Height * 3, 288)), Color.White) Dim t As String = "Sending " & Me.SelectedPokemon.GetDisplayName() & " to Wondertrade." & Environment.NewLine & "Good-bye, " & Me.SelectedPokemon.GetDisplayName() & "!" Core.SpriteBatch.DrawString(FontManager.MainFont, t, New Vector2(CInt(Core.windowSize.Width / 2 - FontManager.MainFont.MeasureString(t).X / 2), CInt(Core.windowSize.Height / 2 + 130)), Color.White) Case 2 - Core.SpriteBatch.Draw(Me.SelectedPokemon.GetTexture(False), New Rectangle(CInt(Core.windowSize.Width / 2 - 128), ownPokemonPosition, 256, 256), Color.White) + Core.SpriteBatch.Draw(Me.SelectedPokemon.GetTexture(False), New Rectangle(CInt(MathHelper.Min(CInt(SelectedPokemon.GetTexture(False).Width * 3 / 2), 144)), ownPokemonPosition, MathHelper.Min(SelectedPokemon.GetTexture(False).Width * 3, 288), MathHelper.Min(SelectedPokemon.GetTexture(False).Height * 3, 288)), Color.White) Case 3 - Core.SpriteBatch.Draw(Me.WonderTradePokemon.GetTexture(True), New Rectangle(CInt(Core.windowSize.Width / 2 - 128), oppPokemonPosition, 256, 256), Color.White) + Core.SpriteBatch.Draw(Me.WonderTradePokemon.GetTexture(True), New Rectangle(CInt(MathHelper.Min(CInt(WonderTradePokemon.GetTexture(True).Width * 3 / 2), 144)), oppPokemonPosition, MathHelper.Min(WonderTradePokemon.GetTexture(True).Width * 3, 288), MathHelper.Min(SelectedPokemon.GetTexture(True).Height * 3, 288)), Color.White) Case 4 - Core.SpriteBatch.Draw(Me.WonderTradePokemon.GetTexture(True), New Rectangle(CInt(Core.windowSize.Width / 2 - 128), CInt(Core.windowSize.Height / 2 - 128), 256, 256), Color.White) + Core.SpriteBatch.Draw(Me.WonderTradePokemon.GetTexture(True), New Rectangle(CInt(MathHelper.Min(CInt(WonderTradePokemon.GetTexture(True).Width * 3 / 2), 144)), CInt(Core.windowSize.Height / 2 - MathHelper.Min(CInt(WonderTradePokemon.GetTexture(True).Height * 3 / 2), 144)), MathHelper.Min(WonderTradePokemon.GetTexture(True).Width * 3, 288), MathHelper.Min(SelectedPokemon.GetTexture(True).Height * 3, 288)), Color.White) Dim t As String = Me.PartnerEmblem.Username & " sent over " & Me.WonderTradePokemon.GetDisplayName() & "." @@ -361,10 +361,10 @@ Private Sub UpdateTrading() Select Case tState Case 0 - If ownPokemonPosition > CInt(Core.windowSize.Height / 2 - 128) Then + If ownPokemonPosition > CInt(Core.windowSize.Height / 2 - MathHelper.Min(CInt(SelectedPokemon.GetTexture(True).Height * 3 / 2), 144)) Then ownPokemonPosition -= 4 - If ownPokemonPosition <= CInt(Core.windowSize.Height / 2 - 128) Then - ownPokemonPosition = CInt(Core.windowSize.Height / 2 - 128) + If ownPokemonPosition <= CInt(Core.windowSize.Height / 2 - MathHelper.Min(CInt(SelectedPokemon.GetTexture(True).Height * 3 / 2), 144)) Then + ownPokemonPosition = CInt(Core.windowSize.Height / 2 - MathHelper.Min(CInt(SelectedPokemon.GetTexture(True).Height * 3 / 2), 144)) tState = 1 SoundManager.PlayPokemonCry(SelectedPokemon.Number) End If @@ -387,10 +387,10 @@ End If End If Case 3 - If oppPokemonPosition < CInt(Core.windowSize.Height / 2 - 128) Then + If oppPokemonPosition < CInt(Core.windowSize.Height / 2 - MathHelper.Min(CInt(WonderTradePokemon.GetTexture(True).Height * 3 / 2), 144)) Then oppPokemonPosition += 4 - If oppPokemonPosition >= CInt(Core.windowSize.Height / 2 - 128) Then - oppPokemonPosition = CInt(Core.windowSize.Height / 2 - 128) + If oppPokemonPosition >= CInt(Core.windowSize.Height / 2 - MathHelper.Min(CInt(WonderTradePokemon.GetTexture(True).Height * 3 / 2), 144)) Then + oppPokemonPosition = CInt(Core.windowSize.Height / 2 - MathHelper.Min(CInt(WonderTradePokemon.GetTexture(True).Height * 3 / 2), 144)) tState = 4 SoundManager.PlayPokemonCry(WonderTradePokemon.Number) End If diff --git a/P3D/Network/Servers/DirectTradeScreen.vb b/P3D/Network/Servers/DirectTradeScreen.vb index f7bf9cb50..de4c6d399 100644 --- a/P3D/Network/Servers/DirectTradeScreen.vb +++ b/P3D/Network/Servers/DirectTradeScreen.vb @@ -95,7 +95,7 @@ If Not Me.OfferPokemon Is Nothing Then GetYOffset(offerYOffset, OfferPokemon) - Core.SpriteBatch.Draw(Me.OfferPokemon.GetTexture(True), New Rectangle(100, 100 - offerYOffset, 256, 256), Color.White) + Core.SpriteBatch.Draw(Me.OfferPokemon.GetTexture(True), New Rectangle(100, 100 - offerYOffset, MathHelper.Min(OfferPokemon.GetTexture(True).Width * 3, 288), MathHelper.Min(OfferPokemon.GetTexture(True).Height * 3, 288)), Color.White) Canvas.DrawRectangle(New Rectangle(100, 400, 256, 128), New Color(255, 255, 255, 150)) @@ -164,7 +164,7 @@ If Not TradePokemon Is Nothing Then GetYOffset(tradeYOffset, TradePokemon) - Core.SpriteBatch.Draw(TradePokemon.GetTexture(True), New Rectangle(CInt(Core.windowSize.Width - 356), 100 - tradeYOffset, 256, 256), Color.White) + Core.SpriteBatch.Draw(TradePokemon.GetTexture(True), New Rectangle(CInt(Core.windowSize.Width - 356), 100 - tradeYOffset, MathHelper.Min(TradePokemon.GetTexture(True).Width * 3, 288), MathHelper.Min(TradePokemon.GetTexture(True).Height * 3, 288)), Color.White) Canvas.DrawRectangle(New Rectangle(CInt(Core.windowSize.Width - 356), 400, 256, 128), New Color(255, 255, 255, 150)) @@ -424,9 +424,9 @@ Private Sub DrawTrading() Select Case tState Case 0 - Core.SpriteBatch.Draw(Me.OfferPokemon.GetTexture(True), New Rectangle(CInt(Core.windowSize.Width / 2 - 128), ownPokemonPosition, 256, 256), Color.White) + Core.SpriteBatch.Draw(Me.OfferPokemon.GetTexture(True), New Rectangle(CInt(Core.windowSize.Width / 2 - MathHelper.Min(CInt(OfferPokemon.GetTexture(True).Width * 3 / 2), 144)), ownPokemonPosition, MathHelper.Min(OfferPokemon.GetTexture(True).Width * 3, 288), MathHelper.Min(OfferPokemon.GetTexture(True).Height * 3, 288)), Color.White) Case 1 - Core.SpriteBatch.Draw(Me.OfferPokemon.GetTexture(False), New Rectangle(CInt(Core.windowSize.Width / 2 - 128), CInt(Core.windowSize.Height / 2 - 128), 256, 256), Color.White) + Core.SpriteBatch.Draw(Me.OfferPokemon.GetTexture(False), New Rectangle(CInt(Core.windowSize.Width / 2 - MathHelper.Min(CInt(OfferPokemon.GetTexture(False).Width * 3 / 2), 144)), CInt(Core.windowSize.Height / 2 - 128), MathHelper.Min(OfferPokemon.GetTexture(False).Width * 3, 288), MathHelper.Min(OfferPokemon.GetTexture(False).Height * 3, 288)), Color.White) Dim p As Servers.Player = Nothing For Each pp As Servers.Player In Core.ServersManager.PlayerCollection @@ -440,11 +440,11 @@ Core.SpriteBatch.DrawString(FontManager.MainFont, t, New Vector2(CInt(Core.windowSize.Width / 2 - FontManager.MainFont.MeasureString(t).X / 2), CInt(Core.windowSize.Height / 2 + 130)), Color.White) Case 2 - Core.SpriteBatch.Draw(Me.OfferPokemon.GetTexture(False), New Rectangle(CInt(Core.windowSize.Width / 2 - 128), ownPokemonPosition, 256, 256), Color.White) + Core.SpriteBatch.Draw(Me.OfferPokemon.GetTexture(False), New Rectangle(CInt(Core.windowSize.Width / 2 - MathHelper.Min(CInt(OfferPokemon.GetTexture(False).Width * 3 / 2), 144)), ownPokemonPosition, MathHelper.Min(OfferPokemon.GetTexture(False).Width * 3, 288), MathHelper.Min(OfferPokemon.GetTexture(False).Height * 3, 288)), Color.White) Case 3 - Core.SpriteBatch.Draw(TradePokemon.GetTexture(True), New Rectangle(CInt(Core.windowSize.Width / 2 - 128), oppPokemonPosition, 256, 256), Color.White) + Core.SpriteBatch.Draw(TradePokemon.GetTexture(True), New Rectangle(CInt(Core.windowSize.Width / 2 - MathHelper.Min(CInt(TradePokemon.GetTexture(True).Width * 3 / 2), 144)), oppPokemonPosition, MathHelper.Min(TradePokemon.GetTexture(True).Width * 3, 288), MathHelper.Min(TradePokemon.GetTexture(True).Height * 3, 288)), Color.White) Case 4 - Core.SpriteBatch.Draw(TradePokemon.GetTexture(True), New Rectangle(CInt(Core.windowSize.Width / 2 - 128), CInt(Core.windowSize.Height / 2 - 128), 256, 256), Color.White) + Core.SpriteBatch.Draw(TradePokemon.GetTexture(True), New Rectangle(CInt(Core.windowSize.Width / 2 - MathHelper.Min(CInt(TradePokemon.GetTexture(True).Width * 3 / 2), 144)), CInt(Core.windowSize.Height / 2 - 128), MathHelper.Min(TradePokemon.GetTexture(True).Width * 3, 288), MathHelper.Min(TradePokemon.GetTexture(True).Height * 3, 288)), Color.White) Dim p As Servers.Player = Nothing For Each pp As Servers.Player In Core.ServersManager.PlayerCollection diff --git a/P3D/Network/Servers/PVPLobbyScreen.vb b/P3D/Network/Servers/PVPLobbyScreen.vb index 19c5e492d..57ca4ebf9 100644 --- a/P3D/Network/Servers/PVPLobbyScreen.vb +++ b/P3D/Network/Servers/PVPLobbyScreen.vb @@ -161,7 +161,8 @@ For i = 0 To OwnTeam.Count - 1 Dim p As Pokemon = OwnTeam(i) Dim pokeTexture = p.GetMenuTexture() - Core.SpriteBatch.Draw(pokeTexture, New Rectangle(40 + i * 40 - CInt((pokeTexture.Width - 32) / 2), 264, pokeTexture.Width, 32), Color.White) + Dim pokeTextureScale As Vector2 = New Vector2(CSng(32 / pokeTexture.Width), CSng(32 / pokeTexture.Height)) + Core.SpriteBatch.Draw(pokeTexture, New Rectangle(40 + i * 40 - CInt((pokeTexture.Width - 32) / 2), 264, CInt(pokeTexture.Width * pokeTextureScale.X), CInt(pokeTexture.Height * pokeTextureScale.Y)), Color.White) Next End If End If @@ -228,7 +229,9 @@ For i = 0 To OppTeam.Count - 1 Dim p As Pokemon = OppTeam(i) Dim pokeTexture = p.GetMenuTexture() - Core.SpriteBatch.Draw(pokeTexture, New Rectangle(CInt(Core.windowSize.Width - 360) + i * 40 - CInt((pokeTexture.Width - 32) / 2), 264, pokeTexture.Width, 32), Color.White) + Dim pokeTextureScale As Vector2 = New Vector2(CSng(32 / pokeTexture.Width), CSng(32 / pokeTexture.Height)) + + Core.SpriteBatch.Draw(pokeTexture, New Rectangle(CInt(Core.windowSize.Width - 360) + i * 40 - CInt((pokeTexture.Width - 32) / 2), 264, CInt(pokeTexture.Width * pokeTextureScale.X), CInt(pokeTexture.Height * pokeTextureScale.Y)), Color.White) Next End If End If @@ -361,7 +364,9 @@ If BattleBoxPokemon.Count - 1 >= i Then Dim pokeTexture = BattleBoxPokemon(i).GetMenuTexture() - Core.SpriteBatch.Draw(pokeTexture, New Rectangle(CInt(startPos.X) + x * 140 + 32 - CInt(pokeTexture.Width - 32), y * 100 + CInt(startPos.Y) + 10, pokeTexture.Width * 2, pokeTexture.Height * 2), Color.White) + Dim pokeTextureScale As Vector2 = New Vector2(CSng(32 / pokeTexture.Width) * 2, CSng(32 / pokeTexture.Height) * 2) + + Core.SpriteBatch.Draw(pokeTexture, New Rectangle(CInt(startPos.X) + x * 140 + 32 - CInt(pokeTexture.Width - 32), y * 100 + CInt(startPos.Y) + 10, CInt(pokeTexture.Width * pokeTextureScale.X), CInt(pokeTexture.Height * pokeTextureScale.Y)), Color.White) End If Core.SpriteBatch.DrawString(FontManager.MainFont, "Battle Box", New Vector2(CInt(startPos.X) + 80, CInt(startPos.Y) - 45), Color.White) @@ -382,7 +387,8 @@ If Core.Player.Pokemons.Count - 1 >= i Then Dim pokeTexture = Core.Player.Pokemons(i).GetMenuTexture() - Core.SpriteBatch.Draw(pokeTexture, New Rectangle(CInt(startPos.X) + x * 140 + 32 - CInt(pokeTexture.Width - 32), y * 100 + CInt(startPos.Y) + 10, pokeTexture.Width * 2, pokeTexture.Height * 2), Color.White) + Dim pokeTextureScale As Vector2 = New Vector2(CSng(32 / pokeTexture.Width) * 2, CSng(32 / pokeTexture.Height) * 2) + Core.SpriteBatch.Draw(pokeTexture, New Rectangle(CInt(startPos.X) + x * 140 + 32 - CInt(pokeTexture.Width - 32), y * 100 + CInt(startPos.Y) + 10, CInt(pokeTexture.Width * pokeTextureScale.X), CInt(pokeTexture.Height * pokeTextureScale.Y)), Color.White) End If Core.SpriteBatch.DrawString(FontManager.MainFont, "Team", New Vector2(CInt(startPos.X) + 106, CInt(startPos.Y) - 45), Color.White) @@ -727,7 +733,8 @@ c = New Color(65, 65, 65, 255) End If Dim pokeTexture = p.GetMenuTexture() - Core.SpriteBatch.Draw(pokeTexture, New Rectangle(40 + i * 40 - CInt((pokeTexture.Width - 32) / 2), 264, pokeTexture.Width, 32), c) + Dim pokeTextureScale As Vector2 = New Vector2(CSng(32 / pokeTexture.Width), CSng(32 / pokeTexture.Height)) + Core.SpriteBatch.Draw(pokeTexture, New Rectangle(40 + i * 40 - CInt((pokeTexture.Width - 32) / 2), 264, CInt(pokeTexture.Width * pokeTextureScale.X), CInt(pokeTexture.Height * pokeTextureScale.Y)), c) Next 'Draw Own Statistics: @@ -810,7 +817,8 @@ c = New Color(65, 65, 65, 255) End If Dim pokeTexture = p.GetMenuTexture() - Core.SpriteBatch.Draw(pokeTexture, New Rectangle(CInt(Core.windowSize.Width - 360) + i * 40 - CInt((pokeTexture.Width - 32) / 2), 264, pokeTexture.Width, 32), c) + Dim pokeTextureScale As Vector2 = New Vector2(CSng(32 / pokeTexture.Width), CSng(32 / pokeTexture.Height)) + Core.SpriteBatch.Draw(pokeTexture, New Rectangle(CInt(Core.windowSize.Width - 360) + i * 40 - CInt((pokeTexture.Width - 32) / 2), 264, CInt(pokeTexture.Width * pokeTextureScale.X), CInt(pokeTexture.Height * pokeTextureScale.Y)), c) Next 'Draw Opp Statistics: