Symmetrical/BGJ-2022.1
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Syntriax' into Over

Browse Source
This commit is contained in:
OverflowNarhoym
2022-02-21 17:12:12 +01:00
parent 113a546991 8c5bd12294
commit b27aab9c9b
5 changed files with 34 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Assets/Scripts/AI/BasicPatrollingEnemyAI.cs
View File

@@ -9,10 +9,10 @@ namespace AI
protected IMovement movement = null;
protected CollissionChecker leftWallChecker = null;
protected CollissionChecker rightWallChecker = null;
protected CollissionChecker leftGroundChecker = null;
protected CollissionChecker rightGroundChecker = null;
protected CollisionChecker leftWallChecker = null;
protected CollisionChecker rightWallChecker = null;
protected CollisionChecker leftGroundChecker = null;
protected CollisionChecker rightGroundChecker = null;
// If moving Right, and either there's no more ground to move into or there is a wall at the Right side of the enemy OR
@@ -25,10 +25,10 @@ namespace AI
protected virtual void Awake()
{
movement = gameObject.AddComponent<EnemyMovement>();
leftWallChecker = GetCollissionCheckerOnChild("Collission Checkers/Left Wall");
rightWallChecker = GetCollissionCheckerOnChild("Collission Checkers/Right Wall");
leftGroundChecker = GetCollissionCheckerOnChild("Collission Checkers/Left Ground");
rightGroundChecker = GetCollissionCheckerOnChild("Collission Checkers/Right Ground");
leftWallChecker = GetCollisionCheckerOnChild("Collision Checkers/Left Wall");
rightWallChecker = GetCollisionCheckerOnChild("Collision Checkers/Right Wall");
leftGroundChecker = GetCollisionCheckerOnChild("Collision Checkers/Left Ground");
rightGroundChecker = GetCollisionCheckerOnChild("Collision Checkers/Right Ground");
}
protected virtual void FixedUpdate()
@@ -39,7 +39,7 @@ namespace AI
movement.Move(isMovingRight ? 1f : -1f);
}
protected CollissionChecker GetCollissionCheckerOnChild(string childName)
=> transform.Find(childName).GetComponent<CollissionChecker>();
protected CollisionChecker GetCollisionCheckerOnChild(string childName)
=> transform.Find(childName).GetComponent<CollisionChecker>();
}
}

4
Assets/Scripts/Movement/CollissionChecker.cs → Assets/Scripts/Movement/CollisionChecker.cs
View File

@@ -2,11 +2,11 @@ using UnityEngine;
namespace Movement
{
public class CollissionChecker : MonoBehaviour
public class CollisionChecker : MonoBehaviour
{
private Collider2D[] nonAllocColliderArray = new Collider2D[5];
public LayerMask LayerMask = ~((1 << 6) | (1 << 7)); // Everything except the "Player" and "Enemy" layer
public LayerMask LayerMask { get; set; } = ~((1 << 6) | (1 << 7)); // Everything except the "Player" and "Enemy" layer
public bool IsCollided => Physics2D.OverlapBoxNonAlloc(transform.position, transform.localScale, 0, nonAllocColliderArray, LayerMask) != 0;
public void OnDrawGizmosSelected()

2
Assets/Scripts/Movement/CollissionChecker.cs.meta → Assets/Scripts/Movement/CollisionChecker.cs.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 02e036b6321fff34cbd154fd665a8b23
guid: 7000c8c0eb91b2d4cb9a0e3ee1b609a7
MonoImporter:
externalObjects: {}
serializedVersion: 2