Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy

P3D/Content/Data/maps/kolben/assoffices.dat

@@ -71,8 +71,8 @@ Poster:
 NPCs:
 {"NPC"{NPC[{"Position"{sngArr[16,0,3]}}{"TextureID"{str[Fanta]}}{"ID"{int[2]}}{"Name"{str[Fanta]}}{"Action"{int[1]}}{"AdditionalValue"{str[kolben\fanta]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
 {"NPC"{NPC[{"Position"{sngArr[2,0,3]}}{"TextureID"{str[TornadoBot]}}{"ID"{int[6]}}{"Name"{str[Tornado]}}{"Action"{int[1]}}{"AdditionalValue"{str[kolben\tornado]}}{"Rotation"{int[3]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
-{"EntityField"{ENT[{"EntityID"{str[ScriptBlock]}}{"Size"{intArr[1,7]}}{"Position"{sngArr[5,0,0]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[0,48,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[kolben\botoff]}}{"Rotation"{int[0]}}]}}
+{"EntityField"{ENT[{"EntityID"{str[ScriptBlock]}}{"Size"{intArr[1,1]}}{"Position"{sngArr[6,0,3]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[0,48,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[kolben\botoff]}}{"Rotation"{int[0]}}]}}
-{"EntityField"{ENT[{"EntityID"{str[ScriptBlock]}}{"Size"{intArr[1,7]}}{"Position"{sngArr[6,0,0]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[0,48,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[kolben\boton]}}{"Rotation"{int[0]}}]}}
+{"EntityField"{ENT[{"EntityID"{str[ScriptBlock]}}{"Size"{intArr[1,1]}}{"Position"{sngArr[7,0,3]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[0,48,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[kolben\boton]}}{"Rotation"{int[0]}}]}}
 
 shelf:
 {"Entity"{ENT[{"Scale"{sngArr[1,1,0.8]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[6.9,0,0]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[64,16,16,16][64,0,16,16][96,16,16,16]]}}{"TextureIndex"{intArr[0,0,2,2,2,2,2,2,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[1]}}{"AdditionalValue"{str[shelf]}}{"Rotation"{int[3]}}]}}

P3D/Core/Core.vb

@@ -68,13 +68,14 @@
         GraphicsDevice.PresentationParameters.BackBufferFormat = SurfaceFormat.Rgba1010102
         GraphicsDevice.PresentationParameters.DepthStencilFormat = DepthFormat.Depth24Stencil8
 
-        windowSize = New Rectangle(0, 0, CInt(GameOptions.WindowSize.X), CInt(GameOptions.WindowSize.Y))
 
         GraphicsManager.PreferMultiSampling = True
         GraphicsManager.GraphicsProfile = GraphicsProfile.HiDef
 
         GraphicsManager.ApplyChanges()
 
+        windowSize = New Rectangle(0, 0, CInt(GameOptions.WindowSize.X), CInt(GameOptions.WindowSize.Y))
+
         SpriteBatch = New CoreSpriteBatch(GraphicsDevice)
         FontRenderer = New CoreSpriteBatch(GraphicsDevice)
 
@@ -146,9 +147,6 @@
     Public Sub Update(ByVal gameTime As GameTime)
         Core.GameTime = gameTime
 
-        KeyBoardHandler.Update()
-        ControllerHandler.Update()
-
         ConnectScreen.UpdateConnectSet()
 
         If Core.GameInstance.IsActive = False Then
@@ -156,6 +154,10 @@
                 Core.SetScreen(New PauseScreen(Core.CurrentScreen))
             End If
         Else
+            KeyBoardHandler.Update()
+            ControllerHandler.Update()
+            Controls.MakeMouseVisible()
+            MouseHandler.Update()
             If KeyBoardHandler.KeyPressed(KeyBindings.EscapeKey) = True Or ControllerHandler.ButtonDown(Buttons.Start) = True Then
                 CurrentScreen.EscapePressed()
             End If
@@ -174,9 +176,6 @@
         MusicManager.Update()
 
         GameMessage.Update()
-        Controls.MakeMouseVisible()
-
-        MouseHandler.Update()
 
         LoadingDots.Update()
         ForcedCrash.Update()

P3D/Core/GameController.vb

@@ -50,11 +50,14 @@ Public Class GameController
 
     Public Graphics As GraphicsDeviceManager
     Public FPSMonitor As FPSMonitor
+
+    Private window_change As Boolean = False
     Public Shared UpdateChecked As Boolean = False
 
     Private _componentManager As ComponentManager
 
     Public Sub New()
+        Me.window_change = False
         Graphics = New GraphicsDeviceManager(Me)
         Content.RootDirectory = "Content"
 
@@ -89,6 +92,10 @@ Public Class GameController
     End Sub
 
     Protected Overrides Sub Update(ByVal gameTime As GameTime)
+        If Me.window_change Then
+            SetWindowSize(New Vector2(Window.ClientBounds.Width, Window.ClientBounds.Height))
+            Me.window_change = Not Me.window_change
+        End If
         Core.Update(gameTime)
         MyBase.Update(gameTime)
 
@@ -121,8 +128,10 @@ Public Class GameController
     End Sub
 
     Protected Sub Window_ClientSizeChanged(ByVal sender As Object, ByVal e As EventArgs)
+        Me.window_change = True
         Core.windowSize = New Rectangle(0, 0, Window.ClientBounds.Width, Window.ClientBounds.Height)
 
+
         If Not Core.CurrentScreen Is Nothing Then
             Core.CurrentScreen.SizeChanged()
             Screen.TextBox.PositionY = Core.windowSize.Height - 160.0F

P3D/Overworld/OverworldCamera.vb

@@ -29,6 +29,9 @@ Public Class OverworldCamera
     Public YawLocked As Boolean = False
     Public ThirdPersonOffset As Vector3 = New Vector3(0F, 0.3F, 1.5F)
 
+    'Debug variables
+    Public oldDate As Date = Date.Now
+
 #End Region
 
 #Region "Properties"
@@ -193,6 +196,7 @@ Public Class OverworldCamera
     Private Sub ControlCamera()
         Dim mState As MouseState = Mouse.GetState()
         Dim gState As GamePadState = GamePad.GetState(PlayerIndex.One)
+        Dim text As String = ""
 
         Dim dx As Single = mState.X - oldX
         If gState.ThumbSticks.Right.X <> 0.0F And Core.GameOptions.GamePadEnabled = True Then
@@ -204,7 +208,7 @@ Public Class OverworldCamera
             dy = gState.ThumbSticks.Right.Y * 40.0F * -1.0F
         End If
 
-        If _isFixed = False Then
+        If _isFixed = False AndAlso (dx <> 0 OrElse dy <> 0) Then
             If CurrentScreen.Identification = Screen.Identifications.OverworldScreen Then
                 Dim OS As OverworldScreen = CType(CurrentScreen, OverworldScreen)
 
@@ -216,8 +220,12 @@ Public Class OverworldCamera
             End If
 
             Pitch += -RotationSpeed * dy
+            'text = " (Moving)"
         End If
-
+        'Dim interval As TimeSpan
+        'interval = Date.Now - oldDate
+        'Logger.Debug("ControlCamera: " & interval.Milliseconds.ToString & " ms" & text)
+        'oldDate = Date.Now
         ClampYaw()
         ClampPitch()
     End Sub
@@ -369,9 +377,27 @@ Public Class OverworldCamera
 
     Public Sub ResetCursor()
         If GameInstance.IsActive = True Then
+            ' Only reset the mouse position when it's "close" to the border of the client rect
+            Dim horizontalCutoff = windowSize.Width / 10.0F
+            Dim verticalCutoff = windowSize.Height / 10.0F
+            Dim mousePos = Mouse.GetState().Position.ToVector2()
+
+            If mousePos.X <= horizontalCutoff OrElse
+               mousePos.X >= windowSize.Width - horizontalCutoff OrElse
+               mousePos.Y <= verticalCutoff OrElse
+               mousePos.Y >= windowSize.Height - verticalCutoff Then
+
                 Mouse.SetPosition(CInt(windowSize.Width / 2), CInt(windowSize.Height / 2))
                 oldX = CInt(windowSize.Width / 2)
                 oldY = CInt(windowSize.Height / 2)
+
+            Else
+
+                oldX = mousePos.X
+                oldY = mousePos.Y
+
+            End If
+
         End If
     End Sub
 

P3D/Overworld/OverworldScreen.vb

@@ -388,9 +388,10 @@ Public Class OverworldScreen
 
         'Center the mouse:
         Dim c As OverworldCamera = CType(Screen.Camera, OverworldCamera)
+
         c.oldX = MouseHandler.MousePosition.X
         c.oldY = MouseHandler.MousePosition.Y
-
+        c.ResetCursor()
         Player.Temp.IsInBattle = False
 
         'Set to correct music:

P3D/P3D.vbproj

@@ -82,8 +82,8 @@
     </MonoGameContentReference>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="MonoGame.Framework, Version=3.7.0.1289, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="MonoGame.Framework, Version=3.7.1.189, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MonoGame.Framework.DX.3.7.0.1289-develop\lib\net45\MonoGame.Framework.dll</HintPath>
+      <HintPath>..\packages\MonoGame.Framework.DX.3.7.1.189\lib\net45\MonoGame.Framework.dll</HintPath>
     </Reference>
     <Reference Include="NAudio, Version=1.8.4.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\NAudio.1.8.4\lib\net35\NAudio.dll</HintPath>
@@ -13505,6 +13505,9 @@
     <Content Include="Content\Textures\Emblem\victorious.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Textures\NPC\0_bow.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Textures\NPC\92.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

P3D/Resources/Sound/MusicManager.vb

@@ -213,7 +213,10 @@ Public Class MusicManager
         If Not song Is Nothing Then
             Logger.Debug($"Play song [{song.Name}]")
 
-            MediaPlayer.Play(song.Song)
+            ' We wait here for a short amount of time before playing the song
+            ' to mitigate an issue with the mediaplayer: without a timespan arg it sometimes does not play the song
+            ' and when started from 0, it plays the last few frames of the song and then starts at the beginning
+            MediaPlayer.Play(song.Song, New TimeSpan(0, 0, 0, 0, 25)) ' 25ms
 
             If MediaPlayer.IsMuted Then
                 MediaPlayer.Pause()

P3D/Screens/Battle/BattleCatchScreen.vb

@@ -227,7 +227,8 @@
 
         p.SetCatchInfos(Me.Ball, "caught at")
 
-        MusicManager.Play("wild_defeat", True, 0.0F)
+        MusicManager.Stop()
+        MusicManager.Play("wild_defeat", False, 0.2F)
         SoundManager.PlaySound("success", True)
         TextBox.Show(s, {}, False, False)
     End Sub

P3D/Screens/BattleIntroScreen.vb

@@ -506,7 +506,7 @@
         Player.Temp.BeforeBattleLevelFile = Screen.Level.LevelFile
         Player.Temp.BeforeBattleFacing = Screen.Camera.GetPlayerFacingDirection()
         MusicManager.Play(MusicLoop, False, 0F)
-        'MediaPlayer.IsRepeating = False
+        MediaPlayer.IsRepeating = False
 
         If Not MusicManager.CurrentSong Is Nothing Then
             Me.duration = MusicManager.CurrentSong.Song.Duration

P3D/Screens/TradeScreen.vb

@@ -689,6 +689,10 @@ Public Class TradeScreen
         Next
 
         If Me.BuyItemsList.Count > 0 Then
+
+            While BuyItemsList.Count <= Scroll + Cursor
+                Cursor -= 1
+            End While
             Dim selectedItem As TradeItem = Me.BuyItemsList(Scroll + Cursor)
 
             ' Item preview:

P3D/Security/FileValidation.vb

@@ -6,8 +6,8 @@
         Shared _valid As Boolean = False
 
         Const RUNVALIDATION As Boolean = False
-        Const EXPECTEDSIZE As Integer = 977834
+        Const EXPECTEDSIZE As Integer = 45951523
-        Const METAHASH As String = "MEEzNjIzMUE5RkEwNEFCQjgwQUQwODQ1NDVDRjVCNzQ="
+        Const METAHASH As String = "OTBEOUM0RTgwQjFFNkJEQTVFNkIxQjM1OUJGM0ZDRkU="
 
         Public Shared ReadOnly Property IsValid(ByVal ForceResult As Boolean) As Boolean
             Get
@@ -28,7 +28,7 @@
             Dim MeasuredSize As Long = 0
 
             Dim files As New List(Of String)
-            Dim paths() As String = {"Content", "maps", "Scripts"}
+            Dim paths() As String = {"Content"}
             Dim includeExt() As String = {".dat", ".poke", ".lua", ".trainer"}
 
             If RUNVALIDATION = True Then
@@ -65,7 +65,10 @@
                 Core.GameInstance.Exit()
             Else
                 If System.IO.File.Exists(GameController.GamePath & "\meta") = True Then
-                    If GetMD5FromFile(GameController.GamePath & "\meta") = StringObfuscation.DeObfuscate(METAHASH) Then
+                    Dim A = GetMD5FromFile(GameController.GamePath & "\meta")
+                    Dim X = StringObfuscation.Obfuscate(A)
+                    Dim B = StringObfuscation.DeObfuscate(METAHASH)
+                    If A = B Then
                         files = System.IO.File.ReadAllText(GameController.GamePath & "\meta").Split(CChar(",")).ToList()
                         Logger.Debug("Meta loaded. Files to check: " & files.Count)
                     Else
@@ -111,7 +114,7 @@
         End Sub
 
         Private Shared Function ValidateFile(ByVal file As String, ByVal relativePath As Boolean) As String
-            If Core.Player.IsGamejoltSave = True And GameController.IS_DEBUG_ACTIVE = False Then
+            If Core.Player.IsGameJoltSave = True And GameController.IS_DEBUG_ACTIVE = False Then
                 Dim filePath As String = file.Replace("/", "\")
                 If relativePath = True Then
                     filePath = GameController.GamePath & "\" & file

P3D/World/ActionScript/V2/ScriptCommands/DoPokemon.vb

@@ -702,9 +702,9 @@
                     ' @Pokemon.AddToStorage([BoxIndex], PokemonData)
                     ' @Pokemon.AddToStorage(PokemonID, Level, [Method], [BallID], [Location], [isEgg], [trainerName])
 
-                    If argument.StartsWith("{") = True Or argument.Remove(0, 1).StartsWith(",{") = True Then
+                    If argument.StartsWith("{") = True Or argument.Remove(0, argument.IndexOf(",")).StartsWith(",{") = True Then
-                        Dim insertIndex As Integer = Core.Player.Pokemons.Count
+                        Dim insertIndex As Integer = -1
-                        If argument.Remove(0, 1).StartsWith(",{") = True Then
+                        If argument.Remove(0, argument.IndexOf(",")).StartsWith(",{") = True Then
                             insertIndex = int(argument.GetSplit(0))
                         End If
 

P3D/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MonoGame.Framework.DX" version="3.7.0.1289-develop" targetFramework="net45" />
+  <package id="MonoGame.Framework.DX" version="3.7.1.189" targetFramework="net45" />
   <package id="NAudio" version="1.8.4" targetFramework="net45" />
   <package id="SharpDX" version="4.0.1" targetFramework="net45" />
   <package id="SharpDX.Direct2D1" version="4.0.1" targetFramework="net45" />

lib/P3D.ContentPipeline/P3D.ContentPipeline.csproj

@@ -76,6 +76,7 @@
     <None Include="Content\Models\truck2\Truck.mtl" />
     <None Include="Content\Models\truck2\Truck.obj" />
     <None Include="Content\SkyDomeResource\SkyDome.x" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Content\Effects\BackdropShader.fx" />
@@ -91,5 +92,37 @@
     <Content Include="Content\Models\building\textures\P3DBuilding.png" />
     <Content Include="Content\Models\truck2\140l155.jpg" />
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="MonoGame.Framework, Version=3.7.1.189, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\MonoGame.Framework.DX.3.7.1.189\lib\net45\MonoGame.Framework.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\SharpDX.4.0.1\lib\net45\SharpDX.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX.Direct2D1, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\SharpDX.Direct2D1.4.0.1\lib\net45\SharpDX.Direct2D1.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX.Direct3D11, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\SharpDX.Direct3D11.4.0.1\lib\net45\SharpDX.Direct3D11.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX.Direct3D9, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\SharpDX.Direct3D9.4.0.1\lib\net45\SharpDX.Direct3D9.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX.DXGI, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\SharpDX.DXGI.4.0.1\lib\net45\SharpDX.DXGI.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX.Mathematics, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\SharpDX.Mathematics.4.0.1\lib\net45\SharpDX.Mathematics.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX.MediaFoundation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\SharpDX.MediaFoundation.4.0.1\lib\net45\SharpDX.MediaFoundation.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX.XAudio2, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\SharpDX.XAudio2.4.0.1\lib\net45\SharpDX.XAudio2.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX.XInput, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\SharpDX.XInput.4.0.1\lib\net45\SharpDX.XInput.dll</HintPath>
+    </Reference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

lib/P3D.ContentPipeline/packages.config

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="MonoGame.Framework.DX" version="3.7.1.189" targetFramework="net45" />
+  <package id="SharpDX" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.Direct2D1" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.Direct3D11" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.Direct3D9" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.DXGI" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.Mathematics" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.MediaFoundation" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.XAudio2" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.XInput" version="4.0.1" targetFramework="net45" />
+</packages>

lib/tools/PostBuild/PostBuild.csproj

@@ -31,6 +31,36 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="MonoGame.Framework, Version=3.7.1.189, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\MonoGame.Framework.DX.3.7.1.189\lib\net45\MonoGame.Framework.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SharpDX.4.0.1\lib\net45\SharpDX.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX.Direct2D1, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SharpDX.Direct2D1.4.0.1\lib\net45\SharpDX.Direct2D1.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX.Direct3D11, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SharpDX.Direct3D11.4.0.1\lib\net45\SharpDX.Direct3D11.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX.Direct3D9, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SharpDX.Direct3D9.4.0.1\lib\net45\SharpDX.Direct3D9.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX.DXGI, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SharpDX.DXGI.4.0.1\lib\net45\SharpDX.DXGI.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX.Mathematics, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SharpDX.Mathematics.4.0.1\lib\net45\SharpDX.Mathematics.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX.MediaFoundation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SharpDX.MediaFoundation.4.0.1\lib\net45\SharpDX.MediaFoundation.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX.XAudio2, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SharpDX.XAudio2.4.0.1\lib\net45\SharpDX.XAudio2.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX.XInput, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SharpDX.XInput.4.0.1\lib\net45\SharpDX.XInput.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -45,6 +75,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />

lib/tools/PostBuild/packages.config

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="MonoGame.Framework.DX" version="3.7.1.189" targetFramework="net45" />
+  <package id="SharpDX" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.Direct2D1" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.Direct3D11" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.Direct3D9" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.DXGI" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.Mathematics" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.MediaFoundation" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.XAudio2" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.XInput" version="4.0.1" targetFramework="net45" />
+</packages>

lib/tools/TearDown/TearDown.csproj

@@ -32,6 +32,36 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.VisualBasic" />
+    <Reference Include="MonoGame.Framework, Version=3.7.1.189, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\MonoGame.Framework.DX.3.7.1.189\lib\net45\MonoGame.Framework.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SharpDX.4.0.1\lib\net45\SharpDX.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX.Direct2D1, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SharpDX.Direct2D1.4.0.1\lib\net45\SharpDX.Direct2D1.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX.Direct3D11, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SharpDX.Direct3D11.4.0.1\lib\net45\SharpDX.Direct3D11.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX.Direct3D9, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SharpDX.Direct3D9.4.0.1\lib\net45\SharpDX.Direct3D9.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX.DXGI, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SharpDX.DXGI.4.0.1\lib\net45\SharpDX.DXGI.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX.Mathematics, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SharpDX.Mathematics.4.0.1\lib\net45\SharpDX.Mathematics.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX.MediaFoundation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SharpDX.MediaFoundation.4.0.1\lib\net45\SharpDX.MediaFoundation.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX.XAudio2, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SharpDX.XAudio2.4.0.1\lib\net45\SharpDX.XAudio2.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX.XInput, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SharpDX.XInput.4.0.1\lib\net45\SharpDX.XInput.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -46,6 +76,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />

lib/tools/TearDown/packages.config

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="MonoGame.Framework.DX" version="3.7.1.189" targetFramework="net45" />
+  <package id="SharpDX" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.Direct2D1" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.Direct3D11" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.Direct3D9" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.DXGI" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.Mathematics" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.MediaFoundation" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.XAudio2" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.XInput" version="4.0.1" targetFramework="net45" />
+</packages>

lib/tools/TearUp/TearUp.csproj

@@ -32,6 +32,36 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.VisualBasic" />
+    <Reference Include="MonoGame.Framework, Version=3.7.1.189, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\MonoGame.Framework.DX.3.7.1.189\lib\net45\MonoGame.Framework.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SharpDX.4.0.1\lib\net45\SharpDX.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX.Direct2D1, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SharpDX.Direct2D1.4.0.1\lib\net45\SharpDX.Direct2D1.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX.Direct3D11, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SharpDX.Direct3D11.4.0.1\lib\net45\SharpDX.Direct3D11.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX.Direct3D9, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SharpDX.Direct3D9.4.0.1\lib\net45\SharpDX.Direct3D9.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX.DXGI, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SharpDX.DXGI.4.0.1\lib\net45\SharpDX.DXGI.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX.Mathematics, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SharpDX.Mathematics.4.0.1\lib\net45\SharpDX.Mathematics.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX.MediaFoundation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SharpDX.MediaFoundation.4.0.1\lib\net45\SharpDX.MediaFoundation.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX.XAudio2, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SharpDX.XAudio2.4.0.1\lib\net45\SharpDX.XAudio2.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX.XInput, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SharpDX.XInput.4.0.1\lib\net45\SharpDX.XInput.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -46,6 +76,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />

lib/tools/TearUp/packages.config

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="MonoGame.Framework.DX" version="3.7.1.189" targetFramework="net45" />
+  <package id="SharpDX" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.Direct2D1" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.Direct3D11" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.Direct3D9" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.DXGI" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.Mathematics" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.MediaFoundation" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.XAudio2" version="4.0.1" targetFramework="net45" />
+  <package id="SharpDX.XInput" version="4.0.1" targetFramework="net45" />
+</packages>