fix new game end of intro and wrong default gamemode

This commit is contained in:
darkfire006 2022-06-19 16:04:35 -05:00
parent e6d106c839
commit 638de718ed
3 changed files with 8 additions and 25 deletions

View File

@ -568,7 +568,7 @@ Public Class GameMode
Dim SkinNames As List(Of String) = {"Ethan", "Lyra", "Nate", "Rosa", "Hilbert", "Hilda"}.ToList() Dim SkinNames As List(Of String) = {"Ethan", "Lyra", "Nate", "Rosa", "Hilbert", "Hilda"}.ToList()
Dim SkinGenders As List(Of String) = {"Male", "Female", "Male", "Female", "Male", "Female"}.ToList() Dim SkinGenders As List(Of String) = {"Male", "Female", "Male", "Female", "Male", "Female"}.ToList()
Dim gameMode As New GameMode("Pokemon 3D", "The normal game mode.", GameController.GAMEVERSION, "Kolben Games", "\Content\Data\maps\", "\Content\Data\Scripts\", "\Content\Data\maps\poke\", "\Content\Pokemon\Data\", "\Content\", "\Content\Localization\", New List(Of GameRule), Dim gameMode As New GameMode("Kolben", "The normal game mode.", GameController.GAMEVERSION, "Kolben Games", "\Content\Data\maps\", "\Content\Data\Scripts\", "\Content\Data\maps\poke\", "\Content\Pokemon\Data\", "\Content\", "\Content\Localization\", New List(Of GameRule),
"newgame\intro0.dat", New Vector3(1.0F, 0.1F, 3.0F), MathHelper.PiOver2, "Your Room", "", New Color(59, 123, 165), "0", "welcome", "1", SkinColors, SkinFiles, SkinNames, SkinGenders) "newgame\intro0.dat", New Vector3(1.0F, 0.1F, 3.0F), MathHelper.PiOver2, "Your Room", "", New Color(59, 123, 165), "0", "welcome", "1", SkinColors, SkinFiles, SkinNames, SkinGenders)
gameMode.StartScript = "startscript\main" gameMode.StartScript = "startscript\main"

View File

@ -154,7 +154,7 @@
System.IO.Directory.CreateDirectory(GameController.GamePath & "\Save") System.IO.Directory.CreateDirectory(GameController.GamePath & "\Save")
End If End If
System.IO.Directory.CreateDirectory(savePath & folderPath) 'System.IO.Directory.CreateDirectory(savePath & folderPath)
Core.Player.filePrefix = folderPath Core.Player.filePrefix = folderPath
Core.Player.GameStart = Date.Now Core.Player.GameStart = Date.Now
@ -179,29 +179,6 @@
End While End While
Core.Player.OT = ot Core.Player.OT = ot
System.IO.File.WriteAllText(savePath & folderPath & "\Player.dat", Core.Player.GetPlayerData(False))
System.IO.File.WriteAllText(savePath & folderPath & "\Pokedex.dat", "")
System.IO.File.WriteAllText(savePath & folderPath & "\Items.dat", "")
System.IO.File.WriteAllText(savePath & folderPath & "\Register.dat", "")
System.IO.File.WriteAllText(savePath & folderPath & "\Berries.dat", Core.Player.BerryData)
System.IO.File.WriteAllText(savePath & folderPath & "\Apricorns.dat", "")
System.IO.File.WriteAllText(savePath & folderPath & "\Daycare.dat", "")
System.IO.File.WriteAllText(savePath & folderPath & "\Party.dat", "")
System.IO.File.WriteAllText(savePath & folderPath & "\ItemData.dat", "")
System.IO.File.WriteAllText(savePath & folderPath & "\Options.dat", CreateOptionsData())
System.IO.File.WriteAllText(savePath & folderPath & "\Box.dat", "")
System.IO.File.WriteAllText(savePath & folderPath & "\NPC.dat", "")
System.IO.File.WriteAllText(savePath & folderPath & "\HallOfFame.dat", "")
System.IO.File.WriteAllText(savePath & folderPath & "\SecretBase.dat", "")
System.IO.File.WriteAllText(savePath & folderPath & "\RoamingPokemon.dat", "")
System.IO.File.WriteAllText(savePath & folderPath & "\Statistics.dat", "")
Core.Player.IsGameJoltSave = False
Core.Player.LoadGame(folderPath)
'IO.Directory.CreateDirectory(savePath & folderPath)
End Sub End Sub
Public Shared Function CreateOptionsData() As String Public Shared Function CreateOptionsData() As String
Dim s As String = "FOV|" & Core.Player.startFOV & Environment.NewLine & Dim s As String = "FOV|" & Core.Player.startFOV & Environment.NewLine &

View File

@ -1537,6 +1537,9 @@ Public Class GameModeSelectionScreen
Dim displayText = _gameModes(i).Name.CropStringToWidth(FontManager.InGameFont, WIDTH - 32) Dim displayText = _gameModes(i).Name.CropStringToWidth(FontManager.InGameFont, WIDTH - 32)
If displayText = "Kolben" Then
displayText = "Pokemon 3D"
End If
For x = 0 To CInt(WIDTH / 16) For x = 0 To CInt(WIDTH / 16)
For y = 0 To CInt(HEIGHT / 16) For y = 0 To CInt(HEIGHT / 16)
SpriteBatch.Draw(_menuTexture, New Rectangle(CInt(x * 16 + (center - halfWidth)), CInt(y * 16 + ButtonY - 8), 16, 16), ButtonColor, Color.White) SpriteBatch.Draw(_menuTexture, New Rectangle(CInt(x * 16 + (center - halfWidth)), CInt(y * 16 + ButtonY - 8), 16, 16), ButtonColor, Color.White)
@ -1555,6 +1558,9 @@ Public Class GameModeSelectionScreen
Dim GameMode As GameMode = GameModeManager.GetGameMode(_gameModes(_index).DirectoryName) Dim GameMode As GameMode = GameModeManager.GetGameMode(_gameModes(_index).DirectoryName)
Dim dispName As String = GameMode.Name Dim dispName As String = GameMode.Name
If dispName = "Kolben" Then
dispName = "Pokemon 3D"
End If
Dim dispDescription As String = GameMode.Description Dim dispDescription As String = GameMode.Description
Dim dispVersion As String = GameMode.Version Dim dispVersion As String = GameMode.Version
Dim dispAuthor As String = GameMode.Author Dim dispAuthor As String = GameMode.Author