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

Disable Shift BattleStyle in PvP

Browse Source
This commit is contained in:
JappaWakka 2023-01-15 09:34:42 +01:00
parent ffdc28dd85
commit cc2d46153d
3 changed files with 5 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

@ -7875,7 +7875,7 @@
Dim oppModel As String = BattleScreen.GetModelName(False) Dim oppModel As String = BattleScreen.GetModelName(False)
'Switch BattleStyle 'Switch BattleStyle
If Core.Player.BattleStyle <> 1 And OppStep.StepType <> RoundConst.StepTypes.Switch Then If Core.Player.BattleStyle <> 1 And OppStep.StepType <> RoundConst.StepTypes.Switch And BattleScreen.IsPVPBattle = False Then
BattleScreen.BattleQuery.Add(New SwitchPokemonQueryObject(BattleScreen, BattleScreen.OppPokemon)) BattleScreen.BattleQuery.Add(New SwitchPokemonQueryObject(BattleScreen, BattleScreen.OppPokemon))
BattleScreen.Battle.ChangeCameraAngle(1, False, BattleScreen) BattleScreen.Battle.ChangeCameraAngle(1, False, BattleScreen)
End If End If

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

@ -1718,7 +1718,9 @@ nextIndex:
'prevents multi turn action to take place in an after fainting switching turn 'prevents multi turn action to take place in an after fainting switching turn
If Not (BV2Screen.OppFaint And BV2Screen.IsRemoteBattle) Then If Not (BV2Screen.OppFaint And BV2Screen.IsRemoteBattle) Then
BV2Screen.Battle.StartMultiTurnAction(BV2Screen) If BV2Screen.HasSwitchedOwn = False Then
BV2Screen.Battle.StartMultiTurnAction(BV2Screen)
End If
Else Else
BV2Screen.BattleMenu.Visible = True BV2Screen.BattleMenu.Visible = True
End If End If

2
P3D/Screens/NewOptionScreen.vb
View File

@ -11,7 +11,7 @@
Dim ShowBattleAnimations As Integer = 1 Dim ShowBattleAnimations As Integer = 1
Dim DiagonalMovement As Boolean = True Dim DiagonalMovement As Boolean = True
Dim Difficulty As Integer = 0 Dim Difficulty As Integer = 0
Dim BattleStyle As Integer = 0 Dim BattleStyle As Integer = 1
Dim LoadOffsetMaps As Integer = 1 Dim LoadOffsetMaps As Integer = 1
Dim ViewBobbing As Boolean = True Dim ViewBobbing As Boolean = True
Dim ShowModels As Integer = 1 Dim ShowModels As Integer = 1