From ca280d700e964658d710327c77c052dd4cdc05b9 Mon Sep 17 00:00:00 2001
From: ProtoSharkk <paul@sayson.com>
Date: Sat, 26 Oct 2024 21:25:03 -0700
Subject: [PATCH] Resolve merge conflicts from main menu

---
 Assets/Scenes/SampleScene.unity |  8 ++++----
 Assets/Scripts C#/Teo.cs        | 12 +-----------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity
index 4fe4b7a..7f0dbe7 100644
--- a/Assets/Scenes/SampleScene.unity
+++ b/Assets/Scenes/SampleScene.unity
@@ -325,11 +325,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6118034672792182209, guid: e05928a0d673caf999d31b31b994a112, type: 3}
       propertyPath: swingDistance
-<<<<<<< HEAD
       value: 3
-=======
-      value: 2
->>>>>>> main
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118034672792182209, guid: e05928a0d673caf999d31b31b994a112, type: 3}
+      propertyPath: swingRangeDeg
+      value: 21.98
       objectReference: {fileID: 0}
     - target: {fileID: 6118034672792182209, guid: e05928a0d673caf999d31b31b994a112, type: 3}
       propertyPath: distanceIndicator
diff --git a/Assets/Scripts C#/Teo.cs b/Assets/Scripts C#/Teo.cs
index 7476678..c8194a2 100644
--- a/Assets/Scripts C#/Teo.cs	
+++ b/Assets/Scripts C#/Teo.cs	
@@ -57,24 +57,14 @@ public class Teo : MonoBehaviour
 			Ratbot ratbot = hit.GetComponent<Ratbot>();
 			// If ratbot exists and is within swing range, damage it.
 			// Calculate absolute difference between angles of ratbot and cursor
-<<<<<<< HEAD:Assets/C# Scripts/Teo.cs
 			if (ratbot == null || Mathf.Abs(Mathf.Atan2(
 					hit.transform.position.y - transform.position.y,
 					hit.transform.position.x - transform.position.x
-=======
-			/* if (ratbot == null || Mathf.Abs(Mathf.Atan2(
-					ratbot.transform.position.y - transform.position.y,
-					ratbot.transform.position.x - transform.position.x
->>>>>>> main:Assets/Scripts C#/Teo.cs
 				) - Mathf.Atan2(
 					Input.mousePosition.y - Screen.height/2,
 					Input.mousePosition.x - Screen.width/2
 				)) > swingRangeDeg * Mathf.Deg2Rad
-			)  */
-			if (ratbot == null) {
-				continue;
-			}
-			
+			) continue;
 			ratbot.Damage(damageStrength);
 		}
 	}