From 3d0dbd029ab3e662d8f7fc8d7647bdd3e3839a84 Mon Sep 17 00:00:00 2001 From: Garrett Kaiser Date: Tue, 13 Jan 2026 15:34:35 -0800 Subject: [PATCH] WEEEE --- Assets/Scenes/Scene1-Boss.unity | 4 ++-- Assets/Scripts/SteampunkBoss.cs | 29 +++++++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/Assets/Scenes/Scene1-Boss.unity b/Assets/Scenes/Scene1-Boss.unity index c3f30e8..9009513 100644 --- a/Assets/Scenes/Scene1-Boss.unity +++ b/Assets/Scenes/Scene1-Boss.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5fbd31f910a39e3cf560f649257246ecf6fcebebb2959611cddffd7803f11806 -size 1279626 +oid sha256:06ff0c8c995fa95e939cb44943fd159c513b69520af422538f1c65ae70653962 +size 1282574 diff --git a/Assets/Scripts/SteampunkBoss.cs b/Assets/Scripts/SteampunkBoss.cs index 8ad0319..3d2c347 100644 --- a/Assets/Scripts/SteampunkBoss.cs +++ b/Assets/Scripts/SteampunkBoss.cs @@ -2,6 +2,7 @@ using UnityEngine; public class SteampunkBoss : MonoBehaviour { + public PlayerMovement playerMovement; public GameObject Player; public int randomNumber = 0; public float stallTimer = 0; @@ -9,6 +10,8 @@ public class SteampunkBoss : MonoBehaviour public Vector3 TargetPosition; public bool setposition = false; + public GameObject JumpHitbox; + // Start is called once before the first execution of Update after the MonoBehaviour is created void Start() { @@ -62,9 +65,11 @@ public class SteampunkBoss : MonoBehaviour if ((transform.position.x == TargetPosition.x) && (transform.position.z == TargetPosition.z)) { transform.position = Vector3.MoveTowards(transform.position, TargetPosition, 80 * Time.deltaTime); + JumpHitbox.SetActive(true); } if (transform.position == TargetPosition) { + JumpHitbox.SetActive(false); stallTimer -= Time.deltaTime; } if (stallTimer <= 0) @@ -77,11 +82,23 @@ public class SteampunkBoss : MonoBehaviour { if (!setTimer) { - stallTimer = 1; + stallTimer = 3; setTimer = true; } - + if (!setposition) + { + TargetPosition = Player.transform.position; + setposition = true; + } + if (stallTimer >= 2.6 && randomNumber == 2) + { + transform.position = Vector3.MoveTowards(transform.position, TargetPosition, -30 * Time.deltaTime); + } stallTimer -= Time.deltaTime; + if (stallTimer <= 0) + { + setposition = false; + } } void LungeAttack() @@ -128,4 +145,12 @@ public class SteampunkBoss : MonoBehaviour stallTimer -= Time.deltaTime; } + + public void OnTriggerEnter(Collider other) + { + if (randomNumber == 1) + { + playerMovement.HP -= 1; + } + } }