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

Fixed King's Rock battle effect

This commit is contained in:
CaptainSegis 2016-11-23 11:27:35 -05:00
parent 029e7608eb
commit e7e25a156a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb
View File

@ -1033,6 +1033,8 @@
End Function End Function
Public Sub DoAttackRound(ByVal BattleScreen As BattleScreen, ByVal own As Boolean, ByVal moveUsed As Attack) Public Sub DoAttackRound(ByVal BattleScreen As BattleScreen, ByVal own As Boolean, ByVal moveUsed As Attack)
'p: the attacking pokemon
'op: the target pokemon
Dim p As Pokemon = BattleScreen.OwnPokemon Dim p As Pokemon = BattleScreen.OwnPokemon
Dim op As Pokemon = BattleScreen.OppPokemon Dim op As Pokemon = BattleScreen.OppPokemon
@ -1226,10 +1228,10 @@
End If End If
If op.HP > 0 And op.Status <> Pokemon.StatusProblems.Fainted Then If op.HP > 0 And op.Status <> Pokemon.StatusProblems.Fainted Then
If Not op.Item Is Nothing Then If Not p.Item Is Nothing Then
If op.Item.Name.ToLower() = "king's rock" Or op.Item.Name.ToLower() = "razor fang" And BattleScreen.FieldEffects.CanUseItem(Not own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Not own, BattleScreen) = True Then If p.Item.Name.ToLower() = "king's rock" Or p.Item.Name.ToLower() = "razor fang" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
If Core.Random.Next(0, 100) < 10 Then If Core.Random.Next(0, 100) < 10 Then
p.AddVolatileStatus(Pokemon.VolatileStatus.Flinch) op.AddVolatileStatus(Pokemon.VolatileStatus.Flinch)
End If End If
End If End If
End If End If