tyler.durden/P3D-Legacy
1
0
Fork 0
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git synced 2025-07-28 00:04:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Support for forms in cries and interactions

Browse Source
This commit is contained in:
JappaWakka 2024-08-25 18:32:06 +02:00
parent ebbe37413e
commit e81237bd64
9 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
P3D/Entites/Enviroment/AnimatedBlock.vb
View File

@ -230,7 +230,7 @@
.UpdateEntity() .UpdateEntity()
SoundManager.PlayPokemonCry(pokemonNumber) SoundManager.PlayPokemonCry(pokemonNumber, PokemonForms.GetCrySuffix(Core.Player.Pokemons(Core.Player.SurfPokemon)))
If Screen.Level.IsRadioOn = False OrElse GameJolt.PokegearScreen.StationCanPlay(Screen.Level.SelectedRadioStation) = False Then If Screen.Level.IsRadioOn = False OrElse GameJolt.PokegearScreen.StationCanPlay(Screen.Level.SelectedRadioStation) = False Then
MusicManager.Play("surf", True) MusicManager.Play("surf", True)

2
P3D/Entites/Enviroment/StrengthRock.vb
View File

@ -71,7 +71,7 @@
Screen.Level.UsedStrength = True Screen.Level.UsedStrength = True
SoundManager.PlayPokemonCry(pNumber) SoundManager.PlayPokemonCry(pNumber, PokemonForms.GetCrySuffix(useP))
Screen.TextBox.Show(pName & " " & Localization.GetString("fieldmove_strength_used", "used~Strength!"), {}, True, False) Screen.TextBox.Show(pName & " " & Localization.GetString("fieldmove_strength_used", "used~Strength!"), {}, True, False)
PlayerStatistics.Track("Strength used", 1) PlayerStatistics.Track("Strength used", 1)
End If End If

2
P3D/Entites/Enviroment/Water.vb
View File

@ -276,7 +276,7 @@
.UpdateEntity() .UpdateEntity()
SoundManager.PlayPokemonCry(pokemonNumber) SoundManager.PlayPokemonCry(pokemonNumber, PokemonForms.GetCrySuffix(Core.Player.Pokemons(Core.Player.SurfPokemon)))
If Screen.Level.IsRadioOn = False OrElse GameJolt.PokegearScreen.StationCanPlay(Screen.Level.SelectedRadioStation) = False Then If Screen.Level.IsRadioOn = False OrElse GameJolt.PokegearScreen.StationCanPlay(Screen.Level.SelectedRadioStation) = False Then
MusicManager.Play("surf", True) MusicManager.Play("surf", True)

4
P3D/Network/GameJolt/GTS/WonderTradeScreen.vb
View File

@ -366,7 +366,7 @@
If ownPokemonPosition <= CInt(Core.windowSize.Height / 2 - MathHelper.Min(CInt(SelectedPokemon.GetTexture(True).Height * 3 / 2), 144)) Then If ownPokemonPosition <= CInt(Core.windowSize.Height / 2 - MathHelper.Min(CInt(SelectedPokemon.GetTexture(True).Height * 3 / 2), 144)) Then
ownPokemonPosition = CInt(Core.windowSize.Height / 2 - MathHelper.Min(CInt(SelectedPokemon.GetTexture(True).Height * 3 / 2), 144)) ownPokemonPosition = CInt(Core.windowSize.Height / 2 - MathHelper.Min(CInt(SelectedPokemon.GetTexture(True).Height * 3 / 2), 144))
tState = 1 tState = 1
SoundManager.PlayPokemonCry(SelectedPokemon.Number) SoundManager.PlayPokemonCry(SelectedPokemon.Number, PokemonForms.GetCrySuffix(SelectedPokemon))
End If End If
End If End If
Case 1 Case 1
@ -392,7 +392,7 @@
If oppPokemonPosition >= CInt(Core.windowSize.Height / 2 - MathHelper.Min(CInt(WonderTradePokemon.GetTexture(True).Height * 3 / 2), 144)) Then If oppPokemonPosition >= CInt(Core.windowSize.Height / 2 - MathHelper.Min(CInt(WonderTradePokemon.GetTexture(True).Height * 3 / 2), 144)) Then
oppPokemonPosition = CInt(Core.windowSize.Height / 2 - MathHelper.Min(CInt(WonderTradePokemon.GetTexture(True).Height * 3 / 2), 144)) oppPokemonPosition = CInt(Core.windowSize.Height / 2 - MathHelper.Min(CInt(WonderTradePokemon.GetTexture(True).Height * 3 / 2), 144))
tState = 4 tState = 4
SoundManager.PlayPokemonCry(WonderTradePokemon.Number) SoundManager.PlayPokemonCry(WonderTradePokemon.Number, PokemonForms.GetCrySuffix(WonderTradePokemon))
End If End If
End If End If
Case 4 Case 4

4
P3D/Network/Servers/DirectTradeScreen.vb
View File

@ -469,7 +469,7 @@
If ownPokemonPosition <= CInt(Core.windowSize.Height / 2 - 128) Then If ownPokemonPosition <= CInt(Core.windowSize.Height / 2 - 128) Then
ownPokemonPosition = CInt(Core.windowSize.Height / 2 - 128) ownPokemonPosition = CInt(Core.windowSize.Height / 2 - 128)
tState = 1 tState = 1
SoundManager.PlayPokemonCry(OfferPokemon.Number) SoundManager.PlayPokemonCry(OfferPokemon.Number, PokemonForms.GetCrySuffix(OfferPokemon))
End If End If
End If End If
Case 1 Case 1
@ -495,7 +495,7 @@
If oppPokemonPosition >= CInt(Core.windowSize.Height / 2 - 128) Then If oppPokemonPosition >= CInt(Core.windowSize.Height / 2 - 128) Then
oppPokemonPosition = CInt(Core.windowSize.Height / 2 - 128) oppPokemonPosition = CInt(Core.windowSize.Height / 2 - 128)
tState = 4 tState = 4
SoundManager.PlayPokemonCry(TradePokemon.Number) SoundManager.PlayPokemonCry(TradePokemon.Number, PokemonForms.GetCrySuffix(TradePokemon))
End If End If
End If End If
Case 4 Case 4

28
P3D/Pokemon/Monster/PokemonInteractions.vb
View File

@ -49,7 +49,7 @@
Dim newPosition As New Vector2(0, 1) Dim newPosition As New Vector2(0, 1)
Dim s As String = "version=2" & Environment.NewLine & Dim s As String = "version=2" & Environment.NewLine &
"@pokemon.cry(" & p.Number & ")" & Environment.NewLine "@pokemon.cry(" & PokemonForms.GetPokemonDataFileName(p.Number, p.AdditionalData, True) & ")" & Environment.NewLine
If CType(Screen.Camera, OverworldCamera).ThirdPerson = False Then If CType(Screen.Camera, OverworldCamera).ThirdPerson = False Then
If reaction.HasNotification = True Then If reaction.HasNotification = True Then
@ -100,7 +100,7 @@
Dim item As Item = Item.GetItemByID(PickupItemID) Dim item As Item = Item.GetItemByID(PickupItemID)
Dim s As String = "version=2" & Environment.NewLine & Dim s As String = "version=2" & Environment.NewLine &
"@pokemon.cry(" & p.Number & ")" & Environment.NewLine "@pokemon.cry(" & PokemonForms.GetPokemonDataFileName(p.Number, p.AdditionalData) & ")" & Environment.NewLine
If CType(Screen.Camera, OverworldCamera).ThirdPerson = False Then If CType(Screen.Camera, OverworldCamera).ThirdPerson = False Then
s &= "@camera.activatethirdperson" & Environment.NewLine & s &= "@camera.activatethirdperson" & Environment.NewLine &
@ -716,8 +716,8 @@
Public Notification As MessageBulb.NotificationTypes = MessageBulb.NotificationTypes.AFK Public Notification As MessageBulb.NotificationTypes = MessageBulb.NotificationTypes.AFK
Public HasNotification As Boolean = True Public HasNotification As Boolean = True
Public MapFiles As New List(Of String) Public MapFiles As New List(Of String)
Public PokemonIDs As New List(Of Integer) Public PokemonIDs As New List(Of String)
Public ExcludeIDs As New List(Of Integer) Public ExcludeIDs As New List(Of String)
Public Daytime As Integer = -1 Public Daytime As Integer = -1
Public Weather As Integer = -1 Public Weather As Integer = -1
Public Season As Integer = -1 Public Season As Integer = -1
@ -733,15 +733,13 @@
If dataParts(1) <> "-1" Then If dataParts(1) <> "-1" Then
For Each pokePart As String In dataParts(1).Split(CChar(",")) For Each pokePart As String In dataParts(1).Split(CChar(","))
Dim lReference As List(Of Integer) = PokemonIDs Dim lReference As List(Of String) = PokemonIDs
If pokePart.StartsWith("!") = True Then If pokePart.StartsWith("!") = True Then
pokePart = pokePart.Remove(0, 1) pokePart = pokePart.Remove(0, 1)
lReference = ExcludeIDs lReference = ExcludeIDs
End If End If
If StringHelper.IsNumeric(pokePart) = True Then If lReference.Contains(pokePart) = False Then
If lReference.Contains(CInt(pokePart)) = False Then lReference.Add(pokePart)
lReference.Add(CInt(pokePart))
End If
End If End If
Next Next
End If End If
@ -826,13 +824,21 @@
End If End If
If PokemonIDs.Count > 0 Then If PokemonIDs.Count > 0 Then
If PokemonIDs.Contains(p.Number) = False Then Dim dexID As String = p.Number.ToString
If p.AdditionalData <> "" Then
dexID = PokemonForms.GetPokemonDataFileName(p.Number, p.AdditionalData, True)
End If
If PokemonIDs.Contains(dexID) = False Then
Return False Return False
End If End If
End If End If
If ExcludeIDs.Count > 0 Then If ExcludeIDs.Count > 0 Then
If ExcludeIDs.Contains(p.Number) = True Then Dim dexID As String = p.Number.ToString
If p.AdditionalData <> "" Then
dexID = PokemonForms.GetPokemonDataFileName(p.Number, p.AdditionalData, True)
End If
If ExcludeIDs.Contains(dexID) = True Then
Return False Return False
End If End If
End If End If

2
P3D/Screens/Pokemon/EvolutionScreen.vb
View File

@ -193,7 +193,7 @@
TextBox.Update() TextBox.Update()
If evolutionStarted = False Then If evolutionStarted = False Then
SoundManager.PlayPokemonCry(currentPokemon.Number) SoundManager.PlayPokemonCry(currentPokemon.Number, PokemonForms.GetCrySuffix(currentPokemon))
TextBox.Show("What?*" & currentPokemon.GetDisplayName() & " is evolving!", {}, False, False) TextBox.Show("What?*" & currentPokemon.GetDisplayName() & " is evolving!", {}, False, False)
evolutionStarted = True evolutionStarted = True
For i = 0 To Core.Random.Next(200, 250) For i = 0 To Core.Random.Next(200, 250)

2
P3D/Screens/Pokemon/PartyScreen.vb
View File

@ -1077,7 +1077,7 @@ Public Class PartyScreen
Screen.Level.OwnPlayer.SetTexture(skin, False) Screen.Level.OwnPlayer.SetTexture(skin, False)
SoundManager.PlayPokemonCry(PokemonList(_index).Number) SoundManager.PlayPokemonCry(PokemonList(_index).Number, PokemonForms.GetCrySuffix(PokemonList(_index)))
TextBox.Show(PokemonList(_index).GetDisplayName() & " used~Ride!", {}, True, False) TextBox.Show(PokemonList(_index).GetDisplayName() & " used~Ride!", {}, True, False)
PlayerStatistics.Track("Ride used", 1) PlayerStatistics.Track("Ride used", 1)

2
P3D/World/ActionScript/V2/ScriptCommands/DoPokemon.vb
View File

@ -1138,7 +1138,7 @@
Screen.Level.OwnPlayer.SetTexture(skin, False) Screen.Level.OwnPlayer.SetTexture(skin, False)
SoundManager.PlayPokemonCry(Core.Player.Pokemons(Index).Number) SoundManager.PlayPokemonCry(Core.Player.Pokemons(Index).Number, PokemonForms.GetCrySuffix(Core.Player.Pokemons(Index)))
Screen.TextBox.Show(Core.Player.Pokemons(Index).GetDisplayName() & " " & Localization.GetString("fieldmove_ride_used", "used~Ride!"), {}, True, False) Screen.TextBox.Show(Core.Player.Pokemons(Index).GetDisplayName() & " " & Localization.GetString("fieldmove_ride_used", "used~Ride!"), {}, True, False)
PlayerStatistics.Track("Ride used", 1) PlayerStatistics.Track("Ride used", 1)