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

Moved Defiant and Competitive effects 

To display the animations in the correct order
This commit is contained in:
Capt_Segis 2016-09-15 17:16:41 -05:00 committed by GitHub
parent 1d4b52180a
commit f097af5214
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2979,15 +2979,7 @@ endthisround:
printMessage &= " slightly fell." printMessage &= " slightly fell."
End Select End Select
If val > 0 Then
If p.Ability.Name.ToLower() = "defiant" And from <> own Then
RaiseStat(own, own, BattleScreen, "Attack", 2, p.GetDisplayName() & "'s Defiant raised its attack!", "defiant")
End If
If p.Ability.Name.ToLower() = "competitive" And from <> own Then
RaiseStat(own, own, BattleScreen, "Special Attack", 2, p.GetDisplayName() & "'s Competitive raised its Special Attack!", "competitive")
End If
End If
Select Case statString Select Case statString
Case "attack" Case "attack"
@ -3094,6 +3086,16 @@ endthisround:
BattleScreen.BattleQuery.Add(New TextQueryObject(printMessage)) BattleScreen.BattleQuery.Add(New TextQueryObject(printMessage))
End Select End Select
If val > 0 Then
If p.Ability.Name.ToLower() = "defiant" And from <> own Then
RaiseStat(own, own, BattleScreen, "Attack", 2, p.GetDisplayName() & "'s Defiant raised its attack!", "defiant")
End If
If p.Ability.Name.ToLower() = "competitive" And from <> own Then
RaiseStat(own, own, BattleScreen, "Special Attack", 2, p.GetDisplayName() & "'s Competitive raised its Special Attack!", "competitive")
End If
End If
Return True Return True
End Select End Select