Merge branch 'master' into newTokenTranslations

.gitattributes

@@ -1 +0,0 @@
-*.dat text

.gitignore

@@ -301,8 +301,9 @@ Network Trash Folder
 Temporary Items
 .apdisk
 
-# ignore /lib/save
+# ignore /lib
 lib/save/
+lib/build/
 
 # ignore binaries in p3d project
 p3d/**/*.exe
@@ -315,6 +316,3 @@ p3d/GameModes/
 p3d/save/
 p3d/screenshots/
 p3d/log.dat
-
-# include lib/build
-!lib/build

P3D/Core/GameController.vb

@@ -1,6 +1,13 @@
 Imports System.Windows.Forms
 Imports GameDevCommon
 
+Public Class Classified
+    Public Shared Remote_Texture_URL As String = "" ' CLASSIFIED
+    Public Const GameJolt_Game_ID As String = "" ' CLASSIFIED
+    Public Const GameJolt_Game_Key As String = "" ' CLASSIFIED
+    Public Shared Encryption_Password As String = "" ' CLASSIFIED
+End Class
+
 ''' <summary>
 ''' Controls the game's main workflow.
 ''' </summary>
@@ -12,12 +19,12 @@ Public Class GameController
     ''' <summary>
     ''' The current version of the game.
     ''' </summary>
-    Public Const GAMEVERSION As String = "0.58"
+    Public Const GAMEVERSION As String = "0.58.1"
 
     ''' <summary>
     ''' The number of released iterations of the game.
     ''' </summary>
-    Public Const RELEASEVERSION As String = "100"
+    Public Const RELEASEVERSION As String = "101"
 
     ''' <summary>
     ''' The development stage the game is in.

P3D/My Project/AssemblyInfo.vb

@@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices
 '      Build Number
 '      Revision
 '
-<Assembly: AssemblyVersion("0.58")>
+<Assembly: AssemblyVersion("0.58.1")>

P3D/Network/GameJolt/APICall.vb

@@ -70,8 +70,8 @@ Namespace GameJolt
 
         Dim loggedIn As Boolean
 
-        Const CONST_GAMEID As String = "" ' CLASSIFIED
-        Const CONST_GAMEKEY As String = "" ' CLASSIFIED
+        Const CONST_GAMEID As String = Classified.GameJolt_Game_ID
+        Const CONST_GAMEKEY As String = Classified.GameJolt_Game_Key
         Const HOST As String = "http://api.gamejolt.com/api/game/"
 
         Dim Exception As System.Exception = Nothing

P3D/Network/GameJolt/LogInScreen.vb

@@ -83,8 +83,8 @@ Namespace GameJolt
 
         Private Sub SaveSettings()
             If API.LoggedIn = True Then
-                Dim cUsername As String = Encryption.EncryptString(UserName.Text, "") 'CLASSIFIED
-                Dim cToken As String = Encryption.EncryptString(Token.Text, "") 'CLASSIFIED
+                Dim cUsername As String = Encryption.EncryptString(UserName.Text, Classified.Encryption_Password)
+                Dim cToken As String = Encryption.EncryptString(Token.Text, Classified.Encryption_Password)
 
                 System.IO.File.WriteAllText(GameController.GamePath & "\Save\gamejoltAcc.dat", cUsername & Environment.NewLine & cToken)
             End If
@@ -96,8 +96,8 @@ Namespace GameJolt
 
                 If content.Length >= 2 Then
                     Try
-                        Me.UserName.Text = Encryption.DecryptString(content(0), "") 'CLASSIFIED
-                        Me.Token.Text = Encryption.DecryptString(content(1), "") ' CLASSIFIED
+                        Me.UserName.Text = Encryption.DecryptString(content(0), Classified.Encryption_Password)
+                        Me.Token.Text = Encryption.DecryptString(content(1), Classified.Encryption_Password)
 
                         Deactivate()
                         Me.LogInButton.IsActive = True

P3D/Network/Profiles/Emblem.vb

@@ -322,7 +322,7 @@
                 Return tempT
             End If
 
-            Dim t As Texture2D = DownloadTexture2D.n_Remote_Texture2D(Core.GraphicsDevice, "" & GameJoltID & ".png", False) ' CLASSIFIED
+            Dim t As Texture2D = DownloadTexture2D.n_Remote_Texture2D(Core.GraphicsDevice, $"{Classified.Remote_Texture_URL}{GameJoltID}.png", False)
 
             If TempDownloadedSprites.ContainsKey(GameJoltID) = False Then
                 TempDownloadedSprites.Add(GameJoltID, t)

P3D/Network/Servers/ServerConnection.vb

@@ -153,7 +153,7 @@ Namespace Servers
 #Region "Ping"
 
         Dim LastPingTime As Date = Date.Now
-        Dim PingTimer As Timers.Timer
+        Dim PingTimer As New Timers.Timer
 
         ''' <summary>
         ''' Start the ping thread.

P3D/P3D.vbproj

@@ -15,7 +15,7 @@
     <MonoGamePlatform>Windows</MonoGamePlatform>
     <MonoGameContentBuilderExe>
     </MonoGameContentBuilderExe>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <TargetFrameworkProfile />
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <ApplicationIcon>Pokemon3D.ico</ApplicationIcon>
@@ -29496,9 +29496,6 @@
     <None Include="meta">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="meta">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <None Include="packages.config" />
     <None Include="Pokemon\Items\_itemList.txt" />
     <None Include="My Project\app.manifest" />

P3D/Resources/Sound/MusicManager.vb

@@ -324,7 +324,6 @@ Public Class MusicManager
 
     End Sub
 
-    Private Shared Sub Play(song As SongContainer)
     Private Shared Sub Play(song As SongContainer, Optional ByVal introSong As SongContainer = Nothing)
         If Not song Is Nothing Then
             Logger.Debug($"Play song [{song.Name}]")

P3D/Security/FileValidation.vb

@@ -6,8 +6,8 @@
         Shared _valid As Boolean = False
 
         Const RUNVALIDATION As Boolean = False
-        Const EXPECTEDSIZE As Integer = 48239192
-        Const METAHASH As String = "ODU3RDdENDYxNDUwODBCRUU3OUY0RTRDQjFDRTIwNTk="
+        Const EXPECTEDSIZE As Integer = 48238526
+        Const METAHASH As String = "NzlEQkNFOEJCQzdCMkU1MDIzMkRBNzYxODcwNEUwQUM="
 
         Public Shared ReadOnly Property IsValid(ByVal ForceResult As Boolean) As Boolean
             Get

P3D/packages.config

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="MonoGame.Framework.DX" version="3.7.1.189" targetFramework="net45" />
-  <package id="NAudio" version="1.10.0" targetFramework="net45" />
-  <package id="NAudio.Vorbis" version="1.2.0" targetFramework="net45" />
+  <package id="NAudio" version="1.10.0" targetFramework="net46" />
+  <package id="NAudio.Vorbis" version="1.2.0" targetFramework="net46" />
   <package id="NVorbis" version="0.10.1" targetFramework="net45" />
   <package id="SharpDX" version="4.2.0" targetFramework="net45" />
   <package id="SharpDX.Direct2D1" version="4.2.0" targetFramework="net45" />

README.md

@@ -1,8 +1,28 @@
+# P3D-Legacy
+
+<p align="center">
+<a href="https://github.com/P3D-Legacy/P3D-Legacy/blob/master/LICENSE"><img src="https://img.shields.io/github/license/P3D-Legacy/P3D-Legacy" alt="License"></a>
+<a href="https://github.com/P3D-Legacy/P3D-Legacy/releases"><img src="https://img.shields.io/github/downloads/P3D-Legacy/P3D-Legacy/total" alt="Total Downloads"></a>
+<a href="https://github.com/P3D-Legacy/P3D-Legacy/graphs/contributors"><img src="https://img.shields.io/github/contributors/P3D-Legacy/P3D-Legacy" alt="Contributors"></a>
+<a href="https://github.com/P3D-Legacy/P3D-Legacy/releases"><img src="https://img.shields.io/github/v/release/P3D-Legacy/P3D-Legacy" alt="Version"></a>
+<a href="https://github.com/P3D-Legacy/P3D-Legacy/releases"><img src="https://img.shields.io/github/release-date/P3D-Legacy/P3D-Legacy" alt="Release"></a>
+<a href="https://discordapp.com/invite/EUhwdrq" target="_blank"><img src="https://img.shields.io/discord/299181628188524544" alt="Discord"></a>
+</p>
+
 The game is not in active development by [nilllzz](https://github.com/nilllzz) anymore, but few people from the community are maintaining the game and porting it to MonoGame platform. 
 
 You are free to fork and redistribute the code under the [GNU GPLv3 license](http://choosealicense.com/licenses/gpl-3.0/).
 
-# Build instructions (game)
+# Downloading the game
+
+You will find the latest release **[here](https://github.com/P3D-Legacy/P3D-Legacy/releases)**.
+
+# Requirements for the game
+
+In order to run the game, you will need the following:
+* [OpenAL](https://www.openal.org/downloads/oalinst.zip)
+
+# Build instructions for the game
 
 The game is written in Visual Basic and was compiled targeting the .NET Framework 4.6
 
@@ -17,19 +37,12 @@ To run the game after a successful build, you also need an applicable graphics c
 
 The first build of the game will take a little longer due to the MonoGame Content Pipeline building all assets for the first time.
 
-# Running the game
-
-In order to run the game, you will need the following:
-* [OpenAL](https://www.openal.org/downloads/oalinst.zip)
-
 # Classified information
 
 The game was configured to connect to several servers and internet APIs using private keys.
 To keep the private keys private, they have been redacted from the source code, along with a few URLs.
 
-If you want to you can add your own private keys/URLs back into the game to enable certain online features. To find these places search for these comments in the source code:
-
-    ' CLASSIFIED
+If you want to you can add your own private keys/URLs back into the game to enable certain online features. To find these places search for these comments in the source code: `' CLASSIFIED`
 
 Every line that has the "CLASSIFIED" comment at the end of it had some kind of string removed from it.