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

Only allow switching when round is over

Browse Source 
Also fixed minor error with items in battle
This commit is contained in:
Jasper "JappaWakka" Speelman 2022-05-14 16:07:32 +02:00
parent 2153f34aa0
commit 4d36a5851b
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -1218,9 +1218,11 @@ nextIndex:
hasLevelUp = True hasLevelUp = True
End If End If
If IsRemoteBattle = True Or IsTrainerBattle = True Then If IsRemoteBattle = True Or IsTrainerBattle = True Then
p.Item = P3D.Item.GetItemByID(p.OriginalItem.ID) If p.OriginalItem IsNot Nothing Then
p.Item.AdditionalData = p.OriginalItem.AdditionalData p.Item = P3D.Item.GetItemByID(p.OriginalItem.ID)
Screen.TextBox.Show(Core.Player.Name & " received" & p.OriginalItem.Name & "*and gave it back to~" & p.GetDisplayName) p.Item.AdditionalData = p.OriginalItem.AdditionalData
Screen.TextBox.Show(Core.Player.Name & " received" & p.OriginalItem.Name & "*and gave it back to~" & p.GetDisplayName)
End If
End If End If
p.ResetTemp() p.ResetTemp()
Next Next
@ -1266,9 +1268,11 @@ nextIndex:
Else Else
For Each p As Pokemon In Core.Player.Pokemons For Each p As Pokemon In Core.Player.Pokemons
If IsRemoteBattle = True Or IsTrainerBattle = True Then If IsRemoteBattle = True Or IsTrainerBattle = True Then
p.Item = P3D.Item.GetItemByID(p.OriginalItem.ID) If p.OriginalItem IsNot Nothing Then
p.Item.AdditionalData = p.OriginalItem.AdditionalData p.Item = P3D.Item.GetItemByID(p.OriginalItem.ID)
Screen.TextBox.Show(Core.Player.Name & " received~" & p.OriginalItem.Name & "*and gave it back to~" & p.GetDisplayName) p.Item.AdditionalData = p.OriginalItem.AdditionalData
Screen.TextBox.Show(Core.Player.Name & " received~" & p.OriginalItem.Name & "*and gave it back to~" & p.GetDisplayName)
End If
End If End If
p.ResetTemp() p.ResetTemp()
Next Next