tyler.durden
/
P3D-Legacy
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
CaptainSegis 2016-12-12 00:47:46 -05:00
parent 59170f5678 a6d2613fef
commit 2d2de12ba8
5 changed files with 74 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleWeather.vb
View File

@ -8,6 +8,7 @@
Hailstorm = 4
Foggy = 5
Snow = 6
Underwater = 7
End Enum
Public Shared Function GetWorldWeather(ByVal FieldWeather As BattleWeather.WeatherTypes) As World.Weathers
@ -26,6 +27,8 @@
Return World.Weathers.Sunny
Case WeatherTypes.Snow
Return World.Weathers.Snow
Case WeatherTypes.Underwater
Return World.Weathers.Underwater
Case Else
Return World.Weathers.Clear
End Select
@ -47,6 +50,8 @@
Return WeatherTypes.Sandstorm
Case World.Weathers.Sunny
Return WeatherTypes.Sunny
Case World.Weathers.Underwater
Return WeatherTypes.Underwater
Case Else
Return WeatherTypes.Clear
End Select

4
2.5DHero/2.5DHero/Security/FileValidation.vb
View File

@ -6,8 +6,8 @@
Shared _valid As Boolean = False
Const RUNVALIDATION As Boolean = False
Const EXPECTEDSIZE As Integer = 42289480
Const METAHASH As String = "RkRCMUM2QjQyOUQ3Qzk3MUEyNDIyRDc4REMyNDAwNTI="
Const EXPECTEDSIZE As Integer = 42288632
Const METAHASH As String = "MUU2MUNGQUUyMjMxN0M3RkY1OTBBNjBGNDk1NzcxMTI="
Public Shared ReadOnly Property IsValid(ByVal ForceResult As Boolean) As Boolean
Get

6
2.5DHero/2.5DHero/World/World.vb
View File

@ -1,3 +1,5 @@
Imports net.Pokemon3D.Game.BattleSystem
Public Class World
Private Shared _regionWeather As Weathers = Weathers.Clear
@ -767,8 +769,10 @@ endsub:
End If
Dim cameraPosition As Vector3 = Screen.Camera.Position
If Screen.Camera.Name = "Overworld" Then
If Core.CurrentScreen.Identification = Screen.Identifications.OverworldScreen Then
cameraPosition = CType(Screen.Camera, OverworldCamera).CPosition
ElseIf Core.CurrentScreen.Identification = Screen.Identifications.BattleScreen Then
cameraPosition = CType(Screen.Camera, BattleCamera).CPosition
End If
If Core.Random.Next(0, chance) = 0 Then

122
2.5DHero/2.5DHeroContent/Content.mgcb
View File

@ -1,4 +1,4 @@

#----------------------------- Global Properties ----------------------------#
/outputDir:bin
@ -17627,6 +17627,18 @@
/processorParam:TextureFormat=Color
/build:Content/Pokemon/Overworld/Shiny/323.png
#begin Content/Pokemon/Overworld/Shiny/323_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/323_mega.png
#begin Content/Pokemon/Overworld/Shiny/324.png
/importer:TextureImporter
/processor:TextureProcessor
@ -31835,6 +31847,18 @@
/processorParam:TextureFormat=Color
/build:Content/Pokemon/Sprites/Sawsbuck_wi.png
#begin Content/Pokemon/Sprites/Scatterbug.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/Sprites/Scatterbug.png
#begin Content/Pokemon/Sprites/Sceptile.png
/importer:TextureImporter
/processor:TextureProcessor
@ -32603,6 +32627,18 @@
/processorParam:TextureFormat=Color
/build:Content/Pokemon/Sprites/Spearow.png
#begin Content/Pokemon/Sprites/Spewpa.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/Sprites/Spewpa.png
#begin Content/Pokemon/Sprites/Spheal.png
/importer:TextureImporter
/processor:TextureProcessor
@ -34055,6 +34091,30 @@
/processorParam:TextureFormat=Color
/build:Content/Pokemon/Sprites/Virizion.png
#begin Content/Pokemon/Sprites/Vivillon.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/Sprites/Vivillon.png
#begin Content/Pokemon/Sprites/Vivillon_meadow.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/Sprites/Vivillon_meadow.png
#begin Content/Pokemon/Sprites/Volbeat.png
/importer:TextureImporter
/processor:TextureProcessor
@ -55491,63 +55551,3 @@
#begin Scripts/worldmap/sevii islands.dat
/copy:Scripts/worldmap/sevii islands.dat
#begin Content/Pokemon/Overworld/Shiny/323_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/323_mega.png
#begin Content/Pokemon/Sprites/Scatterbug.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/Sprites/Scatterbug.png
#begin Content/Pokemon/Sprites/Spewpa.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/Sprites/Spewpa.png
#begin Content/Pokemon/Sprites/Vivillon.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/Sprites/Vivillon.png
#begin Content/Pokemon/Sprites/Vivillon_meadow.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/Sprites/Vivillon_meadow.png

2
2.5DHero/2.5DHeroContent/meta
View File

File diff suppressed because one or more lines are too long