Resolved merge conflicts in AI scripts

DarkFlow/Assets/Scenes/systemTest.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
+  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -411,17 +411,18 @@ MonoBehaviour:
   m_GameObject: {fileID: 518869412}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fa1cd3d59b877b84aa6a7258c317c615, type: 3}
+  m_Script: {fileID: 11500000, guid: 5ac29fa319c8230458f11f733c334933, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   npcName: Billy NPC
   desc: A guy who just AIs for fun.
   isHostile: 0
   NPCText: Hey there. I bet you didn't think I could talk yet!
+  dropOnDeath: {fileID: 0}
   audioSource: {fileID: 0}
-  health: {fileID: 518869414}
-  npcNameBox: {fileID: 1860595803}
-  npcChatBox: {fileID: 1324247241}
+  health: {fileID: 0}
+  npcNameBox: {fileID: 0}
+  npcChatBox: {fileID: 0}
 --- !u!136 &518869416
 CapsuleCollider:
   m_ObjectHideFlags: 0

DarkFlow/Assets/Scripts/CharacterSystems/CharacterMain.cs

@@ -1,6 +1,8 @@
 using UnityEngine;
 using UnityEngine.InputSystem;
 
+
+
 public class CharacterMain : MonoBehaviour
 {
     private bool isJumping;
@@ -16,7 +18,7 @@ public class CharacterMain : MonoBehaviour
 
     private void Start()
     {
-        
+
     }
 
     private void Update()
@@ -63,4 +65,4 @@ private void HandleMovement()
 
         */
     }
-}
+}

DarkFlow/Assets/Scripts/Editor/StartupSceneLoader.cs

@@ -0,0 +1,32 @@
+using UnityEditor;
+using UnityEngine;
+using UnityEditor.SceneManagement;
+
+namespace DarkFlow.Editor
+{
+    [InitializeOnLoadAttribute]
+    public static class StartupSceneLoader
+    {
+        static StartupSceneLoader()
+        {
+            EditorApplication.playModeStateChanged += LoadStartupScene;
+        }
+
+        static void LoadStartupScene(PlayModeStateChange state)
+        {
+            if (state == PlayModeStateChange.ExitingEditMode)
+            {
+                EditorSceneManager.SaveCurrentModifiedScenesIfUserWantsTo();
+            }
+
+            if (state == PlayModeStateChange.EnteredPlayMode)
+            {
+                if (EditorSceneManager.GetActiveScene().buildIndex != 0 && EditorSceneManager.GetActiveScene().name != "systemTest")
+                {
+                    EditorSceneManager.LoadScene(0);
+
+                }
+            }
+        }
+    }
+}

DarkFlow/Assets/Scripts/CharacterSpawner.cs → DarkFlow/Assets/Scripts/Networking/CharacterSpawner.cs

@@ -31,3 +31,4 @@ void OnServerSpawnPlayer()
         }
     }
 }
+

DarkFlow/Assets/Scripts/Networking/ClientNetworkAnimator.cs

@@ -0,0 +1,14 @@
+using System.Collections;
+using System.Collections.Generic;
+using Unity.Netcode.Components;
+using UnityEngine;
+
+ [DisallowMultipleComponent]
+    public class ClientNetworkAnimator : NetworkAnimator
+    {
+        protected override bool OnIsServerAuthoritative()
+        {
+            return false;
+        }
+    }
+