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

Fix Mega forms not resetting after battle

This commit is contained in:
JappaWakka 2023-12-04 13:31:37 +01:00
parent f3777e3130
commit 4f1a940d9e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
P3D/Battle/BattleSystemV2/Battle.vb
View File

@ -595,7 +595,7 @@
BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("Battle\Effects\MegaEvolution", False))
End If
BattleScreen.BattleQuery.Add(New ToggleEntityQueryObject(own, ToggleEntityQueryObject.BattleEntities.OwnPokemon, PokemonForms.GetOverworldSpriteName(p), 0, 1, -1, -1))
BattleScreen.BattleQuery.Add(New TextQueryObject(_base & " has Mega Evolved into " & p.GetName(True)))
BattleScreen.BattleQuery.Add(New TextQueryObject(_base & " has Mega Evolved into " & p.GetName(True) & "!"))
TriggerAbilityEffect(BattleScreen, own)
End If
End Sub

4
P3D/Battle/BattleSystemV2/BattleScreen.vb
View File

@ -1247,12 +1247,12 @@ nextIndex:
'Level.StopOffsetMapUpdate()
Dim str As String = ""
'Call the EndBattle function of the abilities and Reverts battle only Pokemon formes.
'Call the EndBattle function of the abilities and Reverts battle-only Pokemon forms.
For Each p As Pokemon In Core.Player.Pokemons
str = p.AdditionalData.ToLower()
Select Case str
Case "mega", "mega_x", "mega_y", "primal", "blade"
p.AdditionalData = PokemonForms.GetInitialAdditionalData(p)
p.AdditionalData = ""
p.ReloadDefinitions()
p.CalculateStats()
If str <> "blade" Then