diff --git a/Assets/Scenes/Level2.shade b/Assets/Scenes/Level2.shade index f4428b9e..4355b33e 100644 --- a/Assets/Scenes/Level2.shade +++ b/Assets/Scenes/Level2.shade @@ -4029,7 +4029,7 @@ - EID: 177 Name: ====Breakables==== IsActive: true - NumberOfChildren: 10 + NumberOfChildren: 8 Components: ~ Scripts: ~ - EID: 1 @@ -4462,436 +4462,6 @@ Rotation Offset: {x: 0, y: 0, z: 0} IsActive: false Scripts: ~ -- EID: 150 - Name: Plate - IsActive: true - NumberOfChildren: 4 - Components: - Transform Component: - Translate: {x: 1.25038707, y: 0.118150897, z: 0.393263906} - Rotate: {x: -0, y: 0, z: -0} - Scale: {x: 0.999979734, y: 1, z: 0.999979734} - IsActive: true - Renderable Component: - Mesh: 140964851 - Material: 124370424 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: true - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.200000003, y: 0.100000001, z: 0.200000003} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: - - Type: Breakable - Enabled: true - threshHold: 0.100000001 - ignoreRaccoon: false - breakClipPath: event:/Props/impact_break -- EID: 149 - Name: Piece1 - IsActive: false - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: -0.0586929321, y: 0, z: 0} - Rotate: {x: -0, y: 3.6088712e-09, z: 1.97286229e-16} - Scale: {x: 1, y: 1, z: 1} - IsActive: false - Renderable Component: - Mesh: 146557542 - Material: 124370424 - IsActive: false - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: true - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: false - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.150000006} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: false - Scripts: ~ -- EID: 148 - Name: Piece2 - IsActive: false - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: -0.0104182959, y: 0, z: -0.0662035942} - Rotate: {x: -0, y: 0.174533099, z: -0} - Scale: {x: 0.999999881, y: 1, z: 0.999999881} - IsActive: false - Renderable Component: - Mesh: 145439064 - Material: 124370424 - IsActive: false - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: true - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: false - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.200000003} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: false - Scripts: ~ -- EID: 147 - Name: Piece3 - IsActive: false - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 0.0431699753, y: 1.18017197e-05, z: -0.0288243294} - Rotate: {x: -0, y: 0, z: 0.174533099} - Scale: {x: 0.999999881, y: 0.999999583, z: 1} - IsActive: false - Renderable Component: - Mesh: 139411134 - Material: 124370424 - IsActive: false - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: true - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: false - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.150000006} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: false - Scripts: ~ -- EID: 146 - Name: Piece4 - IsActive: false - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 0.0341523886, y: 0.0088942796, z: 0.0554270744} - Rotate: {x: -0, y: 0, z: -0} - Scale: {x: 1, y: 1, z: 1} - IsActive: false - Renderable Component: - Mesh: 136742160 - Material: 124370424 - IsActive: false - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: true - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: false - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.150000006} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: false - Scripts: ~ -- EID: 145 - Name: Plate - IsActive: true - NumberOfChildren: 4 - Components: - Transform Component: - Translate: {x: 1.55880511, y: 0.118150897, z: 0.619565189} - Rotate: {x: -0, y: 0, z: -0} - Scale: {x: 0.999979734, y: 1, z: 0.999979734} - IsActive: true - Renderable Component: - Mesh: 140964851 - Material: 124370424 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: true - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.200000003, y: 0.100000001, z: 0.200000003} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: - - Type: Breakable - Enabled: true - threshHold: 0.100000001 - ignoreRaccoon: false - breakClipPath: event:/Props/impact_break -- EID: 488 - Name: Piece1 - IsActive: false - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: -0.0586929321, y: 0, z: 0} - Rotate: {x: -0, y: 3.6088712e-09, z: 1.97286229e-16} - Scale: {x: 1, y: 1, z: 1} - IsActive: false - Renderable Component: - Mesh: 146557542 - Material: 124370424 - IsActive: false - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: true - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: false - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.150000006} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: false - Scripts: ~ -- EID: 489 - Name: Piece2 - IsActive: false - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: -0.0104182959, y: 0, z: -0.0662035942} - Rotate: {x: -0, y: 0.174533099, z: -0} - Scale: {x: 0.999999881, y: 1, z: 0.999999881} - IsActive: false - Renderable Component: - Mesh: 145439064 - Material: 124370424 - IsActive: false - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: true - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: false - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.200000003} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: false - Scripts: ~ -- EID: 490 - Name: Piece3 - IsActive: false - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 0.0431699753, y: 1.18017197e-05, z: -0.0288243294} - Rotate: {x: -0, y: 0, z: 0.174533099} - Scale: {x: 0.999999881, y: 0.999999583, z: 1} - IsActive: false - Renderable Component: - Mesh: 139411134 - Material: 124370424 - IsActive: false - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: true - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: false - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.150000006} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: false - Scripts: ~ -- EID: 491 - Name: Piece4 - IsActive: false - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 0.0341523886, y: 0.0088942796, z: 0.0554270744} - Rotate: {x: -0, y: 0, z: -0} - Scale: {x: 1, y: 1, z: 1} - IsActive: false - Renderable Component: - Mesh: 136742160 - Material: 124370424 - IsActive: false - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: true - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: false - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.150000006} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: false - Scripts: ~ - EID: 492 Name: Plate IsActive: true @@ -6194,8 +5764,8 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 2.75, y: 0, z: -2} - Rotate: {x: 0, y: 0, z: 0} + Translate: {x: -0.0339742303, y: 0, z: -3.04188108} + Rotate: {x: -0, y: 0, z: -0} Scale: {x: 1, y: 1, z: 1} IsActive: true Scripts: ~ @@ -6205,7 +5775,7 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: -0.25, y: 0, z: -3} + Translate: {x: 2.7523005, y: 0, z: -1.97733951} Rotate: {x: -0, y: 0, z: -0} Scale: {x: 1, y: 1, z: 1} IsActive: true @@ -6498,7 +6068,7 @@ - EID: 19 Name: ====EnvironmentMaster==== IsActive: true - NumberOfChildren: 55 + NumberOfChildren: 54 Components: Transform Component: Translate: {x: 0, y: 0, z: 0} @@ -17107,221 +16677,6 @@ Rotation Offset: {x: 0, y: 0, z: 0} IsActive: true Scripts: ~ -- EID: 620 - Name: Plate - IsActive: true - NumberOfChildren: 4 - Components: - Transform Component: - Translate: {x: 1.71689963, y: 0.118150897, z: 0.286598682} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 0.999979734, y: 1, z: 0.999979734} - IsActive: true - Renderable Component: - Mesh: 140964851 - Material: 124370424 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: true - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.200000003, y: 0.100000001, z: 0.200000003} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: - - Type: Breakable - Enabled: true - threshHold: 0.100000001 - ignoreRaccoon: false - breakClipPath: event:/Props/impact_break -- EID: 621 - Name: Piece1 - IsActive: false - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: -0.0586929321, y: 0, z: 0} - Rotate: {x: -0, y: 3.6088712e-09, z: 1.97286229e-16} - Scale: {x: 1, y: 1, z: 1} - IsActive: false - Renderable Component: - Mesh: 146557542 - Material: 124370424 - IsActive: false - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: true - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: false - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.150000006} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: false - Scripts: ~ -- EID: 622 - Name: Piece2 - IsActive: false - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: -0.0104182959, y: 0, z: -0.0662035942} - Rotate: {x: -0, y: 0.174533099, z: -0} - Scale: {x: 0.999999881, y: 1, z: 0.999999881} - IsActive: false - Renderable Component: - Mesh: 145439064 - Material: 124370424 - IsActive: false - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: true - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: false - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.200000003} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: false - Scripts: ~ -- EID: 623 - Name: Piece3 - IsActive: false - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 0.0431699753, y: 1.18017197e-05, z: -0.0288243294} - Rotate: {x: -0, y: 0, z: 0.174533099} - Scale: {x: 0.999999881, y: 0.999999583, z: 1} - IsActive: false - Renderable Component: - Mesh: 139411134 - Material: 124370424 - IsActive: false - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: true - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: false - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.150000006} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: false - Scripts: ~ -- EID: 624 - Name: Piece4 - IsActive: false - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 0.0341523886, y: 0.0088942796, z: 0.0554270744} - Rotate: {x: -0, y: 0, z: -0} - Scale: {x: 1, y: 1, z: 1} - IsActive: false - Renderable Component: - Mesh: 136742160 - Material: 124370424 - IsActive: false - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: true - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: false - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.150000006} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: false - Scripts: ~ - EID: 625 Name: CardboardBox IsActive: true diff --git a/Assets/Scripts/Gameplay/AIBehaviour/AIRework/HomeOwnerAI.cs b/Assets/Scripts/Gameplay/AIBehaviour/AIRework/HomeOwnerAI.cs index dfd7fb44..c86342a0 100644 --- a/Assets/Scripts/Gameplay/AIBehaviour/AIRework/HomeOwnerAI.cs +++ b/Assets/Scripts/Gameplay/AIBehaviour/AIRework/HomeOwnerAI.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Linq; using SHADE; using SHADE_Scripting.Audio; using SHADE_Scripting.Gameplay.AIBehaviour.AIRework.States; @@ -36,6 +37,8 @@ namespace SHADE_Scripting.Gameplay.AIBehaviour.AIRework [NonSerialized] public IEnumerable patrolPointPool; + private List pppList; + private Transform transform; public void Reset() @@ -69,6 +72,7 @@ namespace SHADE_Scripting.Gameplay.AIBehaviour.AIRework AudioHandler.audioClipHandlers["HO_footsteps"] = SHADE.Audio.CreateAudioClip("event:/Homeowner/homeowner_footsteps"); patrolPointPool = patrolPointParent.GetComponentsInChildren(); + pppList = patrolPointPool.ToList(); transform = GetComponent(); atk = false; @@ -78,8 +82,8 @@ namespace SHADE_Scripting.Gameplay.AIBehaviour.AIRework protected override void start() { //attackHitbox.SetActive(false); - if (transform) - startPos = transform.GlobalPosition; + if (pppList != null) + startPos = pppList[0].LocalPosition; }