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

Fix NPC trainers not ignoring collision

Browse Source
This commit is contained in:
JappaWakka 2025-04-19 18:59:35 +02:00
parent ff50de4bdd
commit 84f200af4a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
P3D/Entites/Other/NPC.vb
View File

@ -82,10 +82,10 @@
Me.IsTrainer = True Me.IsTrainer = True
Me.TrainerSight = CInt(Me.AdditionalValue.GetSplit(0, "|")) Me.TrainerSight = CInt(Me.AdditionalValue.GetSplit(0, "|"))
Me.AdditionalValue = Me.AdditionalValue.GetSplit(1, "|") If Me.AdditionalValue.Split("|").Count > 2 Then
If Me.AdditionalValue.Split.Count > 2 Then
Me.TrainerCheckCollision = CBool(Me.AdditionalValue.GetSplit(2, "|")) Me.TrainerCheckCollision = CBool(Me.AdditionalValue.GetSplit(2, "|"))
End If End If
Me.AdditionalValue = Me.AdditionalValue.GetSplit(1, "|")
End If End If
Me.DropUpdateUnlessDrawn = False Me.DropUpdateUnlessDrawn = False
@ -489,10 +489,10 @@
With CType(Screen.Camera, OverworldCamera) With CType(Screen.Camera, OverworldCamera)
If CType(Screen.Camera, OverworldCamera).ThirdPerson = True And IsOnScreen() = False Then If CType(Screen.Camera, OverworldCamera).ThirdPerson = True And IsOnScreen() = False Then
s &= "@camera.setfocus(npc," & Me.NPCID & ")" & Environment.NewLine Dim cPosition = .ThirdPersonOffset.X.ToString().ReplaceDecSeparator & "," & .ThirdPersonOffset.Y.ToString().ReplaceDecSeparator & "," & .ThirdPersonOffset.Z.ToString().ReplaceDecSeparator
Dim cPosition = .ThirdPersonOffset.X.ToString() & "," & .ThirdPersonOffset.Y.ToString() & "," & .ThirdPersonOffset.Z.ToString() s &= "@camera.setfocus(npc," & Me.NPCID & ")" & Environment.NewLine &
s &= "@sound.play(Emote_Exclamation)" & Environment.NewLine & "@sound.play(Emote_Exclamation)" & Environment.NewLine &
"@entity.showmessagebulb(1|" & Me.Position.X + offset.X & "|" & Me.Position.Y + 0.7F & "|" & Me.Position.Z + offset.Y & ")" & Environment.NewLine & "@entity.showmessagebulb(1|" & CStr(Me.Position.X + offset.X & "|" & Me.Position.Y + 0.7F & "|" & Me.Position.Z + offset.Y & ")").ReplaceDecSeparator & Environment.NewLine &
"@npc.move(" & Me.NPCID & "," & distance - 1 & ")" & Environment.NewLine & "@npc.move(" & Me.NPCID & "," & distance - 1 & ")" & Environment.NewLine &
"@script.start(" & Me.AdditionalValue & ")" & Environment.NewLine & "@script.start(" & Me.AdditionalValue & ")" & Environment.NewLine &
"@camera.resetfocus" & Environment.NewLine & "@camera.resetfocus" & Environment.NewLine &
@ -500,7 +500,7 @@
":end" ":end"
Else Else
s &= "@sound.play(Emote_Exclamation)" & Environment.NewLine & s &= "@sound.play(Emote_Exclamation)" & Environment.NewLine &
"@entity.showmessagebulb(1|" & Me.Position.X + offset.X & "|" & Me.Position.Y + 0.7F & "|" & Me.Position.Z + offset.Y & ")" & Environment.NewLine & "@entity.showmessagebulb(1|" & CStr(Me.Position.X + offset.X & "|" & Me.Position.Y + 0.7F & "|" & Me.Position.Z + offset.Y & ")").ReplaceDecSeparator & Environment.NewLine &
"@npc.move(" & Me.NPCID & "," & distance - 1 & ")" & Environment.NewLine & "@npc.move(" & Me.NPCID & "," & distance - 1 & ")" & Environment.NewLine &
"@script.start(" & Me.AdditionalValue & ")" & Environment.NewLine & "@script.start(" & Me.AdditionalValue & ")" & Environment.NewLine &
":end" ":end"