diff --git a/Assets/Scripts/Management.meta b/Assets/Scripts/Management.meta new file mode 100644 index 0000000..ec665bc --- /dev/null +++ b/Assets/Scripts/Management.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0c9670628e1e178498b88f642ebf9754 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/Management/GameManager.cs similarity index 74% rename from Assets/Scripts/GameManager.cs rename to Assets/Scripts/Management/GameManager.cs index 8af9635..2d4aec9 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/Management/GameManager.cs @@ -44,13 +44,12 @@ private void Awake() /// private void ReloadReferences() { - blackScreen = GameObject.FindWithTag("BlackScreen").GetComponent(); - playerController = GameObject.FindWithTag("Player").GetComponent(); - DialogueManager = GetComponent(); - DialogueManager.ReloadReferences(); + Instance.blackScreen = GameObject.FindWithTag("BlackScreen").GetComponent(); + Instance.playerController = GameObject.FindWithTag("Player").GetComponent(); + Instance.DialogueManager = GetComponent(); + Instance.DialogueManager.ReloadReferences(); - Inventory = GetComponent(); - + Instance.Inventory = GetComponent(); } /// @@ -66,8 +65,8 @@ public void EnterSceneDoor(string scene, int door) /// private IEnumerator EnterSceneDoorCoroutine(string scene, int doorId) { - isTransitioningScenes = true; - playerController.SetCharacterControl(false); + Instance.isTransitioningScenes = true; + Instance.playerController.SetCharacterControl(false); // Fade to black float fadeDuration = 0.2f; // how long to fade to/from black @@ -99,12 +98,12 @@ private IEnumerator EnterSceneDoorCoroutine(string scene, int doorId) SceneDoor door = GameSceneManager.Instance.GetDoorWithId(doorId); - if (playerController != null && GameSceneManager.Instance != null) + if (Instance.playerController != null && GameSceneManager.Instance != null) { if (door != null) { - playerController.CharacterControllerMove(door.gameObject.transform.position - playerController.transform.position); - playerController.DougBody.transform.rotation = door.gameObject.transform.rotation; + Instance.playerController.CharacterControllerMove(door.gameObject.transform.position - playerController.transform.position); + Instance.playerController.DougBody.transform.rotation = door.gameObject.transform.rotation; } } @@ -112,25 +111,25 @@ private IEnumerator EnterSceneDoorCoroutine(string scene, int doorId) while (fadeTime < fadeDuration) { blackScreenColor.a = Mathf.Lerp(1, 0, fadeTime / fadeDuration); - blackScreen.color = blackScreenColor; + Instance.blackScreen.color = blackScreenColor; fadeTime += Time.deltaTime; - playerController.WalkInDirection((door.WalkDirection.position - playerController.transform.position).normalized); + Instance.playerController.WalkInDirection((door.WalkDirection.position - playerController.transform.position).normalized); yield return null; } // move character a little more while (fadeTime < moveDuration) { - playerController.WalkInDirection((door.WalkDirection.position - playerController.transform.position).normalized); + Instance.playerController.WalkInDirection((door.WalkDirection.position - playerController.transform.position).normalized); fadeTime += Time.deltaTime; yield return null; } fadeTime = 0; - isTransitioningScenes = false; - playerController.SetCharacterControl(true); + Instance.isTransitioningScenes = false; + Instance.playerController.SetCharacterControl(true); } /// @@ -138,7 +137,7 @@ private IEnumerator EnterSceneDoorCoroutine(string scene, int doorId) /// public bool InSceneTransition() { - return isTransitioningScenes; + return Instance.isTransitioningScenes; } #region Storybool Save/Load diff --git a/Assets/Scripts/GameManager.cs.meta b/Assets/Scripts/Management/GameManager.cs.meta similarity index 100% rename from Assets/Scripts/GameManager.cs.meta rename to Assets/Scripts/Management/GameManager.cs.meta diff --git a/Assets/Scripts/GameSceneManager.cs b/Assets/Scripts/Management/GameSceneManager.cs similarity index 100% rename from Assets/Scripts/GameSceneManager.cs rename to Assets/Scripts/Management/GameSceneManager.cs diff --git a/Assets/Scripts/GameSceneManager.cs.meta b/Assets/Scripts/Management/GameSceneManager.cs.meta similarity index 100% rename from Assets/Scripts/GameSceneManager.cs.meta rename to Assets/Scripts/Management/GameSceneManager.cs.meta diff --git a/Assets/Scripts/Management/Questing.meta b/Assets/Scripts/Management/Questing.meta new file mode 100644 index 0000000..9023a5a --- /dev/null +++ b/Assets/Scripts/Management/Questing.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9c62a4e46b92717449db7214fd217c32 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Quest.cs b/Assets/Scripts/Management/Questing/Quest.cs similarity index 100% rename from Assets/Scripts/Quest.cs rename to Assets/Scripts/Management/Questing/Quest.cs diff --git a/Assets/Scripts/Quest.cs.meta b/Assets/Scripts/Management/Questing/Quest.cs.meta similarity index 100% rename from Assets/Scripts/Quest.cs.meta rename to Assets/Scripts/Management/Questing/Quest.cs.meta diff --git a/Assets/Scripts/QuestRegistry.cs b/Assets/Scripts/Management/Questing/QuestRegistry.cs similarity index 100% rename from Assets/Scripts/QuestRegistry.cs rename to Assets/Scripts/Management/Questing/QuestRegistry.cs diff --git a/Assets/Scripts/QuestRegistry.cs.meta b/Assets/Scripts/Management/Questing/QuestRegistry.cs.meta similarity index 100% rename from Assets/Scripts/QuestRegistry.cs.meta rename to Assets/Scripts/Management/Questing/QuestRegistry.cs.meta diff --git a/Assets/Scripts/Storybools.cs b/Assets/Scripts/Management/Questing/Storybools.cs similarity index 100% rename from Assets/Scripts/Storybools.cs rename to Assets/Scripts/Management/Questing/Storybools.cs diff --git a/Assets/Scripts/Storybools.cs.meta b/Assets/Scripts/Management/Questing/Storybools.cs.meta similarity index 100% rename from Assets/Scripts/Storybools.cs.meta rename to Assets/Scripts/Management/Questing/Storybools.cs.meta diff --git a/Assets/Scripts/SaveSystem.cs b/Assets/Scripts/Management/SaveSystem.cs similarity index 100% rename from Assets/Scripts/SaveSystem.cs rename to Assets/Scripts/Management/SaveSystem.cs diff --git a/Assets/Scripts/SaveSystem.cs.meta b/Assets/Scripts/Management/SaveSystem.cs.meta similarity index 100% rename from Assets/Scripts/SaveSystem.cs.meta rename to Assets/Scripts/Management/SaveSystem.cs.meta diff --git a/Assets/Scripts/TeleportHandler.cs b/Assets/Scripts/Management/TeleportHandler.cs similarity index 100% rename from Assets/Scripts/TeleportHandler.cs rename to Assets/Scripts/Management/TeleportHandler.cs diff --git a/Assets/Scripts/TeleportHandler.cs.meta b/Assets/Scripts/Management/TeleportHandler.cs.meta similarity index 100% rename from Assets/Scripts/TeleportHandler.cs.meta rename to Assets/Scripts/Management/TeleportHandler.cs.meta diff --git a/Assets/Scripts/WorldInteraction.meta b/Assets/Scripts/WorldInteraction.meta new file mode 100644 index 0000000..655774e --- /dev/null +++ b/Assets/Scripts/WorldInteraction.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f54f48b2b24978a42b6583a0ed59e8c2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/BurriedItem.cs b/Assets/Scripts/WorldInteraction/BurriedItem.cs similarity index 100% rename from Assets/Scripts/BurriedItem.cs rename to Assets/Scripts/WorldInteraction/BurriedItem.cs diff --git a/Assets/Scripts/BurriedItem.cs.meta b/Assets/Scripts/WorldInteraction/BurriedItem.cs.meta similarity index 100% rename from Assets/Scripts/BurriedItem.cs.meta rename to Assets/Scripts/WorldInteraction/BurriedItem.cs.meta diff --git a/Assets/Scripts/Diggable.cs b/Assets/Scripts/WorldInteraction/Diggable.cs similarity index 100% rename from Assets/Scripts/Diggable.cs rename to Assets/Scripts/WorldInteraction/Diggable.cs diff --git a/Assets/Scripts/Diggable.cs.meta b/Assets/Scripts/WorldInteraction/Diggable.cs.meta similarity index 100% rename from Assets/Scripts/Diggable.cs.meta rename to Assets/Scripts/WorldInteraction/Diggable.cs.meta diff --git a/Assets/Scripts/Interactable.cs b/Assets/Scripts/WorldInteraction/Interactable.cs similarity index 100% rename from Assets/Scripts/Interactable.cs rename to Assets/Scripts/WorldInteraction/Interactable.cs diff --git a/Assets/Scripts/Interactable.cs.meta b/Assets/Scripts/WorldInteraction/Interactable.cs.meta similarity index 100% rename from Assets/Scripts/Interactable.cs.meta rename to Assets/Scripts/WorldInteraction/Interactable.cs.meta diff --git a/Assets/Scripts/Item.cs b/Assets/Scripts/WorldInteraction/Item.cs similarity index 100% rename from Assets/Scripts/Item.cs rename to Assets/Scripts/WorldInteraction/Item.cs diff --git a/Assets/Scripts/Item.cs.meta b/Assets/Scripts/WorldInteraction/Item.cs.meta similarity index 100% rename from Assets/Scripts/Item.cs.meta rename to Assets/Scripts/WorldInteraction/Item.cs.meta diff --git a/Assets/Scripts/PickupableItem.cs b/Assets/Scripts/WorldInteraction/PickupableItem.cs similarity index 100% rename from Assets/Scripts/PickupableItem.cs rename to Assets/Scripts/WorldInteraction/PickupableItem.cs diff --git a/Assets/Scripts/PickupableItem.cs.meta b/Assets/Scripts/WorldInteraction/PickupableItem.cs.meta similarity index 100% rename from Assets/Scripts/PickupableItem.cs.meta rename to Assets/Scripts/WorldInteraction/PickupableItem.cs.meta diff --git a/Assets/Scripts/RoomDoor.cs b/Assets/Scripts/WorldInteraction/RoomDoor.cs similarity index 100% rename from Assets/Scripts/RoomDoor.cs rename to Assets/Scripts/WorldInteraction/RoomDoor.cs diff --git a/Assets/Scripts/RoomDoor.cs.meta b/Assets/Scripts/WorldInteraction/RoomDoor.cs.meta similarity index 100% rename from Assets/Scripts/RoomDoor.cs.meta rename to Assets/Scripts/WorldInteraction/RoomDoor.cs.meta diff --git a/Assets/Scripts/SceneDoor.cs b/Assets/Scripts/WorldInteraction/SceneDoor.cs similarity index 100% rename from Assets/Scripts/SceneDoor.cs rename to Assets/Scripts/WorldInteraction/SceneDoor.cs diff --git a/Assets/Scripts/SceneDoor.cs.meta b/Assets/Scripts/WorldInteraction/SceneDoor.cs.meta similarity index 100% rename from Assets/Scripts/SceneDoor.cs.meta rename to Assets/Scripts/WorldInteraction/SceneDoor.cs.meta diff --git a/Assets/Scripts/Talkable.cs b/Assets/Scripts/WorldInteraction/Talkable.cs similarity index 100% rename from Assets/Scripts/Talkable.cs rename to Assets/Scripts/WorldInteraction/Talkable.cs diff --git a/Assets/Scripts/Talkable.cs.meta b/Assets/Scripts/WorldInteraction/Talkable.cs.meta similarity index 100% rename from Assets/Scripts/Talkable.cs.meta rename to Assets/Scripts/WorldInteraction/Talkable.cs.meta