diff --git a/DarkFlow/Assets/Scripts/AI/NPC.cs b/DarkFlow/Assets/Scripts/AI/NPC.cs deleted file mode 100644 index 49acee4..0000000 --- a/DarkFlow/Assets/Scripts/AI/NPC.cs +++ /dev/null @@ -1,83 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using Unity.VisualScripting; -using UnityEngine; -using UnityEngine.UI; -using UnityEngine.UIElements; -using UnityEngine.InputSystem; -using TMPro; -public class NPC : MonoBehaviour -{ - - [Header("NPC")] - [Space] - [SerializeField] private string npcName; // NPC will get their name - GameObject will not carry NPC's exact name. - [SerializeField] private string desc; // NPC description - This is their 'Inspect' or 'Examine' text. - [Space] - - [Header("Interactive")] - [SerializeField] private bool isHostile = false; - [TextArea(4, 10)] - public string NPCText; // Public so that it can be changed by any other script that needs to reference it. Example: The player kills a friend, now this NPC isn't so friendly. - [SerializeField] private GameObject dropOnDeath; - - [Header("Script References")] - [SerializeField] private AudioSource audioSource; - [SerializeField] private Health health; // We'll need this later. Probably write an AI script to work with this specifically. - [SerializeField] private TextMeshProUGUI npcNameBox; - [SerializeField] private TextMeshProUGUI npcChatBox; - - private bool canTalk = false; - - - private void Start() - { - npcNameBox.text = ""; - npcChatBox.text = ""; - if (isHostile) - { - health.InitializeHealth(); // Only hostile NPCs get health for now. - } - } - - private void Update() - { - if (Input.GetKeyDown(KeyCode.F)) - { - OnTalk(); - } - } - - private void OnTriggerEnter(Collider other) - { - if(other.CompareTag("Player")) - { - canTalk = true; - } - } - - private void OnTriggerExit(Collider other) - { - canTalk = false; - npcNameBox.text = ""; - npcChatBox.text = ""; - } - - private void OnDeath() - { - var dItem = Instantiate(dropOnDeath); - dItem.transform.position = this.transform.position; - } - private void OnTalk() - { - if (canTalk) - { - npcNameBox.text = npcName; - npcChatBox.text = NPCText; - } - } - - - -} - diff --git a/DarkFlow/Assets/Scripts/AI/NPC.cs.meta b/DarkFlow/Assets/Scripts/AI/NPC.cs.meta deleted file mode 100644 index bf994ae..0000000 --- a/DarkFlow/Assets/Scripts/AI/NPC.cs.meta +++ /dev/null @@ -1,15 +0,0 @@ -fileFormatVersion: 2 -<<<<<<< HEAD -guid: e28ff89f0e376fcd8821c9438692af9f -======= -guid: 5ac29fa319c8230458f11f733c334933 ->>>>>>> d90d6f083e71baeb27e622acd3703881d49b4e7a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/DarkFlow/Assets/Scripts/CharacterSystems/Stats/AirQualityAnalysis.cs b/DarkFlow/Assets/Scripts/CharacterSystems/Stats/AirQualityAnalysis.cs index 757110d..ea4f822 100644 --- a/DarkFlow/Assets/Scripts/CharacterSystems/Stats/AirQualityAnalysis.cs +++ b/DarkFlow/Assets/Scripts/CharacterSystems/Stats/AirQualityAnalysis.cs @@ -1,7 +1,7 @@ +using UnityEngine; + [CreateAssetMenu(fileName = "AirQualityAnalysis", menuName = "Stats/AirQualityAnalysis")] public class AirQualityAnalysis : StatBase { // Additional properties specific to AirQualityAnalysis Status } - -} diff --git a/DarkFlow/Assets/Scripts/CharacterSystems/Stats/BioSurveillanceAlert.cs b/DarkFlow/Assets/Scripts/CharacterSystems/Stats/BioSurveillanceAlert.cs index a2c33a7..fd46aca 100644 --- a/DarkFlow/Assets/Scripts/CharacterSystems/Stats/BioSurveillanceAlert.cs +++ b/DarkFlow/Assets/Scripts/CharacterSystems/Stats/BioSurveillanceAlert.cs @@ -1,7 +1,7 @@ -CreateAssetMenu(fileName = "BioSurveillanceAlert", menuName = "Stats/BioSurveillanceAlert")] +using UnityEngine; + +[CreateAssetMenu(fileName = "BioSurveillanceAlert", menuName = "Stats/BioSurveillanceAlert")] public class BioSurveillanceAlert : StatBase { // Additional properties specific to BioSurveillanceAlert Status } - -} diff --git a/DarkFlow/Assets/Scripts/CharacterSystems/Stats/ChameleonSkin.cs b/DarkFlow/Assets/Scripts/CharacterSystems/Stats/ChameleonSkin.cs index e9f8242..2dbec4e 100644 --- a/DarkFlow/Assets/Scripts/CharacterSystems/Stats/ChameleonSkin.cs +++ b/DarkFlow/Assets/Scripts/CharacterSystems/Stats/ChameleonSkin.cs @@ -1,7 +1,7 @@ +using UnityEngine; + [CreateAssetMenu(fileName = "ChameleonSkin", menuName = "Stats/ChameleonSkin")] public class ChameleonSkin : StatBase { // Additional properties specific to ChameleonSkin Status } - -} diff --git a/DarkFlow/Assets/Scripts/CharacterSystems/Stats/CommsChannelSelector.cs b/DarkFlow/Assets/Scripts/CharacterSystems/Stats/CommsChannelSelector.cs index f98f4f7..cb541bd 100644 --- a/DarkFlow/Assets/Scripts/CharacterSystems/Stats/CommsChannelSelector.cs +++ b/DarkFlow/Assets/Scripts/CharacterSystems/Stats/CommsChannelSelector.cs @@ -1,3 +1,5 @@ +using UnityEngine; + [CreateAssetMenu(fileName = "CommsChannelSelector", menuName = "Stats/CommsChannelSelector")] public class CommsChannelSelector : StatBase { diff --git a/DarkFlow/Assets/Scripts/CharacterSystems/Stats/CyberjammerStatus.cs b/DarkFlow/Assets/Scripts/CharacterSystems/Stats/CyberjammerStatus.cs index 90d79be..ad22944 100644 --- a/DarkFlow/Assets/Scripts/CharacterSystems/Stats/CyberjammerStatus.cs +++ b/DarkFlow/Assets/Scripts/CharacterSystems/Stats/CyberjammerStatus.cs @@ -1,3 +1,5 @@ +using UnityEngine; + [CreateAssetMenu(fileName = "CyberjammerStatus", menuName = "Stats/CyberjammerStatus")] public class CyberjammerStatus : StatBase { diff --git a/DarkFlow/Assets/Scripts/CharacterSystems/Stats/DigitalNetworkAlert.cs b/DarkFlow/Assets/Scripts/CharacterSystems/Stats/DigitalNetworkAlert.cs index 9bf911e..03417a4 100644 --- a/DarkFlow/Assets/Scripts/CharacterSystems/Stats/DigitalNetworkAlert.cs +++ b/DarkFlow/Assets/Scripts/CharacterSystems/Stats/DigitalNetworkAlert.cs @@ -1,7 +1,7 @@ +using UnityEngine; + [CreateAssetMenu(fileName = "DigitalNetworkAlert", menuName = "Stats/DigitalNetworkAlert")] public class DigitalNetworkAlert : StatBase { // Additional properties specific to DigitalNetworkAlert Status } - -} diff --git a/DarkFlow/Assets/Scripts/CharacterSystems/Stats/DroneVideoScreen.cs b/DarkFlow/Assets/Scripts/CharacterSystems/Stats/DroneVideoScreen.cs index 7668165..e41ded5 100644 --- a/DarkFlow/Assets/Scripts/CharacterSystems/Stats/DroneVideoScreen.cs +++ b/DarkFlow/Assets/Scripts/CharacterSystems/Stats/DroneVideoScreen.cs @@ -1,7 +1,7 @@ +using UnityEngine; + [CreateAssetMenu(fileName = "DroneVideoScreen", menuName = "Stats/DroneVideoScreen")] public class DroneVideoScreen : StatBase { // Additional properties specific to DroneVideoScreen Status } - -} diff --git a/DarkFlow/Assets/Scripts/CharacterSystems/Stats/EnergyLevels.cs b/DarkFlow/Assets/Scripts/CharacterSystems/Stats/EnergyLevels.cs index 432ff54..79ea7c7 100644 --- a/DarkFlow/Assets/Scripts/CharacterSystems/Stats/EnergyLevels.cs +++ b/DarkFlow/Assets/Scripts/CharacterSystems/Stats/EnergyLevels.cs @@ -1,7 +1,7 @@ +using UnityEngine; + [CreateAssetMenu(fileName = "EnergyLevels", menuName = "Stats/EnergyLevels")] public class EnergyLevels : StatBase { // Additional properties specific to Energy Levels } - -} diff --git a/DarkFlow/Assets/Scripts/CharacterSystems/Stats/MessengerService.cs b/DarkFlow/Assets/Scripts/CharacterSystems/Stats/MessengerService.cs index dcb21f3..595d202 100644 --- a/DarkFlow/Assets/Scripts/CharacterSystems/Stats/MessengerService.cs +++ b/DarkFlow/Assets/Scripts/CharacterSystems/Stats/MessengerService.cs @@ -1,7 +1,7 @@ +using UnityEngine; + [CreateAssetMenu(fileName = "MessengerService", menuName = "Stats/MessengerService")] public class MessengerService : StatBase { // Additional properties specific to MessengerService Status } - -} diff --git a/DarkFlow/Assets/Scripts/CharacterSystems/Stats/Nanobotinfiltration.cs b/DarkFlow/Assets/Scripts/CharacterSystems/Stats/Nanobotinfiltration.cs index e908f8a..74b78f1 100644 --- a/DarkFlow/Assets/Scripts/CharacterSystems/Stats/Nanobotinfiltration.cs +++ b/DarkFlow/Assets/Scripts/CharacterSystems/Stats/Nanobotinfiltration.cs @@ -1,3 +1,5 @@ +using UnityEngine; + [CreateAssetMenu(fileName = "NanobotInfiltration", menuName = "Stats/NanobotInfiltration")] public class NanobotInfiltration : StatBase { diff --git a/DarkFlow/Assets/Scripts/CharacterSystems/Stats/PharmeceuticalStatus.cs b/DarkFlow/Assets/Scripts/CharacterSystems/Stats/PharmeceuticalStatus.cs index 45b5782..a0291d6 100644 --- a/DarkFlow/Assets/Scripts/CharacterSystems/Stats/PharmeceuticalStatus.cs +++ b/DarkFlow/Assets/Scripts/CharacterSystems/Stats/PharmeceuticalStatus.cs @@ -1,7 +1,7 @@ +using UnityEngine; + [CreateAssetMenu(fileName = "PharmeceuticalStatus", menuName = "Stats/PharmeceuticalStatus")] public class PharmeceuticalStatus : StatBase { // Additional properties specific to PharmeceuticalStatus Status } - -} diff --git a/DarkFlow/Assets/Scripts/CharacterSystems/Stats/QuestObjectiveTracker.cs b/DarkFlow/Assets/Scripts/CharacterSystems/Stats/QuestObjectiveTracker.cs index e552643..53625b9 100644 --- a/DarkFlow/Assets/Scripts/CharacterSystems/Stats/QuestObjectiveTracker.cs +++ b/DarkFlow/Assets/Scripts/CharacterSystems/Stats/QuestObjectiveTracker.cs @@ -1,3 +1,5 @@ +using UnityEngine; + [CreateAssetMenu(fileName = "QuestObjectiveTracker", menuName = "Stats/QuestObjectiveTracker")] public class QuestObjectiveTracker : StatBase { diff --git a/DarkFlow/Assets/Scripts/CharacterSystems/Stats/RegenerativeTissueStatus.cs b/DarkFlow/Assets/Scripts/CharacterSystems/Stats/RegenerativeTissueStatus.cs index 5bdfa76..103f830 100644 --- a/DarkFlow/Assets/Scripts/CharacterSystems/Stats/RegenerativeTissueStatus.cs +++ b/DarkFlow/Assets/Scripts/CharacterSystems/Stats/RegenerativeTissueStatus.cs @@ -1,7 +1,7 @@ +using UnityEngine; + [CreateAssetMenu(fileName = "RegenerativeTissueStatus", menuName = "Stats/RegenerativeTissueStatus")] public class RegenerativeTissueStatus : StatBase { // Additional properties specific to RegenerativeTissueStatus Status } - -} diff --git a/DarkFlow/Assets/Scripts/CharacterSystems/Stats/SymbioticOrganismInterface.cs b/DarkFlow/Assets/Scripts/CharacterSystems/Stats/SymbioticOrganismInterface.cs index fe4bc49..b6fa07b 100644 --- a/DarkFlow/Assets/Scripts/CharacterSystems/Stats/SymbioticOrganismInterface.cs +++ b/DarkFlow/Assets/Scripts/CharacterSystems/Stats/SymbioticOrganismInterface.cs @@ -1,7 +1,7 @@ +using UnityEngine; + [CreateAssetMenu(fileName = "SymbioticOrganismInterface", menuName = "Stats/SymbioticOrganismInterface")] public class SymbioticOrganismInterface : StatBase { // Additional properties specific to SymbioticOrganismInterface Status } - -} diff --git a/DarkFlow/Assets/Scripts/CharacterSystems/Stats/VirtualEconomyTracker.cs b/DarkFlow/Assets/Scripts/CharacterSystems/Stats/VirtualEconomyTracker.cs index fbebe41..c6ed770 100644 --- a/DarkFlow/Assets/Scripts/CharacterSystems/Stats/VirtualEconomyTracker.cs +++ b/DarkFlow/Assets/Scripts/CharacterSystems/Stats/VirtualEconomyTracker.cs @@ -1,7 +1,7 @@ +using UnityEngine; + [CreateAssetMenu(fileName = "VirtualEconomyTracker", menuName = "Stats/VirtualEconomyTracker")] public class VirtualEconomyTracker : StatBase { // Additional properties specific to VirtualEconomyTracker Status } - -} diff --git a/DarkFlow/Assets/Scripts/CharacterSystems/Stats/WildLifeTracker.cs b/DarkFlow/Assets/Scripts/CharacterSystems/Stats/WildLifeTracker.cs index 3f6bf3c..61346e1 100644 --- a/DarkFlow/Assets/Scripts/CharacterSystems/Stats/WildLifeTracker.cs +++ b/DarkFlow/Assets/Scripts/CharacterSystems/Stats/WildLifeTracker.cs @@ -1,3 +1,5 @@ +using UnityEngine; + [CreateAssetMenu(fileName = "WildLifeTracker", menuName = "Stats/WildLifeTracker")] public class WildLifeTracker : StatBase {