Merge pull request Regalis11#86 from ENDSHN/dev

Some little fixes (details in the commits)

Changelog.txt

@@ -28,9 +28,10 @@ Bug fixes:
 - SCP-173's collision radius has been decreased.
 - Fixed a crash that occured when opening your inventory.
 - The fog doesn't turn white anymore if you go to the pocket dimension by leaving SCP-1499.
-- Fixed items,npcs and the player not falling through the floor anymore if the room is not rendered.
+- Fixed items,npcs and the player falling through the floor if the room is not rendered.
 - Fixed the item dropspeed increasing each time an item has been picked up.
 - Another attempt of fixing room overlapping issues.
+- Fixed Ulgrin's path during the breach event.
 
 ----------------------------------------------------------------------------------
 

UpdateEvents.bb

@@ -92,7 +92,8 @@ Function UpdateEvents()
 						If e\room\NPC[2] = Null Then
 							e\room\NPC[2] = CreateNPC(NPCtypeGuard, 0,0,0)
 						EndIf
-						PositionEntity e\room\NPC[2]\Collider, e\room\x-240*RoomScale, 0.5, e\room\z+528*RoomScale, True
+						;x-240
+						PositionEntity e\room\NPC[2]\Collider, e\room\x, 0.5, e\room\z+528*RoomScale, True
 						ResetEntity e\room\NPC[2]\Collider
 						e\room\NPC[2]\State = 7
 						PointEntity e\room\NPC[2]\Collider,e\room\NPC[1]\Collider
@@ -173,7 +174,8 @@ Function UpdateEvents()
 										MoveEntity e\room\NPC[2]\Collider, 0,0,e\room\NPC[2]\CurrSpeed*FPSfactor
 										e\room\NPC[2]\State = 8
 
-										If EntityZ(e\room\NPC[2]\Collider) < e\room\z-512*RoomScale Then
+										;z-512
+										If EntityZ(e\room\NPC[2]\Collider) < e\room\z Then
 											PointEntity(e\room\NPC[2]\obj, e\room\NPC[1]\Collider)
 											RotateEntity e\room\NPC[2]\Collider, 0, CurveAngle(EntityYaw(e\room\NPC[2]\obj)-180,EntityYaw(e\room\NPC[2]\Collider),15.0), 0
 										Else
@@ -541,6 +543,17 @@ Function UpdateEvents()
 							;e\room\NPC[3]\EnemyX = EntityX(Collider)
 							;e\room\NPC[3]\EnemyY = EntityY(Collider)
 							;e\room\NPC[3]\EnemyZ = EntityZ(Collider)
+
+							If e\room\NPC[5]\State <> 11
+								If EntityDistance(e\room\NPC[3]\Collider,e\room\NPC[5]\Collider)>5.0 And EntityDistance(e\room\NPC[4]\Collider,e\room\NPC[5]\Collider)
+									If EntityDistance(e\room\NPC[5]\Collider,Collider)<3.5
+										e\room\NPC[5]\State = 11
+										e\room\NPC[5]\State3 = 1
+										e\room\NPC[5]\SoundChn2 = PlaySound2(e\room\NPC[5]\Sound2,Camera,e\room\NPC[5]\Collider)
+										e\room\NPC[5]\Reload = 70*3
+									EndIf
+								EndIf
+							EndIf
 						ElseIf e\EventState3 < 900
 							e\room\NPC[4]\Angle = 0
 
@@ -683,7 +696,7 @@ Function UpdateEvents()
 									EndIf
 								EndIf
 								If e\room\NPC[5]\State <> 11
-									If EntityDistance(e\room\NPC[3]\Collider,e\room\NPC[5]\Collider)>5.0
+									If EntityDistance(e\room\NPC[3]\Collider,e\room\NPC[5]\Collider)>5.0 And EntityDistance(e\room\NPC[4]\Collider,e\room\NPC[5]\Collider)
 										If EntityDistance(e\room\NPC[5]\Collider,Collider)<3.5
 											e\room\NPC[5]\State = 11
 											e\room\NPC[5]\State3 = 1