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

Fixed BattleMapOffset not being set to 0

Browse Source
This commit is contained in:
JappaWakka 2023-02-23 12:27:48 +01:00
parent 75378268c0
commit b75de6fe5e
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7895,6 +7895,7 @@
BattleScreen.BattleQuery.Add(New TextQueryObject(BattleScreen.Trainer.Name & ": ""Go, " & BattleScreen.OppPokemon.GetDisplayName() & "!""")) BattleScreen.BattleQuery.Add(New TextQueryObject(BattleScreen.Trainer.Name & ": ""Go, " & BattleScreen.OppPokemon.GetDisplayName() & "!"""))
Dim BallThrow As AnimationQueryObject = New AnimationQueryObject(BattleScreen.OppPokemonNPC, False) Dim BallThrow As AnimationQueryObject = New AnimationQueryObject(BattleScreen.OppPokemonNPC, False)
BattleScreen.OppPokemonNPC.Position.Y = 0 + BattleScreen.BattleMapOffset.Y
If Core.Player.ShowBattleAnimations <> 0 AndAlso BattleScreen.IsPVPBattle = False Then If Core.Player.ShowBattleAnimations <> 0 AndAlso BattleScreen.IsPVPBattle = False Then
' Ball is thrown ' Ball is thrown

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

@ -813,6 +813,8 @@
levelfile = battleMapData(0) levelfile = battleMapData(0)
BattleMapOffset = New Vector3(CSng(battleMapData(1).Replace(".", GameController.DecSeparator)), CSng(battleMapData(2).Replace(".", GameController.DecSeparator)), CSng(battleMapData(3).Replace(".", GameController.DecSeparator))) BattleMapOffset = New Vector3(CSng(battleMapData(1).Replace(".", GameController.DecSeparator)), CSng(battleMapData(2).Replace(".", GameController.DecSeparator)), CSng(battleMapData(3).Replace(".", GameController.DecSeparator)))
End Select End Select
Else
BattleMapOffset = New Vector3(0)
End If End If
If File.Exists(GameController.GamePath & "\Content\Data\maps\battle\" & levelfile) = False And File.Exists(GameController.GamePath & GameModeManager.ActiveGameMode.MapPath & "battle\" & levelfile) = False Then If File.Exists(GameController.GamePath & "\Content\Data\maps\battle\" & levelfile) = False And File.Exists(GameController.GamePath & GameModeManager.ActiveGameMode.MapPath & "battle\" & levelfile) = False Then

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

@ -231,7 +231,7 @@
Dim delay As Single = 2.0F Dim delay As Single = 2.0F
Public Sub FinishOppSwitch(BattleScreen As BattleScreen) Public Sub FinishOppSwitch(BattleScreen As BattleScreen)
BattleScreen.OppPokemonNPC.Position.Y = 0 BattleScreen.OppPokemonNPC.Position.Y = 0 + BattleScreen.BattleMapOffset.Y
BattleScreen.Battle.ChangeCameraAngle(1, False, BattleScreen) BattleScreen.Battle.ChangeCameraAngle(1, False, BattleScreen)
Dim oppModel As String = BattleScreen.GetModelName(False) Dim oppModel As String = BattleScreen.GetModelName(False)
If oppModel = "" Then If oppModel = "" Then