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

Menu Sprite Reorganization

This commit is contained in:
TheOmegaGhost 2020-06-19 23:47:03 -03:00
parent a0e523faaf
commit cc2690dd9d
23 changed files with 989 additions and 364 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
P3D/Content/GUI/PokemonMenu/Alcremie.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 63 KiB

BIN
P3D/Content/GUI/PokemonMenu/Arceus.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 48 KiB

BIN
P3D/Content/GUI/PokemonMenu/Gen1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 179 KiB

BIN
P3D/Content/GUI/PokemonMenu/Gen2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 153 KiB

BIN
P3D/Content/GUI/PokemonMenu/Gen3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 197 KiB

BIN
P3D/Content/GUI/PokemonMenu/Gen4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 171 KiB

BIN
P3D/Content/GUI/PokemonMenu/Gen5.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 241 KiB

BIN
P3D/Content/GUI/PokemonMenu/Gen6.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 123 KiB

BIN
P3D/Content/GUI/PokemonMenu/Gen7.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 88 KiB

BIN
P3D/Content/GUI/PokemonMenu/Gen8.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 101 KiB

BIN
P3D/Content/GUI/PokemonMenu/Gender.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 47 KiB

BIN
P3D/Content/GUI/PokemonMenu/Megas.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 94 KiB

BIN
P3D/Content/GUI/PokemonMenu/OtherForms.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 276 KiB

BIN
P3D/Content/GUI/PokemonMenu/Regional.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 42 KiB

BIN
P3D/Content/GUI/PokemonMenu/Silvally.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 38 KiB

BIN
P3D/Content/GUI/PokemonMenu/Spinda.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 31 KiB

BIN
P3D/Content/GUI/PokemonMenu/Unown.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 38 KiB

BIN
P3D/Content/GUI/PokemonMenu/Vivillon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

60
P3D/P3D.vbproj
View File

@ -10984,6 +10984,60 @@
<Content Include="Content\GUI\MainMenu\lugiaParticle.png"> <Content Include="Content\GUI\MainMenu\lugiaParticle.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\GUI\PokemonMenu\Alcremie.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\GUI\PokemonMenu\Arceus.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\GUI\PokemonMenu\Gen1.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\GUI\PokemonMenu\Gen2.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\GUI\PokemonMenu\Gen3.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\GUI\PokemonMenu\Gen4.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\GUI\PokemonMenu\Gen5.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\GUI\PokemonMenu\Gen6.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\GUI\PokemonMenu\Gen7.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\GUI\PokemonMenu\Gen8.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\GUI\PokemonMenu\Gender.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\GUI\PokemonMenu\Megas.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\GUI\PokemonMenu\OtherForms.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\GUI\PokemonMenu\Regional.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\GUI\PokemonMenu\Silvally.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\GUI\PokemonMenu\Spinda.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\GUI\PokemonMenu\Unown.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\GUI\PokemonMenu\Vivillon.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Items\Fossils.png"> <Content Include="Content\Items\Fossils.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
@ -14474,12 +14528,6 @@
<Content Include="Content\GUI\Overworld\TextBox.png"> <Content Include="Content\GUI\Overworld\TextBox.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\GUI\PokemonMenu.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\GUI\PokemonMenuShiny.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\GUI\Trophies.png"> <Content Include="Content\GUI\Trophies.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>

11
P3D/Pokemon/Monster/Pokemon.vb
View File

@ -2420,18 +2420,19 @@ Public Class Pokemon
Case 4 Case 4
Dim v As Vector2 = PokemonForms.GetMenuImagePosition(Me) Dim v As Vector2 = PokemonForms.GetMenuImagePosition(Me)
Dim s As Size = PokemonForms.GetMenuImageSize(Me) Dim s As Size = PokemonForms.GetMenuImageSize(Me)
Dim sheet As String = PokemonForms.GetSheetName(Me)
Dim shiny As String = "" Dim shinypos As Integer = 0
If Me.IsShiny = True Then If Me.IsShiny = True Then
shiny = "Shiny" shinypos = 512
End If End If
Textures(index) = P3D.TextureManager.GetTexture("GUI\PokemonMenu" & shiny, New Rectangle(CInt(v.X) * 32, CInt(v.Y) * 32, s.Width, s.Height), "") Textures(index) = P3D.TextureManager.GetTexture("GUI\PokemonMenu\" & sheet, New Rectangle(CInt(v.X) * 32 + shinypos, CInt(v.Y) * 32, s.Width, s.Height), "")
Case 5 Case 5
If Me.Number = 490 Then If Me.Number = 490 Then
Textures(index) = P3D.TextureManager.GetTexture("GUI\PokemonMenu", New Rectangle(928, 992, 32, 32), "") Textures(index) = P3D.TextureManager.GetTexture("GUI\PokemonMenu\OtherForms", New Rectangle(64, 0, 32, 32), "")
Else Else
Textures(index) = EggCreator.CreateEggSprite(Me, P3D.TextureManager.GetTexture("GUI\PokemonMenu", New Rectangle(992, 992, 32, 32), ""), P3D.TextureManager.GetTexture("Pokemon\Egg\Templates\Menu")) Textures(index) = EggCreator.CreateEggSprite(Me, P3D.TextureManager.GetTexture("GUI\PokemonMenu\OtherForms", New Rectangle(32, 0, 32, 32), ""), P3D.TextureManager.GetTexture("Pokemon\Egg\Templates\Menu"))
End If End If
Case 6 Case 6
If Me.Number = 490 Then If Me.Number = 490 Then

1225
P3D/Pokemon/Monster/Resource/PokemonForms.vb
View File

File diff suppressed because it is too large Load Diff

32
P3D/Screens/MapScreen.vb
View File

@ -1063,12 +1063,14 @@
Public PositionX As Integer Public PositionX As Integer
Public PositionY As Integer Public PositionY As Integer
Public Distance As Double Public Distance As Double
Public Species As Pokemon
Dim T As Texture2D = Nothing Dim T As Texture2D = Nothing
Public Sub New(ByVal ID As Integer, ByVal PositionX As Integer, ByVal PositionY As Integer, ByVal Location As String) Public Sub New(ByVal ID As Integer, ByVal PositionX As Integer, ByVal PositionY As Integer, ByVal Location As String)
Me.ID = ID Me.ID = ID
Me.Name = Pokemon.GetPokemonByID(ID).GetName Me.Name = Pokemon.GetPokemonByID(ID).GetName
Me.Species = Pokemon.GetPokemonByID(ID)
Me.PositionX = PositionX Me.PositionX = PositionX
Me.PositionY = PositionY Me.PositionY = PositionY
Me.Location = Location Me.Location = Location
@ -1089,19 +1091,27 @@
Return New Rectangle(CInt(Me.getPosition().X + offset.X), CInt(Me.getPosition().Y + offset.Y), sizeX, sizeY) Return New Rectangle(CInt(Me.getPosition().X + offset.X), CInt(Me.getPosition().Y + offset.Y), sizeX, sizeY)
End Function End Function
'Public Function getTexture() As Texture2D
'Dim Texture As Texture2D = TextureManager.GetTexture("GUI\PokemonMenu")
'Dim IndexX As Integer = 0
'Dim IndexY As Integer = 0
'Dim SizeX As Integer = 32
'Dim SizeY As Integer = 32
'
'IndexY = CInt(Math.Floor(ID / 33))
'IndexX = (ID - (IndexY * 32)) - 1
'
'T = TextureManager.GetTexture(Texture, New Rectangle(IndexX * 32, IndexY * 32, SizeX, SizeY))
'
'Return T
'End Function
Public Function getTexture() As Texture2D Public Function getTexture() As Texture2D
Dim Texture As Texture2D = TextureManager.GetTexture("GUI\PokemonMenu") Dim v As Vector2 = PokemonForms.GetMenuImagePosition(Species)
Dim IndexX As Integer = 0 Dim s As Size = PokemonForms.GetMenuImageSize(Species)
Dim IndexY As Integer = 0 Dim sheet As String = PokemonForms.GetSheetName(Species)
Dim SizeX As Integer = 32
Dim SizeY As Integer = 32
IndexY = CInt(Math.Floor(ID / 33)) Return P3D.TextureManager.GetTexture("GUI\PokemonMenu\" & sheet, New Rectangle(CInt(v.X) * 32, CInt(v.Y) * 32, s.Width, s.Height), "")
IndexX = (ID - (IndexY * 32)) - 1
T = TextureManager.GetTexture(Texture, New Rectangle(IndexX * 32, IndexY * 32, SizeX, SizeY))
Return T
End Function End Function
Public Function getSkipIndex() As Integer Public Function getSkipIndex() As Integer

25
P3D/World/ActionScript/V2/ScriptConstructs/DoPokemon.vb
View File

@ -415,19 +415,32 @@
Dim index As Integer = int(argument.GetSplit(0)) Dim index As Integer = int(argument.GetSplit(0))
Return Core.Player.Pokemons(index).GetDisplayName() Return Core.Player.Pokemons(index).GetDisplayName()
Case "menusprite" Case "menusprite"
'Dim index As Integer = int(argument.GetSplit(0))
'
'Dim p As Pokemon = Core.Player.Pokemons(index)
'
'Dim pos As Vector2 = PokemonForms.GetMenuImagePosition(p)
'Dim size As Size = PokemonForms.GetMenuImageSize(p)
'
'Dim sheet As String = "GUI\PokemonMenu"
'If p.IsShiny = True Then
'sheet = "GUI\PokemonMenuShiny"
'End If
'
'Return sheet & "|" & CStr(pos.X * 32) & "|" & CStr(pos.Y * 32) & "|" & CStr(size.Width) & "|" & CStr(size.Height)
Dim index As Integer = int(argument.GetSplit(0)) Dim index As Integer = int(argument.GetSplit(0))
Dim p As Pokemon = Core.Player.Pokemons(index) Dim p As Pokemon = Core.Player.Pokemons(index)
Dim pos As Vector2 = PokemonForms.GetMenuImagePosition(p) Dim v As Vector2 = PokemonForms.GetMenuImagePosition(p)
Dim size As Size = PokemonForms.GetMenuImageSize(p) Dim s As Size = PokemonForms.GetMenuImageSize(p)
Dim sheet As String = PokemonForms.GetSheetName(p)
Dim sheet As String = "GUI\PokemonMenu" Dim shinypos As Integer = 0
If p.IsShiny = True Then If p.IsShiny = True Then
sheet = "GUI\PokemonMenuShiny" shinypos = 512
End If End If
Return sheet & "|" & CStr(pos.X * 32) & "|" & CStr(pos.Y * 32) & "|" & CStr(size.Width) & "|" & CStr(size.Height) Return "GUI\PokemonMenu\" & sheet & "|" & CStr(CInt(v.X) * 32 + shinypos) & "|" & CStr(CInt(v.Y) * 32) & "|" & CStr(s.Width) & "|" & CStr(s.Height)
Case "getsteps" Case "getsteps"
' <Pokemon.GetSteps(PokemonIndex)> ' <Pokemon.GetSteps(PokemonIndex)>