From 65001c0ecb1fdee8cd7a2bcc5835b0933caeb01a Mon Sep 17 00:00:00 2001
From: Garrett Kaiser <gkaiser5888@it01-125031.ad.ppsnet>
Date: Thu, 29 Jan 2026 15:30:38 -0800
Subject: [PATCH] Rocket deals damage

---
 Assets/Prefabs/Rocket.prefab     |  2 +-
 Assets/Scenes/Scene1-Boss.unity  |  4 ++--
 Assets/Scripts/Rocket.cs         | 17 +++++++++++++++++
 Assets/Scripts/SteampunkBoss.cs  |  9 +++++++++
 ProjectSettings/TagManager.asset |  1 +
 5 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/Assets/Prefabs/Rocket.prefab b/Assets/Prefabs/Rocket.prefab
index f11002c..2ab9f5e 100644
--- a/Assets/Prefabs/Rocket.prefab
+++ b/Assets/Prefabs/Rocket.prefab
@@ -105,7 +105,7 @@ BoxCollider:
     serializedVersion: 2
     m_Bits: 0
   m_LayerOverridePriority: 0
-  m_IsTrigger: 0
+  m_IsTrigger: 1
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
diff --git a/Assets/Scenes/Scene1-Boss.unity b/Assets/Scenes/Scene1-Boss.unity
index 253fe5a..43d1b5d 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:01cff0d2932848edc8bcd0fd649fc88fc0c16a5cb0d2e819acabdbaa162cd73a
-size 1286025
+oid sha256:c714d7ae14abfd90030fb6422fba51de3f2a547715af7a43476de88fc2f9580d
+size 1286295
diff --git a/Assets/Scripts/Rocket.cs b/Assets/Scripts/Rocket.cs
index 7d7cba9..2853fd0 100644
--- a/Assets/Scripts/Rocket.cs
+++ b/Assets/Scripts/Rocket.cs
@@ -2,6 +2,7 @@ using UnityEngine;
 
 public class Rocket : MonoBehaviour
 {
+    public PlayerMovement playerMovement;
     public GameObject player;
     public Vector3 TargetPosition;
     public float playerDistance;
@@ -16,6 +17,7 @@ public class Rocket : MonoBehaviour
     void Start()
     {
         player = GameObject.Find("Player");
+        playerMovement = FindObjectOfType<PlayerMovement>();
         TargetPosition = player.transform.position;
     }
 
@@ -36,4 +38,19 @@ public class Rocket : MonoBehaviour
         playerDistance = Vector3.Distance(transform.position, player.transform.position);
         transform.Translate(Vector3.forward * Time.deltaTime * (playerDistance/1.5f+8));
     }
+
+    public void OnTriggerEnter(Collider other)
+    {
+        if (other.CompareTag("Player"))
+        {
+            Debug.Log("Hit Player");
+            playerMovement.HP -= 2f;
+        }
+        else if (other.CompareTag("Boss")){
+            Debug.Log("Shooting");
+        }
+        else if (other.CompareTag("Ground")){
+            Destroy(this.gameObject);
+        }
+    }
 }
diff --git a/Assets/Scripts/SteampunkBoss.cs b/Assets/Scripts/SteampunkBoss.cs
index 9b4f989..04dad2f 100644
--- a/Assets/Scripts/SteampunkBoss.cs
+++ b/Assets/Scripts/SteampunkBoss.cs
@@ -15,6 +15,9 @@ public class SteampunkBoss : MonoBehaviour
     public GameObject LungeHitbox;
     public float lungeBackup;
 
+    public GameObject Rocket;
+    public bool rocketShot = false;
+
     // Start is called once before the first execution of Update after the MonoBehaviour is created
     void Start()
     {
@@ -98,10 +101,16 @@ public class SteampunkBoss : MonoBehaviour
         {
             transform.position = Vector3.MoveTowards(transform.position, TargetPosition, -30 * Time.deltaTime);
         }
+        else if (!rocketShot)
+        {
+            Instantiate(Rocket, transform.position, transform.rotation);
+            rocketShot = true;
+        }
         stallTimer -= Time.deltaTime;
         if (stallTimer <= 0)
         {
             setposition = false;
+            rocketShot = false;
         }
     }
 
diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset
index b865d02..95da026 100644
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@@ -9,6 +9,7 @@ TagManager:
   - Sword
   - WagonPoint
   - Ground
+  - Boss
   layers:
   - Default
   - TransparentFX