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

Have both double trainer npcs show up in battle

This commit is contained in:
JappaWakka 2023-02-27 20:25:16 +01:00
parent 19d88a3bda
commit 0ae62ceaef
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,6 +60,7 @@
Public OwnPokemonNPC As NPC
Public OwnTrainerNPC As NPC
Public OppTrainerNPC As NPC
Public OppTrainer2NPC As NPC
Public HasSwitchedOwn As Boolean = False
@ -404,8 +405,15 @@
OwnTrainerNPC = CType(Entity.GetNewEntity("NPC", New Vector3(10, 0, 13) + BattleMapOffset, {Nothing}, {0, 0}, False, New Vector3(0), New Vector3(1), BaseModel.BillModel, 0, "", True, New Vector3(1), 0, "", "", New Vector3(0), {ownSkin, 3, "Player", 2, False, "Still", New List(Of Rectangle)}), NPC)
Screen.Level.Entities.Add(OwnTrainerNPC)
OppTrainerNPC = CType(Entity.GetNewEntity("NPC", New Vector3(17, 0, 13) + BattleMapOffset, {Nothing}, {0, 0}, False, New Vector3(0), New Vector3(1), BaseModel.BillModel, 0, "", True, New Vector3(1), 0, "", "", New Vector3(0), {Trainer.SpriteName, 1, "Player", 3, False, "Still", New List(Of Rectangle)}), NPC)
Screen.Level.Entities.Add(OppTrainerNPC)
If Trainer.DoubleTrainer = False Then
OppTrainerNPC = CType(Entity.GetNewEntity("NPC", New Vector3(17, 0, 13) + BattleMapOffset, {Nothing}, {0, 0}, False, New Vector3(0), New Vector3(1), BaseModel.BillModel, 0, "", True, New Vector3(1), 0, "", "", New Vector3(0), {Trainer.SpriteName, 1, "Player", 3, False, "Still", New List(Of Rectangle)}), NPC)
Screen.Level.Entities.Add(OppTrainerNPC)
Else
OppTrainerNPC = CType(Entity.GetNewEntity("NPC", New Vector3(17, 0, 12.5) + BattleMapOffset, {Nothing}, {0, 0}, False, New Vector3(0), New Vector3(1), BaseModel.BillModel, 0, "", True, New Vector3(1), 0, "", "", New Vector3(0), {Trainer.SpriteName, 1, "Player", 3, False, "Still", New List(Of Rectangle)}), NPC)
OppTrainer2NPC = CType(Entity.GetNewEntity("NPC", New Vector3(17, 0, 13.5) + BattleMapOffset, {Nothing}, {0, 0}, False, New Vector3(0), New Vector3(1), BaseModel.BillModel, 0, "", True, New Vector3(1), 0, "", "", New Vector3(0), {Trainer.SpriteName2, 1, "Player", 3, False, "Still", New List(Of Rectangle)}), NPC)
Screen.Level.Entities.Add(OppTrainerNPC)
Screen.Level.Entities.Add(OppTrainer2NPC)
End If
Dim cq As ScreenFadeQueryObject = New ScreenFadeQueryObject(ScreenFadeQueryObject.FadeTypes.Vertical, Color.Black, False, 5)
cq.PassThis = True