From 2d852d9166b1f888b4aee866b0d97b01b85899d4 Mon Sep 17 00:00:00 2001 From: CaptainSegis Date: Fri, 21 Dec 2018 15:19:17 -0500 Subject: [PATCH] Small adjustments to MapScreen --- P3D/Screens/MapScreen.vb | 48 +++++++++++++++++++-------------------- lib/build/Pokemon3D.exe | Bin 2644992 -> 2644992 bytes 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/P3D/Screens/MapScreen.vb b/P3D/Screens/MapScreen.vb index 08c7c0047..002b77f8e 100644 --- a/P3D/Screens/MapScreen.vb +++ b/P3D/Screens/MapScreen.vb @@ -4,7 +4,7 @@ Public Const RasterSize As Integer = 32 Public Shared mapOffsetX As Integer = 100 - Public Shared mapOffsetY As Integer = 40 + Public Shared mapOffsetY As Integer = 75 Const MapMoveSpeed As Integer = 3 Dim flag() As Object = {} @@ -71,7 +71,7 @@ Private Sub ResetScreen() mapOffsetX = 100 - mapOffsetY = 40 + mapOffsetY = 75 For i = 0 To 3 Me.drawObjects(i) = True @@ -80,7 +80,7 @@ Private Sub FillMap() mapOffsetX = 100 - mapOffsetY = 40 + mapOffsetY = 75 Me.routes.Clear() Me.places.Clear() @@ -291,18 +291,18 @@ Me.lastMousePosition = New Vector2(MouseHandler.MousePosition.X, MouseHandler.MousePosition.Y) End If - If New Rectangle(0, 0, 50, Core.windowSize.Height).Contains(New Point(CInt(CursorPosition.X), CInt(CursorPosition.Y))) = True Then - mapOffsetX += MapMoveSpeed - End If - If New Rectangle(0, 0, Core.windowSize.Width, 50).Contains(New Point(CInt(CursorPosition.X), CInt(CursorPosition.Y))) = True Then - mapOffsetY += MapMoveSpeed - End If - If New Rectangle(Core.windowSize.Width - 50, 0, 50, Core.windowSize.Height).Contains(New Point(CInt(CursorPosition.X), CInt(CursorPosition.Y))) = True Then - mapOffsetX -= MapMoveSpeed - End If - If New Rectangle(0, Core.windowSize.Height - 50, Core.windowSize.Width, 50).Contains(New Point(CInt(CursorPosition.X), CInt(CursorPosition.Y))) = True Then - mapOffsetY -= MapMoveSpeed - End If + 'If New Rectangle(0, 0, 50, Core.windowSize.Height).Contains(New Point(CInt(CursorPosition.X), CInt(CursorPosition.Y))) = True Then + ' mapOffsetX += MapMoveSpeed + 'End If + 'If New Rectangle(0, 0, Core.windowSize.Width, 50).Contains(New Point(CInt(CursorPosition.X), CInt(CursorPosition.Y))) = True Then + ' mapOffsetY += MapMoveSpeed + 'End If + 'If New Rectangle(Core.windowSize.Width - 50, 0, 50, Core.windowSize.Height).Contains(New Point(CInt(CursorPosition.X), CInt(CursorPosition.Y))) = True Then + ' mapOffsetX -= MapMoveSpeed + 'End If + 'If New Rectangle(0, Core.windowSize.Height - 50, Core.windowSize.Width, 50).Contains(New Point(CInt(CursorPosition.X), CInt(CursorPosition.Y))) = True Then + ' mapOffsetY -= MapMoveSpeed + 'End If Dim mapOffset As New Vector2(MapScreen.mapOffsetX, MapScreen.mapOffsetY) Dim cursorPoint As New Point(CInt(CursorPosition.X), CInt(CursorPosition.Y)) @@ -471,10 +471,10 @@ End If If Me.hoverText <> "" And Me.pokehoverText <> "" Then - Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("pokemon_name_" & Me.pokehoverText) & " at " & Localization.GetString("Places_" & Me.hoverText), New Vector2(Me.CursorPosition.X + 32, Me.CursorPosition.Y - 29), Color.Black) + Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("pokemon_name_" & Me.pokehoverText) & " at " & Localization.GetString("Places_" & Me.hoverText), New Vector2(Me.CursorPosition.X + 30, Me.CursorPosition.Y - 31), Color.Black) Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("pokemon_name_" & Me.pokehoverText) & " at " & Localization.GetString("Places_" & Me.hoverText), New Vector2(Me.CursorPosition.X + 29, Me.CursorPosition.Y - 32), Color.White) ElseIf Me.hoverText <> "" And Me.pokehoverText = "" Then - Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("Places_" & Me.hoverText), New Vector2(Me.CursorPosition.X + 32, Me.CursorPosition.Y - 29), Color.Black) + Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("Places_" & Me.hoverText), New Vector2(Me.CursorPosition.X + 30, Me.CursorPosition.Y - 31), Color.Black) Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("Places_" & Me.hoverText), New Vector2(Me.CursorPosition.X + 29, Me.CursorPosition.Y - 32), Color.White) End If @@ -497,7 +497,7 @@ r = New Rectangle(116, 0, 12, 12) End If Core.SpriteBatch.Draw(Me.objectsTexture, New Rectangle(Core.windowSize.Width - 170, 100, 24, 24), r, New Color(255, 255, 255, 220)) - Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("map_screen_cities"), New Vector2(Core.windowSize.Width - 137, 103), Color.Black) + Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("map_screen_cities"), New Vector2(Core.windowSize.Width - 139, 101), Color.Black) Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("map_screen_cities"), New Vector2(Core.windowSize.Width - 140, 100), Color.White) ' Routes: r = New Rectangle(104, 12, 12, 12) @@ -505,7 +505,7 @@ r = New Rectangle(116, 12, 12, 12) End If Core.SpriteBatch.Draw(Me.objectsTexture, New Rectangle(Core.windowSize.Width - 170, 130, 24, 24), r, New Color(255, 255, 255, 220)) - Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("map_screen_routes"), New Vector2(Core.windowSize.Width - 137, 133), Color.Black) + Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("map_screen_routes"), New Vector2(Core.windowSize.Width - 139, 131), Color.Black) Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("map_screen_routes"), New Vector2(Core.windowSize.Width - 140, 130), Color.White) ' Places: r = New Rectangle(104, 24, 12, 12) @@ -513,15 +513,15 @@ r = New Rectangle(116, 24, 12, 12) End If Core.SpriteBatch.Draw(Me.objectsTexture, New Rectangle(Core.windowSize.Width - 170, 160, 24, 24), r, New Color(255, 255, 255, 220)) - Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("map_screen_places"), New Vector2(Core.windowSize.Width - 137, 163), Color.Black) + Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("map_screen_places"), New Vector2(Core.windowSize.Width - 139, 161), Color.Black) Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("map_screen_places"), New Vector2(Core.windowSize.Width - 140, 160), Color.White) ' Roaming: - r = New Rectangle(111, 64, 17, 16) + r = New Rectangle(113, 65, 14, 14) If drawObjects(3) = False Then - r = New Rectangle(111, 80, 17, 16) + r = New Rectangle(113, 81, 14, 14) End If - Core.SpriteBatch.Draw(Me.objectsTexture, New Rectangle(Core.windowSize.Width - 170, 190, 24, 24), r, New Color(255, 255, 255, 220)) - Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("map_screen_roaming"), New Vector2(Core.windowSize.Width - 137, 193), Color.Black) + Core.SpriteBatch.Draw(Me.objectsTexture, New Rectangle(Core.windowSize.Width - 172, 187, 28, 28), r, New Color(255, 255, 255, 220)) + Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("map_screen_roaming"), New Vector2(Core.windowSize.Width - 139, 191), Color.Black) Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("map_screen_roaming"), New Vector2(Core.windowSize.Width - 140, 190), Color.White) End Sub diff --git a/lib/build/Pokemon3D.exe b/lib/build/Pokemon3D.exe index 9779119a12417bc022703ac5255eca618326cbfd..e9dafc6f6ab4221230b63945dbb0e4d725d57896 100644 GIT binary patch delta 490 zcmZ|Jy-Pw-7{~E*uh(A8%wuI&z1O3?c%_1dXlh8QL<))uA<*`qNoa}QhlBC7)Y74$ zA&6R{hVUiwF9>Q4U4jT&B5DaI=@F9K((pOMIbS%xox-WKgAVrOf!Ho^kT}R3EF2UL zRt^mu8aXs^Xy#z!(89sap_PM!LmLNY7HC3seMT4Mje?yh>sdl<-Go%cmrB3?x!3b< zFMX42`-G743fA``oo(qlDp9L=^-+%)VzgOIYV^iTEMhnJn>=gvB%=RKf@V_I>&d8} zb{c6GWe(;DU*b49zhwiG>u25yr=^`x6=4$U^Tcf%IBT^3B;mI_niEAGn5l?>V zF}IAFAJrZ*I2XB4JL*84$c?&?ifWA)`H+TmBte4>(N=>5(PEJfC+ma2mQIrp zI5adBJ_xC~A)(1~X$fkOprujzgv6GH-*Ub`=X{)WuxdWq^UeKxCj|pk|<9 z(8HjYK_3Gx104fB0|NsigMJ1B3`|9!D-JW6S{3&y2BJ&w+C6= z5Sft$4I(SDAv