Merge branch 'enemies' into main

Author: webbgamers

Assets/Scenes/WebEasy.unity

@@ -423,8 +423,10 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 741867331}
+  - component: {fileID: 741867332}
+  - component: {fileID: 741867333}
   m_Layer: 0
-  m_Name: Waypoint5
+  m_Name: CandyBowl
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -444,6 +446,69 @@ Transform:
   m_Father: {fileID: 2052518869}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &741867332
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 741867330}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: 137346d391986b341b05c87fe100d5f7, type: 3}
+  m_Color: {r: 0.100427166, g: 0.8584906, b: 0.1641129, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1, y: 1}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!114 &741867333
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 741867330}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 552313e2c7ef41343a82b2cf388fb60e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &783697816
 GameObject:
   m_ObjectHideFlags: 0
@@ -652,6 +717,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1714582150}
   - component: {fileID: 1714582149}
+  - component: {fileID: 1714582151}
   m_Layer: 0
   m_Name: Enemy
   m_TagString: Untagged
@@ -718,12 +784,26 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1714582148}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -3.528144, y: -0.5923052, z: -13.6306505}
+  m_LocalPosition: {x: -0.72, y: -1.31, z: -13.6306505}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1714582151
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1714582148}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7977eea0e4da7dd4bb6dde066cb74d1d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  speed: 2
+  health: 10
 --- !u!1 &1848384324
 GameObject:
   m_ObjectHideFlags: 0
@@ -2734,7 +2814,7 @@ GameObject:
   - component: {fileID: 2052518870}
   m_Layer: 0
   m_Name: Path
-  m_TagString: Untagged
+  m_TagString: Path
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0

Assets/Scripts/BowlController.cs

@@ -0,0 +1,35 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class BowlController : MonoBehaviour
+{
+    GameObject carrier = null;
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        if (carrier != null) {
+            transform.position = carrier.transform.position;
+        }
+    }
+
+    public bool Carry(GameObject newCarrier) {
+        if (carrier != null) {
+            return false;
+        }
+        else {
+            carrier = newCarrier;
+            return true;
+        }
+    }
+
+    public void Drop() {
+        carrier = null;
+    }
+}

Assets/Scripts/BowlController.cs.meta

@@ -0,0 +1,102 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class EnemyController : MonoBehaviour
+{
+    public float speed = 1f;
+    public int health = 10;
+    bool carrying = false;
+    Transform pathContainer;
+    BowlController candyBowl;
+    
+    // Start is called before the first frame update
+    void Start()
+    {
+        // Create waypoint list from path object
+        pathContainer = GameObject.FindGameObjectWithTag("Path").transform;
+        Vector3[] waypoints = new Vector3[pathContainer.childCount];
+        for (int i = 0; i < waypoints.Length; i++) {
+            waypoints[i] = pathContainer.GetChild(i).position;
+        }
+
+        // Get bowl object
+        candyBowl = GameObject.FindGameObjectWithTag("Bowl").GetComponent<BowlController>();
+
+        // Start following the path
+        StartCoroutine(FollowPath(waypoints));
+    }
+
+    // Path following coroutine
+    IEnumerator FollowPath(Vector3[] waypoints) {
+        // Move to first waypoint and set up targets
+        transform.position = waypoints[0];
+        int targetWaypointIndex = 1;
+        Vector3 targetWaypoint = waypoints[targetWaypointIndex];
+        LookAt2D(targetWaypoint);
+        int movementDirection = 1;
+
+        // Movement loop
+        while (true) {
+            // Move towards target waypoint
+            transform.position = Vector3.MoveTowards(transform.position, targetWaypoint, speed * Time.deltaTime);
+
+            // Set new target once target is reached
+            if (transform.position == targetWaypoint) {
+                // Refresh waypoint list
+                waypoints = new Vector3[pathContainer.childCount];
+                for (int i = 0; i < waypoints.Length; i++) {
+                    waypoints[i] = pathContainer.GetChild(i).position;
+                }
+                if (targetWaypointIndex > waypoints.Length - 1) {
+                    targetWaypointIndex = waypoints.Length - 1;
+                }
+                
+                // Destroy if at the first waypoint
+                if (targetWaypointIndex == 0) {
+                    Destroy(gameObject);
+                }
+                // Remove waypoint if carrying bowl
+                if (carrying) {
+                    if (targetWaypointIndex != 0) {
+                        Destroy(pathContainer.GetChild(targetWaypointIndex).gameObject);
+                    }
+                    else {
+                        // Loose condition
+                        print("Game over, all your candy is belong to us.");
+                        candyBowl.Drop();
+                        // idk restart menu???
+                    }
+                }
+                // Final target logic
+                if (targetWaypointIndex == waypoints.Length - 1) {
+                    // Turn around
+                    movementDirection = -1;
+                    
+                    // Attempt to carry bowl
+                    carrying = candyBowl.Carry(gameObject);
+                }
+
+                // Set next target
+                targetWaypointIndex += movementDirection;
+                targetWaypoint = waypoints[targetWaypointIndex];
+                LookAt2D(targetWaypoint);
+            }
+            yield return null;
+        }
+    }
+
+    // 2D Lookat
+    void LookAt2D(Vector3 targetPoint) {
+        targetPoint.x -= transform.position.x;
+        targetPoint.y -= transform.position.y;
+        float angle = Mathf.Atan2(targetPoint.y, targetPoint.x) * Mathf.Rad2Deg;
+        angle -= 90f;
+        transform.rotation = Quaternion.Euler(0, 0, angle);
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+    }
+}

Assets/Scripts/EnemyController.cs

@@ -4,4 +4,12 @@
 PresetManager:
   m_ObjectHideFlags: 0
   serializedVersion: 2
-  m_DefaultPresets: {}
+  m_DefaultPresets:
+  - first:
+      m_NativeTypeID: 1210832254
+      m_ManagedTypePPtr: {fileID: 0}
+      m_ManagedTypeFallback: 
+    second:
+    - m_Preset: {fileID: 0}
+      m_Filter: 
+      m_Disabled: 0

Assets/Scripts/EnemyController.cs.meta

@@ -3,7 +3,8 @@
 --- !u!78 &1
 TagManager:
   serializedVersion: 2
-  tags: []
+  tags:
+  - Path
   layers:
   - Default
   - TransparentFX