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

Adjust space width one more time and tweak screens

Browse Source
This commit is contained in:
JappaWakka 2025-03-31 19:13:31 +02:00
parent e7c3281a34
commit bdd9761d53
11 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
P3D/Content/Localization/Tokens_nl.dat
View File

@ -286,8 +286,8 @@ option_screen_battle,Gevecht
option_screen_battle_3dmodels,3D Modellen
option_screen_battle_animations,Animaties
option_screen_battle_battlestyle,Gevechtstijl
option_screen_battle_battlestyle_shift,Wisselen
option_screen_battle_battlestyle_set,Doorgaan
option_screen_battle_battlestyle_shift,Wissel
option_screen_battle_battlestyle_set,Vast
option_screen_controls,Besturing
option_screen_controls_xboxgamepad,Xbox Gamepad

2
P3D/Screens/MainMenu/JoinServerScreen.vb
View File

@ -557,7 +557,7 @@ Public Class JoinServerScreen
End Function
Public Sub Draw(ByVal startPos As Vector2, ByVal selected As Boolean)
Dim width As Integer = 500
Dim width As Integer = 608
startPos.X = CInt(Core.ScreenSize.Width / 2 - width / 2)
If selected = True Then
Canvas.DrawRectangle(New Rectangle(CInt(startPos.X), CInt(startPos.Y), width, 80), New Color(0, 0, 0, 200), True)

4
P3D/Screens/MainMenu/PressStartScreen.vb
View File

@ -215,7 +215,7 @@ Public Class PressStartScreen
If ControllerHandler.IsConnected() Then
text = Localization.GetString("start_screen_press", "Press") & "<button>" & Localization.GetString("start_screen_tostart", "to start.")
textSizeUntilButton = FontManager.InGameFont.MeasureString(text.GetSplit(0, "<button>"))
text = text.Replace("<button>", " ")
text = text.Replace("<button>", " ")
Else
text = Localization.GetString("start_screen_press", "Press") & " " & KeyBindings.EnterKey1.ToString().ToUpper & " " & Localization.GetString("start_screen_tostart", "to start.")
'text = "Press " & KeyBindings.EnterKey1.ToString() & ", " & KeyBindings.EnterKey2.ToString() & ", or primary mouse button to start."
@ -227,7 +227,7 @@ Public Class PressStartScreen
CInt(windowSize.Height - textSize.Y - 50)), _textColor)
If ControllerHandler.IsConnected() Then
SpriteBatch.Draw(TextureManager.GetTexture("GUI\GamePad\xboxControllerButtonA"), New Rectangle(CInt(windowSize.Width / 2 - textSize.X / 2 + textSizeUntilButton.X + FontManager.InGameFont.MeasureString(" ").X + 2), CInt(windowSize.Height - textSize.Y - 58), 40, 40), Color.White)
SpriteBatch.Draw(TextureManager.GetTexture("GUI\GamePad\xboxControllerButtonA"), New Rectangle(CInt(windowSize.Width / 2 - textSize.X / 2 + textSizeUntilButton.X + FontManager.InGameFont.MeasureString(" ").X + 2), CInt(windowSize.Height - textSize.Y - 58), 40, 40), Color.White)
End If
End If
End If

8
P3D/Screens/MainMenu/SplashScreen.vb
View File

@ -21,6 +21,7 @@ Friend Class SplashScreen
Private _loadThread As Thread
Private _startedLoad As Boolean
Private _game As GameController
Private _croppedLicenseText As String = ""
Public Sub New(ByVal GameReference As GameController)
_game = GameReference
@ -32,10 +33,11 @@ Friend Class SplashScreen
CanDrawDebug = False
MouseVisible = False
CanGoFullscreen = True
_monoGameLogo = TextureManager.LoadDirect("GUI\Logos\MonoGame.png")
_licenseFont = Core.Content.Load(Of SpriteFont)("Fonts\BMP\mainFont")
_licenseTextSize = _licenseFont.MeasureString(LICENSE_TEXT)
_croppedLicenseText = LICENSE_TEXT.CropStringToWidth(_licenseFont, MathHelper.Max(Core.windowSize.X - 64, 800))
_licenseTextSize = _licenseFont.MeasureString(_croppedLicenseText)
Me.Identification = Identifications.SplashScreen
End Sub
@ -46,7 +48,7 @@ Friend Class SplashScreen
Core.SpriteBatch.Draw(_monoGameLogo, New Vector2(CSng(Core.windowSize.Width / 2 - _monoGameLogo.Width / 2),
CSng(Core.windowSize.Height / 2 - _monoGameLogo.Height / 2 - 50)), Color.White)
Core.SpriteBatch.DrawString(_licenseFont, LICENSE_TEXT, New Vector2(CSng(Core.windowSize.Width / 2 - _licenseTextSize.X / 2),
Core.SpriteBatch.DrawString(_licenseFont, _croppedLicenseText, New Vector2(CSng(Core.windowSize.Width / 2 - _licenseTextSize.X / 2),
CSng(Core.windowSize.Height - _licenseTextSize.Y - 50)), Color.White)
End Sub

2
P3D/Screens/Pokedex/PokedexScreen.vb
View File

@ -774,7 +774,7 @@ Public Class PokedexScreen
If Localization.TokenExists("pokemon_desc_" & FormName) = True Then
DexEntryText = Localization.GetString("pokemon_desc_" & FormName, p.PokedexEntry.Text)
End If
Core.SpriteBatch.DrawString(FontManager.MainFont, DexEntryText.CropStringToWidth(FontManager.MainFont, 448), New Vector2(688, 490), Color.Black)
Core.SpriteBatch.DrawString(FontManager.MainFont, DexEntryText.CropStringToWidth(FontManager.MainFont, 440), New Vector2(688, 490), Color.Black)
Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\pokedexhabitat", New Rectangle(160, 160, 10, 10), ""), New Rectangle(992, 242, 20, 20), Color.White)

2
P3D/Screens/Pokemon/PartyScreen.vb
View File

@ -381,7 +381,7 @@ Public Class PartyScreen
End With
'HP display:
GetFontRenderer().DrawString(FontManager.MainFont, p.HP & " / " & p.MaxHP, New Vector2(position.X + 100, position.Y + 50), New Color(255, 255, 255, CInt(255 * _interfaceFade)))
GetFontRenderer().DrawString(FontManager.MainFont, p.HP & " / " & p.MaxHP, New Vector2(position.X + 116, position.Y + 50), New Color(255, 255, 255, CInt(255 * _interfaceFade)))
'status condition
Dim StatusTexture As Texture2D = BattleStats.GetStatImage(p.Status)

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

@ -342,7 +342,7 @@
Dim xOffset As Integer = 80
Dim height As Integer = 32
If y = 0 Then
xOffset = 4
xOffset = 0
yOffset = 0
height = 64
End If
@ -355,11 +355,11 @@
Dim multiColor As Color = New Color(255, 255, 255, CInt(200 * _fadeIn * _pageFade))
If natureStatMulti > 1.0F Then
multiColor = New Color(255, 180, 180, CInt(200 * _fadeIn * _pageFade))
multiColor = New Color(255, 200, 200, CInt(200 * _fadeIn * _pageFade))
ElseIf natureStatMulti < 1.0F Then
multiColor = New Color(180, 180, 255, CInt(200 * _fadeIn * _pageFade))
multiColor = New Color(200, 200, 255, CInt(200 * _fadeIn * _pageFade))
End If
SpriteBatch.DrawString(FontManager.MainFont, statValues(y), New Vector2(DeltaX + 480 + 32 + xOffset - 12, DeltaY + 48 + y * 32 + yOffset), multiColor)
SpriteBatch.DrawString(FontManager.MainFont, statValues(y), New Vector2(DeltaX + 480 + 32 + xOffset - 4, DeltaY + 48 + y * 32 + yOffset), multiColor)
Next
Dim pokeInfoTexture = TextureManager.GetTexture("GUI\Menus\PokemonInfo")
@ -432,12 +432,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.GetString("property_ExpPoints", "Exp. Points"), New Vector2(DeltaX + 744, DeltaY + 366 + 64), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade)))
SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("property_ExpPoints", "Exp. Points"), New Vector2(DeltaX + 734, DeltaY + 366 + 64), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade)))
SpriteBatch.DrawString(FontManager.MainFont, .Experience.ToString(), New Vector2(DeltaX + 744 + FontManager.MainFont.MeasureString(Localization.GetString("property_ExpPoints", "Exp. Points")).X + 24, 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.GetString("summary_ExpToNextLv", "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.GetString("summary_ExpToNextLv", "To Next Lv."), New Vector2(DeltaX + 734, 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 + 744 + FontManager.MainFont.MeasureString(Localization.GetString("summary_ExpToNextLv", "To Next Lv.")).X, DeltaY + 398 + 64), New Color(255, 255, 255, CInt(220 * _fadeIn * _pageFade)))
@ -495,7 +495,7 @@
'Switch Page Hint
Canvas.DrawRectangle(New Rectangle(DeltaX + 350, DeltaY + 6, 300 + 24, 32), New Color(0, 0, 0, CInt(50 * _interfaceFade * _pageFade)))
SpriteBatch.DrawString(FontManager.MainFont, ScriptVersion2.ScriptCommander.Parse(Localization.GetString("summary_hint_ViewMoves", "View Moves: [<system.button(movebackward)>] / Down")).ToString, New Vector2(DeltaX + 350 + 22, DeltaY + 10), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade)))
SpriteBatch.DrawString(FontManager.MainFont, ScriptVersion2.ScriptCommander.Parse(Localization.GetString("summary_hint_ViewMoves", "View Moves: [<system.button(movebackward)>] / Down")).ToString, New Vector2(DeltaX + 350 + 8, DeltaY + 10), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade)))
End With
End Sub
@ -568,7 +568,7 @@
'Switch Page Hint
Canvas.DrawRectangle(New Rectangle(DeltaX + 350, DeltaY + 6, 300 + 24, 32), New Color(0, 0, 0, CInt(50 * _interfaceFade * _pageFade)))
SpriteBatch.DrawString(FontManager.MainFont, ScriptVersion2.ScriptCommander.Parse(Localization.GetString("summary_hint_ViewInfo", "View Info: [<system.button(moveforward)>] / Up")).ToString, New Vector2(DeltaX + 350 + 22, DeltaY + 10), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade)))
SpriteBatch.DrawString(FontManager.MainFont, ScriptVersion2.ScriptCommander.Parse(Localization.GetString("summary_hint_ViewInfo", "View Info: [<system.button(moveforward)>] / Up")).ToString, New Vector2(DeltaX + 350 + 8, DeltaY + 10), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade)))
End With
End Sub

4
P3D/Screens/SaveScreen.vb
View File

@ -109,7 +109,7 @@
If ControllerHandler.IsConnected() Then
text = Localization.GetString("save_screen_press", "Press") & "<button>" & Localization.GetString("save_screen_to_continue", "to continue.")
textSizeUntilButton = FontManager.InGameFont.MeasureString(text.GetSplit(0, "<button>"))
text = text.Replace("<button>", " ")
text = text.Replace("<button>", " ")
Else
text = Localization.GetString("save_screen_press", "Press") & " [" & KeyBindings.BackKey1.ToString() & "] " & Localization.GetString("save_screen_to_continue", "to continue.")
End If
@ -120,7 +120,7 @@
Delta_Y + 350 - textSize.Y / 2.0F), Color.DarkBlue)
If ControllerHandler.IsConnected() Then
SpriteBatch.Draw(TextureManager.GetTexture("GUI\GamePad\xboxControllerButtonB"), New Rectangle(CInt(Delta_X + 610 - textSize.X / 2 + textSizeUntilButton.X + FontManager.InGameFont.MeasureString(" ").X + 2), CInt(Delta_Y + 350 - textSize.Y / 2), 20, 20), Color.White)
SpriteBatch.Draw(TextureManager.GetTexture("GUI\GamePad\xboxControllerButtonB"), New Rectangle(CInt(Delta_X + 610 - textSize.X / 2 + textSizeUntilButton.X + FontManager.InGameFont.MeasureString(" ").X + 2), CInt(Delta_Y + 350 - textSize.Y / 2), 20, 20), Color.White)
End If
Else

BIN
lib/P3D.ContentPipeline/Content/Fonts/BMP/InGame.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
lib/P3D.ContentPipeline/Content/Fonts/BMP/chatFont.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
lib/P3D.ContentPipeline/Content/Fonts/BMP/mainFont.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB