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

Fix daycare thing

Browse Source
This commit is contained in:
JappaWakka 2023-08-01 13:19:34 +02:00
parent 3273b44315
commit df17680e97
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
P3D/Screens/Pokemon/Daycare.vb
View File

@ -503,27 +503,31 @@
Return CanBreed(l, multiplier) Return CanBreed(l, multiplier)
End Function End Function
Private Shared Function GetEggPokemonID(ByVal Pokemon As Dictionary(Of Integer, Pokemon)) As Integer Private Shared Function GetEggPokemonID(ByVal Pokemon As Dictionary(Of Integer, Pokemon)) As String
If Pokemon.Count = 2 Then If Pokemon.Count = 2 Then
Dim p1 As Pokemon = Pokemon.Values(0) Dim p1 As Pokemon = Pokemon.Values(0)
Dim p2 As Pokemon = Pokemon.Values(1) Dim p2 As Pokemon = Pokemon.Values(1)
If p1.EggGroup1 = P3D.Pokemon.EggGroups.Ditto Or p1.EggGroup2 = P3D.Pokemon.EggGroups.Ditto Then If p1.EggGroup1 = P3D.Pokemon.EggGroups.Ditto Or p1.EggGroup2 = P3D.Pokemon.EggGroups.Ditto Then
Return p2.Number Dim dexID As String = PokemonForms.GetPokemonDataFileName(p2.Number, p2.AdditionalData)
Return dexID
End If End If
If p2.EggGroup1 = P3D.Pokemon.EggGroups.Ditto Or p2.EggGroup2 = P3D.Pokemon.EggGroups.Ditto Then If p2.EggGroup1 = P3D.Pokemon.EggGroups.Ditto Or p2.EggGroup2 = P3D.Pokemon.EggGroups.Ditto Then
Return p1.Number Dim dexID As String = PokemonForms.GetPokemonDataFileName(p1.Number, p1.AdditionalData)
Return dexID
End If End If
If p1.Gender = P3D.Pokemon.Genders.Female Then If p1.Gender = P3D.Pokemon.Genders.Female Then
Return p1.Number Dim dexID As String = PokemonForms.GetPokemonDataFileName(p1.Number, p1.AdditionalData)
Return dexID
End If End If
If p2.Gender = P3D.Pokemon.Genders.Female Then If p2.Gender = P3D.Pokemon.Genders.Female Then
Return p2.Number Dim dexID As String = PokemonForms.GetPokemonDataFileName(p2.Number, p2.AdditionalData)
Return dexID
End If End If
End If End If
Return 0 Return 0.ToString
End Function End Function
Private Shared Function GetEggPokeballID(ByVal Pokemon As List(Of Pokemon)) As String Private Shared Function GetEggPokeballID(ByVal Pokemon As List(Of Pokemon)) As String
@ -635,9 +639,14 @@
If breedChance > 0 Then If breedChance > 0 Then
Logger.Debug("Breed chance: " & breedChance) Logger.Debug("Breed chance: " & breedChance)
If Core.Random.Next(0, 100) < breedChance Then If Core.Random.Next(0, 100) < breedChance Then
Dim parentID As Integer = GetEggPokemonID(Pokemon) Dim DexID As String = GetEggPokemonID(Pokemon)
Dim parentID As Integer = CInt(DexID.GetSplit(0, "_"))
Dim parentAD As String = ""
If DexID.Contains("_") = True Then
parentAD = DexID.GetSplit(1, "_")
End If
Dim newEggID As Integer = P3D.Pokemon.GetPokemonByID(parentID).EggPokemon Dim newEggID As String = P3D.Pokemon.GetPokemonByID(parentID, parentAD).EggPokemon
Dim s As String = DaycareID.ToString() & "|Egg|" & newEggID.ToString() Dim s As String = DaycareID.ToString() & "|Egg|" & newEggID.ToString()
Logger.Debug("Egg created!" & Environment.NewLine & "EggID: " & newEggID) Logger.Debug("Egg created!" & Environment.NewLine & "EggID: " & newEggID)