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

Fixed Roar

Browse Source 
- Made the Switch-in be random (and not the same pokemon)
- Fixed interaction with Substitute
- Fixed Ghost Types being immune to Roar
This commit is contained in:
Capt_Segis 2016-09-16 22:09:31 -05:00 committed by GitHub
parent d0c14a1dc1
commit 70a924ab0f
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
2.5DHero/2.5DHero/Pokemon/Attacks/Normal/Roar.vb
View File

@ -35,7 +35,7 @@
Me.DisabledWhileGravity = False Me.DisabledWhileGravity = False
Me.UseEffectiveness = False Me.UseEffectiveness = False
Me.ImmunityAffected = True Me.ImmunityAffected = False
Me.HasSecondaryEffect = False Me.HasSecondaryEffect = False
Me.RemovesFrozen = False Me.RemovesFrozen = False
@ -46,7 +46,7 @@
Me.IsProtectMove = False Me.IsProtectMove = False
Me.IsSoundMove = False Me.IsSoundMove = False
Me.IsAffectedBySubstitute = True Me.IsAffectedBySubstitute = False
Me.IsOneHitKOMove = False Me.IsOneHitKOMove = False
Me.IsWonderGuardAffected = False Me.IsWonderGuardAffected = False
Me.UseAccEvasion = False Me.UseAccEvasion = False
@ -72,13 +72,21 @@
'trainer battle 'trainer battle
If own = True Then If own = True Then
If BattleScreen.Trainer.CountUseablePokemon > 1 Then If BattleScreen.Trainer.CountUseablePokemon > 1 Then
BattleScreen.Battle.SwitchOutOpp(BattleScreen, -1, "") Dim i As Integer = Core.Random.Next(0, BattleScreen.Trainer.Pokemons.count)
While BattleScreen.Trainer.Pokemons(i).Status = Pokemon.StatusProblems.Fainted OrElse BattleScreen.OppPokemonIndex = i OrElse BattleScreen.Trainer.Pokemons(i).HP <= 0
i = Core.Random.Next(0, BattleScreen.Trainer.Pokemons.count)
End While
BattleScreen.Battle.SwitchOutOpp(BattleScreen, i, "")
Else Else
BattleScreen.BattleQuery.Add(New TextQueryObject(Me.Name & " failed!")) BattleScreen.BattleQuery.Add(New TextQueryObject(Me.Name & " failed!"))
End If End If
Else Else
If Core.Player.CountFightablePokemon > 1 Then If Core.Player.CountFightablePokemon > 1 Then
BattleScreen.Battle.SwitchOutOwn(BattleScreen, -1, -1) Dim i As Integer = Core.Random.Next(0, Core.Player.Pokemons.Count)
While Core.Player.Pokemons(i).Status = Pokemon.StatusProblems.Fainted OrElse BattleScreen.OwnPokemonIndex = i OrElse Core.Player.Pokemons(i).HP <= 0
i = Core.Random.Next(0, Core.Player.Pokemons.Count)
End While
BattleScreen.Battle.SwitchOutOwn(BattleScreen, i, -1)
Else Else
BattleScreen.BattleQuery.Add(New TextQueryObject(Me.Name & " failed!")) BattleScreen.BattleQuery.Add(New TextQueryObject(Me.Name & " failed!"))
End If End If