tyler.durden/P3D-Legacy
1
0
Fork 0
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git synced 2025-04-08 18:35:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Post merge cleanup round 2

Browse Source
This commit is contained in:
Daniel S. Billing 2022-05-28 21:10:10 +02:00
parent d1ba06f083
commit 21f4842c97
3 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
P3D/Overworld/RouteSign.vb
View File

@ -54,7 +54,7 @@ Public Class RouteSign
''' </summary>
Public Sub Draw()
If Me._show = True Then
Dim placeString As String = Localization.Translate("places." & Me._text, Me.GetType)
Dim placeString As String = Localization.Translate("places." & Me._text, Nothing, Me.GetType)
'Get the point to render the text to.
Dim pX As Integer = CInt(316 / 2) - CInt(FontManager.InGameFont.MeasureString(placeString).X / 2)

16
P3D/Screens/MapScreen.vb
View File

@ -537,32 +537,32 @@
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.Translate("cities", Me.GetType), New Vector2(Core.windowSize.Width - 139, 101), Color.Black)
Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.Translate("cities", Me.GetType), New Vector2(Core.windowSize.Width - 140, 100), Color.White)
Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.Translate("cities", Nothing, Me.GetType), New Vector2(Core.windowSize.Width - 139, 101), Color.Black)
Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.Translate("cities", Nothing, Me.GetType), New Vector2(Core.windowSize.Width - 140, 100), Color.White)
' Routes:
r = New Rectangle(104, 12, 12, 12)
If drawObjects(1) = False Then
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.Translate("routes", Me.GetType), New Vector2(Core.windowSize.Width - 139, 131), Color.Black)
Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.Translate("routes", Me.GetType), New Vector2(Core.windowSize.Width - 140, 130), Color.White)
Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.Translate("routes", Nothing, Me.GetType), New Vector2(Core.windowSize.Width - 139, 131), Color.Black)
Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.Translate("routes", Nothing, Me.GetType), New Vector2(Core.windowSize.Width - 140, 130), Color.White)
' Places:
r = New Rectangle(104, 24, 12, 12)
If drawObjects(2) = False Then
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.Translate("places", Me.GetType), New Vector2(Core.windowSize.Width - 139, 161), Color.Black)
Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.Translate("places", Me.GetType), New Vector2(Core.windowSize.Width - 140, 160), Color.White)
Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.Translate("places", Nothing, Me.GetType), New Vector2(Core.windowSize.Width - 139, 161), Color.Black)
Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.Translate("places", Nothing, Me.GetType), New Vector2(Core.windowSize.Width - 140, 160), Color.White)
' Roaming:
r = New Rectangle(113, 65, 14, 14)
If drawObjects(3) = False Then
r = New Rectangle(113, 81, 14, 14)
End If
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.Translate("roaming", Me.GetType), New Vector2(Core.windowSize.Width - 139, 191), Color.Black)
Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.Translate("roaming", Me.GetType), New Vector2(Core.windowSize.Width - 140, 190), Color.White)
Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.Translate("roaming", Nothing, Me.GetType), New Vector2(Core.windowSize.Width - 139, 191), Color.Black)
Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.Translate("roaming", Nothing, Me.GetType), New Vector2(Core.windowSize.Width - 140, 190), Color.White)
End Sub
Private Sub DrawCursor()

34
P3D/Screens/Pokemon/SummaryScreen.vb
View File

@ -262,15 +262,15 @@
Canvas.DrawRectangle(New Rectangle(DeltaX, DeltaY + 490, 264, 32), New Color(0, 0, 0, CInt(70 * _interfaceFade)))
Canvas.DrawGradient(New Rectangle(DeltaX + 264, DeltaY + 490, 50, 32), New Color(0, 0, 0, CInt(70 * _interfaceFade)), New Color(0, 0, 0, 0), True, -1)
SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("summaryscreen.type", Nothing, "Type"), New Vector2(DeltaX + 10, DeltaY + 330 + 4), New Color(255, 255, 255, CInt(220 * _interfaceFade)))
SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("summaryscreen.item", Nothing, "Item"), New Vector2(DeltaX + 10, DeltaY + 362 + 4), New Color(255, 255, 255, CInt(220 * _interfaceFade)))
SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("summaryscreen.nature", Nothing, "Nature"), New Vector2(DeltaX + 10, DeltaY + 394 + 4), New Color(255, 255, 255, CInt(220 * _interfaceFade)))
SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("summaryscreen.dexno", Nothing, "Dex No."), New Vector2(DeltaX + 10, DeltaY + 426 + 4), New Color(255, 255, 255, CInt(220 * _interfaceFade)))
SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("summaryscreen.type", "Type"), New Vector2(DeltaX + 10, DeltaY + 330 + 4), New Color(255, 255, 255, CInt(220 * _interfaceFade)))
SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("summaryscreen.item", "Item"), New Vector2(DeltaX + 10, DeltaY + 362 + 4), New Color(255, 255, 255, CInt(220 * _interfaceFade)))
SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("summaryscreen.nature", "Nature"), New Vector2(DeltaX + 10, DeltaY + 394 + 4), New Color(255, 255, 255, CInt(220 * _interfaceFade)))
SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("summaryscreen.dexno", "Dex No."), New Vector2(DeltaX + 10, DeltaY + 426 + 4), New Color(255, 255, 255, CInt(220 * _interfaceFade)))
SpriteBatch.DrawString(FontManager.MainFont, "OT", New Vector2(DeltaX + 10, DeltaY + 458 + 4), New Color(255, 255, 255, CInt(220 * _interfaceFade)))
SpriteBatch.DrawString(FontManager.MainFont, GetPokemon().CatchTrainerName, New Vector2(DeltaX + 96 + 8, DeltaY + 458 + 4), New Color(255, 255, 255, CInt(220 * _fadeIn)))
SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("summaryscreen.idno", Nothing, "ID No."), New Vector2(DeltaX + 10, DeltaY + 490 + 4), New Color(255, 255, 255, CInt(220 * _interfaceFade)))
SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("summaryscreen.idno", "ID No."), New Vector2(DeltaX + 10, DeltaY + 490 + 4), New Color(255, 255, 255, CInt(220 * _interfaceFade)))
SpriteBatch.DrawString(FontManager.MainFont, GetPokemon().OT, New Vector2(DeltaX + 96 + 8, DeltaY + 490 + 4), New Color(255, 255, 255, CInt(220 * _fadeIn)))
@ -389,7 +389,7 @@
Canvas.DrawRectangle(New Rectangle(DeltaX + 350, DeltaY + 362 - 64, 300 + 48, 32), New Color(0, 0, 0, CInt(100 * _interfaceFade * _pageFade)))
Canvas.DrawRectangle(New Rectangle(DeltaX + 350, DeltaY + 394 - 64, 300 + 48, 64 + 12), New Color(0, 0, 0, CInt(70 * _interfaceFade * _pageFade)))
SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("summaryscreen.ability", Nothing, "Ability"), New Vector2(DeltaX + 360, DeltaY + 366 - 64), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade)))
SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("summaryscreen.ability", "Ability"), New Vector2(DeltaX + 360, DeltaY + 366 - 64), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade)))
SpriteBatch.DrawString(FontManager.MainFont, .Ability.Name, New Vector2(DeltaX + 440 + 24, DeltaY + 366 - 64), New Color(255, 255, 255, CInt(220 * _fadeIn * _pageFade)))
SpriteBatch.DrawString(FontManager.MainFont, .Ability.Description.CropStringToWidth(FontManager.MainFont, 1.0F, 300 + 32), New Vector2(DeltaX + 358, DeltaY + 336), New Color(255, 255, 255, CInt(220 * _fadeIn * _pageFade)))
@ -397,7 +397,7 @@
Canvas.DrawRectangle(New Rectangle(DeltaX + 350, DeltaY + 362 + 64, 300 + 24, 32), New Color(0, 0, 0, CInt(100 * _interfaceFade * _pageFade)))
Canvas.DrawRectangle(New Rectangle(DeltaX + 350, DeltaY + 394 + 64, 300 + 24, 64), New Color(0, 0, 0, CInt(70 * _interfaceFade * _pageFade)))
SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("summaryscreen.catch_method", Nothing, "Catch Method"), New Vector2(DeltaX + 360, DeltaY + 366 + 64), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade)))
SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("summaryscreen.catch_method", "Catch Method"), New Vector2(DeltaX + 360, DeltaY + 366 + 64), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade)))
Dim text As String = .CatchMethod.Replace(.CatchMethod(0), Char.ToUpper(.CatchMethod(0))) & " " & .CatchLocation
SpriteBatch.DrawString(FontManager.MainFont, text.CropStringToWidth(FontManager.MainFont, 1.0F, 300 - 64), New Vector2(DeltaX + 358, DeltaY + 336 + 128), New Color(255, 255, 255, CInt(220 * _fadeIn * _pageFade)))
@ -415,12 +415,12 @@
'EXP:
Canvas.DrawRectangle(New Rectangle(DeltaX + 734 - 12, DeltaY + 362 + 64, 300 + 24, 32), New Color(0, 0, 0, CInt(100 * _interfaceFade * _pageFade)))
SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("summaryscreen.exp_points", Nothing, "Exp. Points"), New Vector2(DeltaX + 744, DeltaY + 366 + 64), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade)))
SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("summaryscreen.exp_points", "Exp. Points"), New Vector2(DeltaX + 744, DeltaY + 366 + 64), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade)))
SpriteBatch.DrawString(FontManager.MainFont, .Experience.ToString(), New Vector2(DeltaX + 898 - 12, DeltaY + 366 + 64), New Color(255, 255, 255, CInt(220 * _fadeIn * _pageFade)))
If .Level < CInt(GameModeManager.GetGameRuleValue("MaxLevel", "100")) Then
Canvas.DrawRectangle(New Rectangle(DeltaX + 734 - 12, DeltaY + 394 + 64, 300 + 24, 64), New Color(0, 0, 0, CInt(70 * _interfaceFade * _pageFade)))
SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("summaryscreen.to_next_lv", Nothing, "To Next Lv."), New Vector2(DeltaX + 744 - 12, DeltaY + 398 + 64), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade)))
SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("summaryscreen.to_next_lv", "To Next Lv."), New Vector2(DeltaX + 744 - 12, DeltaY + 398 + 64), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade)))
If .NeedExperience(.Level + 1) - .Experience > 0 Then
SpriteBatch.DrawString(FontManager.MainFont, CStr(.NeedExperience(.Level + 1) - .Experience), New Vector2(DeltaX + 898 - 12, DeltaY + 398 + 64), New Color(255, 255, 255, CInt(220 * _fadeIn * _pageFade)))
@ -515,17 +515,17 @@
Canvas.DrawRectangle(New Rectangle(DeltaX + 700, DeltaY + 76 + 32 * 5, 350, 160), New Color(0, 0, 0, CInt(70 * _interfaceFade * _pageFade * _moveFade)))
'Type:
SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("summaryscreen.type", Nothing, "Type:"), New Vector2(DeltaX + 710, DeltaY + 80), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade * _moveFade)))
SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("summaryscreen.type", "Type:"), New Vector2(DeltaX + 710, DeltaY + 80), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade * _moveFade)))
Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\Types"), New Rectangle(DeltaX + 824, DeltaY + 86, 48, 16), .Attacks(_moveIndex).Type.GetElementImage(), New Color(255, 255, 255, CInt(255 * _fadeIn * _pageFade * _moveFade)))
SpriteBatch.DrawString(FontManager.MainFont, "PP:", New Vector2(DeltaX + 710, DeltaY + 114), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade * _moveFade)))
SpriteBatch.DrawString(FontManager.MainFont, .Attacks(_moveIndex).CurrentPP & " / " & .Attacks(_moveIndex).MaxPP, New Vector2(DeltaX + 824, DeltaY + 114), New Color(255, 255, 255, CInt(220 * _fadeIn * _pageFade * _moveFade)))
'Stats:
SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("summaryscreen.category", Nothing, "Category:"), New Vector2(DeltaX + 710, DeltaY + 144), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade * _moveFade)))
SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("summaryscreen.category", "Category:"), New Vector2(DeltaX + 710, DeltaY + 144), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade * _moveFade)))
Core.SpriteBatch.Draw(.Attacks(_moveIndex).GetDamageCategoryImage(), New Rectangle(DeltaX + 824, DeltaY + 145, 48, 24), New Color(255, 255, 255, CInt(255 * _fadeIn * _pageFade * _moveFade)))
SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("summaryscreen.power", Nothing, "Power:"), New Vector2(DeltaX + 710, DeltaY + 176), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade * _moveFade)))
SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("summaryscreen.power", "Power:"), New Vector2(DeltaX + 710, DeltaY + 176), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade * _moveFade)))
Dim power As String = .Attacks(_moveIndex).Power.ToString()
If .Attacks(_moveIndex).Power <= 0 Then
@ -539,7 +539,7 @@
accuracy = "-"
End If
SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("summaryscreen.accuracy", Nothing, "Accuracy:"), New Vector2(DeltaX + 710, DeltaY + 208), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade * _moveFade)))
SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("summaryscreen.accuracy", "Accuracy:"), New Vector2(DeltaX + 710, DeltaY + 208), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade * _moveFade)))
SpriteBatch.DrawString(FontManager.MainFont, accuracy, New Vector2(DeltaX + 824, DeltaY + 208), New Color(255, 255, 255, CInt(220 * _fadeIn * _pageFade * _moveFade)))
'Description:
@ -551,17 +551,17 @@
Dim s As String = ""
Dim percent As Integer = CInt((GetPokemon().EggSteps / GetPokemon().BaseEggSteps) * 100)
If percent <= 33 Then
s = Localization.Translate("summaryscreen.egg_low", Nothing, "It looks like this Egg will" & Environment.NewLine & "take a long time to hatch.")
s = Localization.Translate("summaryscreen.egg_low", "It looks like this Egg will" & Environment.NewLine & "take a long time to hatch.")
ElseIf percent > 33 And percent <= 66 Then
s = Localization.Translate("summaryscreen.egg_medium", Nothing, "It's getting warmer and moves" & Environment.NewLine & "a little. It will hatch soon.")
s = Localization.Translate("summaryscreen.egg_medium", "It's getting warmer and moves" & Environment.NewLine & "a little. It will hatch soon.")
Else
s = Localization.Translate("summaryscreen.egg_high", Nothing, "There is strong movement" & Environment.NewLine & "noticeable. It will hatch soon!")
s = Localization.Translate("summaryscreen.egg_high", "There is strong movement" & Environment.NewLine & "noticeable. It will hatch soon!")
End If
Canvas.DrawRectangle(New Rectangle(DeltaX + 400, DeltaY + 76, 350, 32), New Color(0, 0, 0, CInt(100 * _fadeIn)))
Canvas.DrawRectangle(New Rectangle(DeltaX + 400, DeltaY + 108, 350, 96), New Color(0, 0, 0, CInt(70 * _fadeIn)))
SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("summaryscreen.egg_watch", Nothing, "The Egg Watch"), New Vector2(DeltaX + 410, DeltaY + 80), New Color(255, 255, 255, CInt(220 * _fadeIn)))
SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("summaryscreen.egg_watch", "The Egg Watch"), New Vector2(DeltaX + 410, DeltaY + 80), New Color(255, 255, 255, CInt(220 * _fadeIn)))
SpriteBatch.DrawString(FontManager.MainFont, s, New Vector2(DeltaX + 410, DeltaY + 132), New Color(255, 255, 255, CInt(220 * _fadeIn)))
End Sub