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

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

Browse Source
This commit is contained in:
darkfire006 2019-01-31 00:49:35 -06:00
commit f274bcb5df
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
P3D/Player/Player.vb
View File

@ -1756,9 +1756,11 @@
If CanFireStepEvent() = True Then
Dim addEggSteps As Integer = stepAmount
For Each p As Pokemon In Pokemons
If p.Ability.Name.ToLower() = "magma armor" Or p.Ability.Name.ToLower() = "flame body" Then
addEggSteps *= Random.Next(1, 4)
Exit For
If p.Ability IsNot Nothing Then
If p.Ability.Name.ToLower() = "magma armor" OrElse p.Ability.Name.ToLower() = "flame body" Then
addEggSteps *= Random.Next(1, 4)
Exit For
End If
End If
Next

2
P3D/Screens/MainMenu/PauseScreen.vb
View File

@ -25,7 +25,7 @@
If Core.Player.IsGameJoltSave = True Then
Me.canCreateAutosave = False
Else
If Not Me.PreScreen Is Nothing Then
If Me.PreScreen IsNot Nothing AndAlso Camera.Name IsNot Nothing Then
If Camera.Name <> "Overworld" Then
Me.canCreateAutosave = False
Else