Fixed crash related to camera query objects. Fixed donators screen.

2017-02-14 18:27:14 -05:00 · 2017-02-14 18:27:14 -05:00 · efee820a21
parent 955ae826d8
commit efee820a21
5 changed files with 153 additions and 108 deletions
--- a/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleScreen.vb
+++ b/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleScreen.vb
@ -446,6 +446,7 @@

            Battle.SwitchInOwn(Me, meIndex, True, OwnPokemonIndex)
            Battle.SwitchInOpp(Me, True, OppPokemonIndex)
+            TempPVPBattleQuery.Clear()

            Me.BattleQuery.AddRange({cq1, q5, cq2})

--- a/2.5DHero/2.5DHero/Screens/GUI/DonationScreen.vb
+++ b/2.5DHero/2.5DHero/Screens/GUI/DonationScreen.vb
@ -37,7 +37,7 @@
        If Controls.Down(True, True, True, True) = True Then
            OffsetY += 1
        End If
-        OffsetY = CInt(MathHelper.Clamp(OffsetY, 0, DonatorList.Count - 13))
+        OffsetY = CInt(MathHelper.Clamp(OffsetY, 0, DonatorList.Count - 12))

        If Controls.Dismiss() = True Then
            Core.SetScreen(Me.PreScreen)
@ -50,7 +50,7 @@
        Core.SpriteBatch.Draw(mainTexture, New Rectangle(CInt(Core.windowSize.Width / 2) - 285, 0, 570, 680), Color.White)

        Dim t As String = ""
-        For i = OffsetY To 12 + OffsetY
+        For i = OffsetY To 11 + OffsetY
            If i <> OffsetY Then
                t &= vbNewLine & vbNewLine
            End If
@ -59,8 +59,8 @@
            End If
        Next

-        If DonatorList.Count > 13 Then
-            Canvas.DrawScrollBar(New Vector2(CInt(Core.windowSize.Width / 2) + 180, 100), DonatorList.Count, 13, OffsetY, New Size(4, 500), False, TextureManager.GetTexture(scrollTexture, New Rectangle(112, 12, 1, 1)), TextureManager.GetTexture(scrollTexture, New Rectangle(113, 12, 1, 1)))
+        If DonatorList.Count > 12 Then
+            Canvas.DrawScrollBar(New Vector2(CInt(Core.windowSize.Width / 2) + 180, 100), DonatorList.Count, 12, OffsetY, New Size(4, 500), False, TextureManager.GetTexture(scrollTexture, New Rectangle(112, 12, 1, 1)), TextureManager.GetTexture(scrollTexture, New Rectangle(113, 12, 1, 1)))
        End If

        Core.SpriteBatch.DrawString(FontManager.MainFont, t, New Vector2(CInt(Core.windowSize.Width / 2) - 180, 100), Color.Black)
--- a/2.5DHero/2.5DHero/Security/FileValidation.vb
+++ b/2.5DHero/2.5DHero/Security/FileValidation.vb
@ -6,8 +6,8 @@
        Shared _valid As Boolean = False

        Const RUNVALIDATION As Boolean = False
-        Const EXPECTEDSIZE As Integer = 42393043
-        Const METAHASH As String = "QjI0RjkyQTM0Q0E5N0YyN0FGMUFDM0U3OEU3OTQzNzQ="
+        Const EXPECTEDSIZE As Integer = 42417206
+        Const METAHASH As String = "MUVCMDNFOEZDMTQ2ODEyRjFDNzg5RDI4NDgxMTE0Mjg="

        Public Shared ReadOnly Property IsValid(ByVal ForceResult As Boolean) As Boolean
            Get
--- a/2.5DHero/2.5DHeroContent/Content.mgcb
+++ b/2.5DHero/2.5DHeroContent/Content.mgcb
@ -1,4 +1,4 @@
-
+
 #----------------------------- Global Properties ----------------------------#

 /outputDir:bin
@ -1319,6 +1319,9 @@
 #begin Content/Pokemon/Data/115.dat
 /copy:Content/Pokemon/Data/115.dat

+#begin Content/Pokemon/Data/115_mega.dat
+/copy:Content/Pokemon/Data/115_mega.dat
+
 #begin Content/Pokemon/Data/116.dat
 /copy:Content/Pokemon/Data/116.dat

@ -1358,6 +1361,9 @@
 #begin Content/Pokemon/Data/127.dat
 /copy:Content/Pokemon/Data/127.dat

+#begin Content/Pokemon/Data/127_mega.dat
+/copy:Content/Pokemon/Data/127_mega.dat
+
 #begin Content/Pokemon/Data/128.dat
 /copy:Content/Pokemon/Data/128.dat

@ -1370,6 +1376,9 @@
 #begin Content/Pokemon/Data/130.dat
 /copy:Content/Pokemon/Data/130.dat

+#begin Content/Pokemon/Data/130_mega.dat
+/copy:Content/Pokemon/Data/130_mega.dat
+
 #begin Content/Pokemon/Data/131.dat
 /copy:Content/Pokemon/Data/131.dat

@ -1409,6 +1418,9 @@
 #begin Content/Pokemon/Data/142.dat
 /copy:Content/Pokemon/Data/142.dat

+#begin Content/Pokemon/Data/142_mega.dat
+/copy:Content/Pokemon/Data/142_mega.dat
+
 #begin Content/Pokemon/Data/143.dat
 /copy:Content/Pokemon/Data/143.dat

@ -1436,6 +1448,12 @@
 #begin Content/Pokemon/Data/150.dat
 /copy:Content/Pokemon/Data/150.dat

+#begin Content/Pokemon/Data/150_mega_x.dat
+/copy:Content/Pokemon/Data/150_mega_x.dat
+
+#begin Content/Pokemon/Data/150_mega_y.dat
+/copy:Content/Pokemon/Data/150_mega_y.dat
+
 #begin Content/Pokemon/Data/151.dat
 /copy:Content/Pokemon/Data/151.dat

@ -1637,6 +1655,9 @@
 #begin Content/Pokemon/Data/208.dat
 /copy:Content/Pokemon/Data/208.dat

+#begin Content/Pokemon/Data/208_mega.dat
+/copy:Content/Pokemon/Data/208_mega.dat
+
 #begin Content/Pokemon/Data/209.dat
 /copy:Content/Pokemon/Data/209.dat

@ -1712,6 +1733,9 @@
 #begin Content/Pokemon/Data/229.dat
 /copy:Content/Pokemon/Data/229.dat

+#begin Content/Pokemon/Data/229_mega.dat
+/copy:Content/Pokemon/Data/229_mega.dat
+
 #begin Content/Pokemon/Data/23.dat
 /copy:Content/Pokemon/Data/23.dat

@ -1973,9 +1997,15 @@
 #begin Content/Pokemon/Data/302.dat
 /copy:Content/Pokemon/Data/302.dat

+#begin Content/Pokemon/Data/302_mega.dat
+/copy:Content/Pokemon/Data/302_mega.dat
+
 #begin Content/Pokemon/Data/303.dat
 /copy:Content/Pokemon/Data/303.dat

+#begin Content/Pokemon/Data/303_mega.dat
+/copy:Content/Pokemon/Data/303_mega.dat
+
 #begin Content/Pokemon/Data/304.dat
 /copy:Content/Pokemon/Data/304.dat

@ -2006,6 +2036,9 @@
 #begin Content/Pokemon/Data/310.dat
 /copy:Content/Pokemon/Data/310.dat

+#begin Content/Pokemon/Data/310_mega.dat
+/copy:Content/Pokemon/Data/310_mega.dat
+
 #begin Content/Pokemon/Data/311.dat
 /copy:Content/Pokemon/Data/311.dat

@ -2033,6 +2066,9 @@
 #begin Content/Pokemon/Data/319.dat
 /copy:Content/Pokemon/Data/319.dat

+#begin Content/Pokemon/Data/319_mega.dat
+/copy:Content/Pokemon/Data/319_mega.dat
+
 #begin Content/Pokemon/Data/32.dat
 /copy:Content/Pokemon/Data/32.dat

@ -2189,6 +2225,9 @@
 #begin Content/Pokemon/Data/362.dat
 /copy:Content/Pokemon/Data/362.dat

+#begin Content/Pokemon/Data/362_mega.dat
+/copy:Content/Pokemon/Data/362_mega.dat
+
 #begin Content/Pokemon/Data/363.dat
 /copy:Content/Pokemon/Data/363.dat

@ -2225,6 +2264,9 @@
 #begin Content/Pokemon/Data/373.dat
 /copy:Content/Pokemon/Data/373.dat

+#begin Content/Pokemon/Data/373_mega.dat
+/copy:Content/Pokemon/Data/373_mega.dat
+
 #begin Content/Pokemon/Data/374.dat
 /copy:Content/Pokemon/Data/374.dat

@ -2252,9 +2294,15 @@
 #begin Content/Pokemon/Data/380.dat
 /copy:Content/Pokemon/Data/380.dat

+#begin Content/Pokemon/Data/380_mega.dat
+/copy:Content/Pokemon/Data/380_mega.dat
+
 #begin Content/Pokemon/Data/381.dat
 /copy:Content/Pokemon/Data/381.dat

+#begin Content/Pokemon/Data/381_mega.dat
+/copy:Content/Pokemon/Data/381_mega.dat
+
 #begin Content/Pokemon/Data/382.dat
 /copy:Content/Pokemon/Data/382.dat

@ -2270,6 +2318,9 @@
 #begin Content/Pokemon/Data/384.dat
 /copy:Content/Pokemon/Data/384.dat

+#begin Content/Pokemon/Data/384_mega.dat
+/copy:Content/Pokemon/Data/384_mega.dat
+
 #begin Content/Pokemon/Data/385.dat
 /copy:Content/Pokemon/Data/385.dat

@ -2327,6 +2378,9 @@
 #begin Content/Pokemon/Data/399.dat
 /copy:Content/Pokemon/Data/399.dat

+#begin Content/Pokemon/Data/3_mega.dat
+/copy:Content/Pokemon/Data/3_mega.dat
+
 #begin Content/Pokemon/Data/4.dat
 /copy:Content/Pokemon/Data/4.dat

@ -2645,6 +2699,9 @@
 #begin Content/Pokemon/Data/483.dat
 /copy:Content/Pokemon/Data/483.dat

+#begin Content/Pokemon/Data/483_primal.dat
+/copy:Content/Pokemon/Data/483_primal.dat
+
 #begin Content/Pokemon/Data/484.dat
 /copy:Content/Pokemon/Data/484.dat

@ -3602,6 +3659,9 @@
 #begin Content/Pokemon/Data/99.dat
 /copy:Content/Pokemon/Data/99.dat

+#begin Content/Pokemon/Data/9_mega.dat
+/copy:Content/Pokemon/Data/9_mega.dat
+
 #begin Content/Pokemon/Data/frontier/0.dat
 /copy:Content/Pokemon/Data/frontier/0.dat

@ -4283,6 +4343,18 @@
 /processorParam:TextureFormat=Color
 /build:Content/Pokemon/Overworld/Normal/142.png

+#begin Content/Pokemon/Overworld/Normal/142_mega.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/processorParam:ColorKeyColor=255,0,255,255
+/processorParam:ColorKeyEnabled=True
+/processorParam:GenerateMipmaps=False
+/processorParam:PremultiplyAlpha=True
+/processorParam:ResizeToPowerOfTwo=False
+/processorParam:MakeSquare=False
+/processorParam:TextureFormat=Color
+/build:Content/Pokemon/Overworld/Normal/142_mega.png
+
 #begin Content/Pokemon/Overworld/Normal/143.png
 /importer:TextureImporter
 /processor:TextureProcessor
@ -4391,6 +4463,18 @@
 /processorParam:TextureFormat=Color
 /build:Content/Pokemon/Overworld/Normal/150.png

+#begin Content/Pokemon/Overworld/Normal/150_mega_x.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/processorParam:ColorKeyColor=255,0,255,255
+/processorParam:ColorKeyEnabled=True
+/processorParam:GenerateMipmaps=False
+/processorParam:PremultiplyAlpha=True
+/processorParam:ResizeToPowerOfTwo=False
+/processorParam:MakeSquare=False
+/processorParam:TextureFormat=Color
+/build:Content/Pokemon/Overworld/Normal/150_mega_x.png
+
 #begin Content/Pokemon/Overworld/Normal/151.png
 /importer:TextureImporter
 /processor:TextureProcessor
@ -14819,6 +14903,18 @@
 /processorParam:TextureFormat=Color
 /build:Content/Pokemon/Overworld/Shiny/142.png

+#begin Content/Pokemon/Overworld/Shiny/142_mega.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/processorParam:ColorKeyColor=255,0,255,255
+/processorParam:ColorKeyEnabled=True
+/processorParam:GenerateMipmaps=False
+/processorParam:PremultiplyAlpha=True
+/processorParam:ResizeToPowerOfTwo=False
+/processorParam:MakeSquare=False
+/processorParam:TextureFormat=Color
+/build:Content/Pokemon/Overworld/Shiny/142_mega.png
+
 #begin Content/Pokemon/Overworld/Shiny/143.png
 /importer:TextureImporter
 /processor:TextureProcessor
@ -14927,6 +15023,18 @@
 /processorParam:TextureFormat=Color
 /build:Content/Pokemon/Overworld/Shiny/150.png

+#begin Content/Pokemon/Overworld/Shiny/150_mega_x.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/processorParam:ColorKeyColor=255,0,255,255
+/processorParam:ColorKeyEnabled=True
+/processorParam:GenerateMipmaps=False
+/processorParam:PremultiplyAlpha=True
+/processorParam:ResizeToPowerOfTwo=False
+/processorParam:MakeSquare=False
+/processorParam:TextureFormat=Color
+/build:Content/Pokemon/Overworld/Shiny/150_mega_x.png
+
 #begin Content/Pokemon/Overworld/Shiny/151.png
 /importer:TextureImporter
 /processor:TextureProcessor
@ -16163,6 +16271,18 @@
 /processorParam:TextureFormat=Color
 /build:Content/Pokemon/Overworld/Shiny/214.png

+#begin Content/Pokemon/Overworld/Shiny/214_mega.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/processorParam:ColorKeyColor=255,0,255,255
+/processorParam:ColorKeyEnabled=True
+/processorParam:GenerateMipmaps=False
+/processorParam:PremultiplyAlpha=True
+/processorParam:ResizeToPowerOfTwo=False
+/processorParam:MakeSquare=False
+/processorParam:TextureFormat=Color
+/build:Content/Pokemon/Overworld/Shiny/214_mega.png
+
 #begin Content/Pokemon/Overworld/Shiny/215.png
 /importer:TextureImporter
 /processor:TextureProcessor
@ -17435,6 +17555,18 @@
 /processorParam:TextureFormat=Color
 /build:Content/Pokemon/Overworld/Shiny/306.png

+#begin Content/Pokemon/Overworld/Shiny/306_mega.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/processorParam:ColorKeyColor=255,0,255,255
+/processorParam:ColorKeyEnabled=True
+/processorParam:GenerateMipmaps=False
+/processorParam:PremultiplyAlpha=True
+/processorParam:ResizeToPowerOfTwo=False
+/processorParam:MakeSquare=False
+/processorParam:TextureFormat=Color
+/build:Content/Pokemon/Overworld/Shiny/306_mega.png
+
 #begin Content/Pokemon/Overworld/Shiny/307.png
 /importer:TextureImporter
 /processor:TextureProcessor
@ -18167,6 +18299,18 @@
 /processorParam:TextureFormat=Color
 /build:Content/Pokemon/Overworld/Shiny/359.png

+#begin Content/Pokemon/Overworld/Shiny/359_mega.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/processorParam:ColorKeyColor=255,0,255,255
+/processorParam:ColorKeyEnabled=True
+/processorParam:GenerateMipmaps=False
+/processorParam:PremultiplyAlpha=True
+/processorParam:ResizeToPowerOfTwo=False
+/processorParam:MakeSquare=False
+/processorParam:TextureFormat=Color
+/build:Content/Pokemon/Overworld/Shiny/359_mega.png
+
 #begin Content/Pokemon/Overworld/Shiny/36.png
 /importer:TextureImporter
 /processor:TextureProcessor
@ -55791,103 +55935,3 @@
 #begin Scripts/worldmap/sevii islands.dat
 /copy:Scripts/worldmap/sevii islands.dat

-#begin Content/Pokemon/Data/3_mega.dat
-/importer:
-/processor:
-/build:Content/Pokemon/Data/3_mega.dat
-
-#begin Content/Pokemon/Data/9_mega.dat
-/importer:
-/processor:
-/build:Content/Pokemon/Data/9_mega.dat
-
-#begin Content/Pokemon/Data/115_mega.dat
-/importer:
-/processor:
-/build:Content/Pokemon/Data/115_mega.dat
-
-#begin Content/Pokemon/Data/127_mega.dat
-/importer:
-/processor:
-/build:Content/Pokemon/Data/127_mega.dat
-
-#begin Content/Pokemon/Data/130_mega.dat
-/importer:
-/processor:
-/build:Content/Pokemon/Data/130_mega.dat
-
-#begin Content/Pokemon/Data/142_mega.dat
-/importer:
-/processor:
-/build:Content/Pokemon/Data/142_mega.dat
-
-#begin Content/Pokemon/Data/150_mega_x.dat
-/importer:
-/processor:
-/build:Content/Pokemon/Data/150_mega_x.dat
-
-#begin Content/Pokemon/Data/150_mega_y.dat
-/importer:
-/processor:
-/build:Content/Pokemon/Data/150_mega_y.dat
-
-#begin Content/Pokemon/Data/208_mega.dat
-/importer:
-/processor:
-/build:Content/Pokemon/Data/208_mega.dat
-
-#begin Content/Pokemon/Data/229_mega.dat
-/importer:
-/processor:
-/build:Content/Pokemon/Data/229_mega.dat
-
-#begin Content/Pokemon/Data/302_mega.dat
-/importer:
-/processor:
-/build:Content/Pokemon/Data/302_mega.dat
-
-#begin Content/Pokemon/Data/303_mega.dat
-/importer:
-/processor:
-/build:Content/Pokemon/Data/303_mega.dat
-
-#begin Content/Pokemon/Data/310_mega.dat
-/importer:
-/processor:
-/build:Content/Pokemon/Data/310_mega.dat
-
-#begin Content/Pokemon/Data/319_mega.dat
-/importer:
-/processor:
-/build:Content/Pokemon/Data/319_mega.dat
-
-#begin Content/Pokemon/Data/362_mega.dat
-/importer:
-/processor:
-/build:Content/Pokemon/Data/362_mega.dat
-
-#begin Content/Pokemon/Data/373_mega.dat
-/importer:
-/processor:
-/build:Content/Pokemon/Data/373_mega.dat
-
-#begin Content/Pokemon/Data/380_mega.dat
-/importer:
-/processor:
-/build:Content/Pokemon/Data/380_mega.dat
-
-#begin Content/Pokemon/Data/381_mega.dat
-/importer:
-/processor:
-/build:Content/Pokemon/Data/381_mega.dat
-
-#begin Content/Pokemon/Data/384_mega.dat
-/importer:
-/processor:
-/build:Content/Pokemon/Data/384_mega.dat
-
-#begin Content/Pokemon/Data/483_primal.dat
-/importer:
-/processor:
-/build:Content/Pokemon/Data/483_primal.dat
-
--- a/2.5DHero/2.5DHeroContent/meta
+++ b/2.5DHero/2.5DHeroContent/meta