diff --git a/Assets/Station46/Modules/Dispenser/Scripts/Dispenser.cs b/Assets/Station46/Modules/Dispenser/Scripts/Dispenser.cs index 1eab58b..aad294c 100644 --- a/Assets/Station46/Modules/Dispenser/Scripts/Dispenser.cs +++ b/Assets/Station46/Modules/Dispenser/Scripts/Dispenser.cs @@ -1,12 +1,12 @@ using EscapeRoomEngine.Engine.Runtime.Modules; using EscapeRoomEngine.Engine.Runtime.Modules.State; using NaughtyAttributes; -using Station46.Runtime; +using Station46.Scripts; using UnityEngine; using Logger = EscapeRoomEngine.Engine.Runtime.Utilities.Logger; using LogType = EscapeRoomEngine.Engine.Runtime.Utilities.LogType; -namespace Station46.Dispenser.Scripts +namespace Station46.Modules.Dispenser.Scripts { /// /// The main component for the dispenser module. diff --git a/Assets/Station46/Modules/Dispenser/Scripts/DispenserLights.cs b/Assets/Station46/Modules/Dispenser/Scripts/DispenserLights.cs index ed1678f..e896deb 100644 --- a/Assets/Station46/Modules/Dispenser/Scripts/DispenserLights.cs +++ b/Assets/Station46/Modules/Dispenser/Scripts/DispenserLights.cs @@ -1,9 +1,9 @@ using System; using NaughtyAttributes; -using Station46.Runtime; +using Station46.Scripts; using UnityEngine; -namespace Station46.Dispenser.Scripts +namespace Station46.Modules.Dispenser.Scripts { [Serializable] public struct DispenserLightRow diff --git a/Assets/Station46/Modules/Dispenser/Scripts/DispenserOrb.cs b/Assets/Station46/Modules/Dispenser/Scripts/DispenserOrb.cs index 3fe284a..b053c23 100644 --- a/Assets/Station46/Modules/Dispenser/Scripts/DispenserOrb.cs +++ b/Assets/Station46/Modules/Dispenser/Scripts/DispenserOrb.cs @@ -1,7 +1,7 @@ -using Station46.Runtime; +using Station46.Scripts; using UnityEngine; -namespace Station46.Dispenser.Scripts +namespace Station46.Modules.Dispenser.Scripts { [RequireComponent(typeof(Rigidbody), typeof(Collider), typeof(Emission))] public class DispenserOrb : MonoBehaviour diff --git a/Assets/Station46/Modules/Hexagon/Scripts/Hexagon.cs b/Assets/Station46/Modules/Hexagon/Scripts/Hexagon.cs index 139bb8b..aeff6f6 100644 --- a/Assets/Station46/Modules/Hexagon/Scripts/Hexagon.cs +++ b/Assets/Station46/Modules/Hexagon/Scripts/Hexagon.cs @@ -4,10 +4,12 @@ using EscapeRoomEngine.Engine.Runtime.Modules.State; using EscapeRoomEngine.Engine.Runtime.Utilities; using JetBrains.Annotations; using NaughtyAttributes; -using Station46.Runtime.Puzzle_A; +using Station46.Modules.Hover_Sphere.Scripts; +using Station46.Modules.Symbols.Scripts; +using Station46.Scripts; using UnityEngine; -namespace Station46.Runtime.Puzzle_B +namespace Station46.Modules.Hexagon.Scripts { [Serializable] internal struct ButtonAction diff --git a/Assets/Station46/Modules/Hexagon/Scripts/Rotator.cs b/Assets/Station46/Modules/Hexagon/Scripts/Rotator.cs index 7ef6460..798da7d 100644 --- a/Assets/Station46/Modules/Hexagon/Scripts/Rotator.cs +++ b/Assets/Station46/Modules/Hexagon/Scripts/Rotator.cs @@ -1,7 +1,8 @@ using System; +using Station46.Scripts; using UnityEngine; -namespace Station46.Runtime.Puzzle_B +namespace Station46.Modules.Hexagon.Scripts { /// /// The rotator component used by the hexagon module. diff --git a/Assets/Station46/Modules/Holes/Scripts/Hole.cs b/Assets/Station46/Modules/Holes/Scripts/Hole.cs index 9fd2fdc..b825e9d 100644 --- a/Assets/Station46/Modules/Holes/Scripts/Hole.cs +++ b/Assets/Station46/Modules/Holes/Scripts/Hole.cs @@ -1,8 +1,8 @@ -using Station46.Dispenser.Scripts; -using Station46.Runtime; +using Station46.Modules.Dispenser.Scripts; +using Station46.Scripts; using UnityEngine; -namespace Station46.Holes.Scripts +namespace Station46.Modules.Holes.Scripts { /// /// A hole used in the module. diff --git a/Assets/Station46/Modules/Holes/Scripts/Holes.cs b/Assets/Station46/Modules/Holes/Scripts/Holes.cs index 9facf5a..af39e66 100644 --- a/Assets/Station46/Modules/Holes/Scripts/Holes.cs +++ b/Assets/Station46/Modules/Holes/Scripts/Holes.cs @@ -3,10 +3,10 @@ using EscapeRoomEngine.Engine.Runtime.Modules; using EscapeRoomEngine.Engine.Runtime.Modules.State; using EscapeRoomEngine.Engine.Runtime.Utilities; using NaughtyAttributes; -using Station46.Runtime; +using Station46.Scripts; using UnityEngine; -namespace Station46.Holes.Scripts +namespace Station46.Modules.Holes.Scripts { /// /// The main component for the orb grid module. diff --git a/Assets/Station46/Modules/Hoop/Scripts/Hoop.cs b/Assets/Station46/Modules/Hoop/Scripts/Hoop.cs index 208b180..aca47b6 100644 --- a/Assets/Station46/Modules/Hoop/Scripts/Hoop.cs +++ b/Assets/Station46/Modules/Hoop/Scripts/Hoop.cs @@ -4,10 +4,11 @@ using EscapeRoomEngine.Engine.Runtime.Modules; using EscapeRoomEngine.Engine.Runtime.Modules.State; using EscapeRoomEngine.Engine.Runtime.Utilities; using NaughtyAttributes; -using Station46.Dispenser.Scripts; +using Station46.Modules.Dispenser.Scripts; +using Station46.Scripts; using UnityEngine; -namespace Station46.Runtime +namespace Station46.Modules.Hoop.Scripts { /// /// The main component for the orb throwing module. diff --git a/Assets/Station46/Modules/Hover Sphere/Scripts/Ball.cs b/Assets/Station46/Modules/Hover Sphere/Scripts/Ball.cs index ec3075e..d83e122 100644 --- a/Assets/Station46/Modules/Hover Sphere/Scripts/Ball.cs +++ b/Assets/Station46/Modules/Hover Sphere/Scripts/Ball.cs @@ -1,8 +1,9 @@ using EscapeRoomEngine.Engine.Runtime.Modules; using EscapeRoomEngine.Engine.Runtime.Modules.State; using NaughtyAttributes; +using Station46.Scripts; -namespace Station46.Runtime.Puzzle_A +namespace Station46.Modules.Hover_Sphere.Scripts { /// /// The main component for the symbol ball module. diff --git a/Assets/Station46/Modules/Hover Sphere/Scripts/Crystal.cs b/Assets/Station46/Modules/Hover Sphere/Scripts/Crystal.cs index a3eb87d..aa7f841 100644 --- a/Assets/Station46/Modules/Hover Sphere/Scripts/Crystal.cs +++ b/Assets/Station46/Modules/Hover Sphere/Scripts/Crystal.cs @@ -1,8 +1,9 @@ using EscapeRoomEngine.Engine.Runtime.Utilities; using NaughtyAttributes; +using Station46.Scripts; using UnityEngine; -namespace Station46.Runtime +namespace Station46.Modules.Hover_Sphere.Scripts { /// /// A rotating crystal that can change colour. diff --git a/Assets/Station46/Modules/Hover Sphere/Scripts/Ring.cs b/Assets/Station46/Modules/Hover Sphere/Scripts/Ring.cs index 92979c2..7e88602 100644 --- a/Assets/Station46/Modules/Hover Sphere/Scripts/Ring.cs +++ b/Assets/Station46/Modules/Hover Sphere/Scripts/Ring.cs @@ -2,9 +2,10 @@ using System.Collections.Generic; using EscapeRoomEngine.Engine.Runtime.Utilities; using JetBrains.Annotations; using NaughtyAttributes; +using Station46.Modules.Symbols.Scripts; using UnityEngine; -namespace Station46.Runtime.Puzzle_A +namespace Station46.Modules.Hover_Sphere.Scripts { /// /// The rotating ring in the symbol ball module. diff --git a/Assets/Station46/Modules/Portal/Scripts/Station46Portal.cs b/Assets/Station46/Modules/Portal/Scripts/Station46Portal.cs index 08340c9..f5ee10c 100644 --- a/Assets/Station46/Modules/Portal/Scripts/Station46Portal.cs +++ b/Assets/Station46/Modules/Portal/Scripts/Station46Portal.cs @@ -1,7 +1,8 @@ using EscapeRoomEngine.Engine.Runtime.Modules.State; +using Station46.Scripts; using UnityEngine; -namespace Station46.Runtime.Portal +namespace Station46.Modules.Portal.Scripts { /// /// The Station 46 theme includes its own version of a portal that changes colour when it is unlocked. diff --git a/Assets/Station46/Modules/Symbols/Scripts/Symbol.cs b/Assets/Station46/Modules/Symbols/Scripts/Symbol.cs index c94139d..8037021 100644 --- a/Assets/Station46/Modules/Symbols/Scripts/Symbol.cs +++ b/Assets/Station46/Modules/Symbols/Scripts/Symbol.cs @@ -1,10 +1,12 @@ using System; using NaughtyAttributes; +using Station46.Modules.Hover_Sphere.Scripts; +using Station46.Scripts; using UnityEngine; using Logger = EscapeRoomEngine.Engine.Runtime.Utilities.Logger; using LogType = EscapeRoomEngine.Engine.Runtime.Utilities.LogType; -namespace Station46.Runtime.Puzzle_A +namespace Station46.Modules.Symbols.Scripts { public enum SymbolEventType { diff --git a/Assets/Station46/Modules/Symbols/Scripts/SymbolButton.cs b/Assets/Station46/Modules/Symbols/Scripts/SymbolButton.cs index 96bae08..6323eb4 100644 --- a/Assets/Station46/Modules/Symbols/Scripts/SymbolButton.cs +++ b/Assets/Station46/Modules/Symbols/Scripts/SymbolButton.cs @@ -1,6 +1,7 @@ -using UnityEngine; +using Station46.Scripts; +using UnityEngine; -namespace Station46.Runtime.Puzzle_A +namespace Station46.Modules.Symbols.Scripts { /// /// A that includes the number of its assigned symbol. diff --git a/Assets/Station46/Modules/Terminal/Scripts/Terminal.cs b/Assets/Station46/Modules/Terminal/Scripts/Terminal.cs index 57d6c71..da2955a 100644 --- a/Assets/Station46/Modules/Terminal/Scripts/Terminal.cs +++ b/Assets/Station46/Modules/Terminal/Scripts/Terminal.cs @@ -5,11 +5,14 @@ using EscapeRoomEngine.Engine.Runtime.Modules.State; using EscapeRoomEngine.Engine.Runtime.Utilities; using JetBrains.Annotations; using NaughtyAttributes; +using Station46.Modules.Hover_Sphere.Scripts; +using Station46.Modules.Symbols.Scripts; +using Station46.Scripts; using UnityEngine; using Logger = EscapeRoomEngine.Engine.Runtime.Utilities.Logger; using LogType = EscapeRoomEngine.Engine.Runtime.Utilities.LogType; -namespace Station46.Runtime.Puzzle_A +namespace Station46.Modules.Terminal.Scripts { /// /// The main component for the terminal module. diff --git a/Assets/Station46/Scripts/Button.cs b/Assets/Station46/Scripts/Button.cs index a176406..5c3dfdb 100644 --- a/Assets/Station46/Scripts/Button.cs +++ b/Assets/Station46/Scripts/Button.cs @@ -5,7 +5,7 @@ using UnityEngine; using Logger = EscapeRoomEngine.Engine.Runtime.Utilities.Logger; using LogType = EscapeRoomEngine.Engine.Runtime.Utilities.LogType; -namespace Station46.Runtime +namespace Station46.Scripts { public enum ButtonEventType { diff --git a/Assets/Station46/Scripts/CyclicStepPuzzle.cs b/Assets/Station46/Scripts/CyclicStepPuzzle.cs index d7d9090..53f78e1 100644 --- a/Assets/Station46/Scripts/CyclicStepPuzzle.cs +++ b/Assets/Station46/Scripts/CyclicStepPuzzle.cs @@ -1,7 +1,7 @@ using NaughtyAttributes; using UnityEngine; -namespace Station46.Runtime +namespace Station46.Scripts { /// /// A whose steps are considered a cycle that can be started anywhere and must be stepped through once. diff --git a/Assets/Station46/Scripts/Emission.cs b/Assets/Station46/Scripts/Emission.cs index e35be27..1500532 100644 --- a/Assets/Station46/Scripts/Emission.cs +++ b/Assets/Station46/Scripts/Emission.cs @@ -1,7 +1,7 @@ using NaughtyAttributes; using UnityEngine; -namespace Station46.Runtime +namespace Station46.Scripts { /// /// A general component for controlling the emission of an object. diff --git a/Assets/Station46/Scripts/HoloButton.cs b/Assets/Station46/Scripts/HoloButton.cs index 5d6a0e0..85b958a 100644 --- a/Assets/Station46/Scripts/HoloButton.cs +++ b/Assets/Station46/Scripts/HoloButton.cs @@ -1,7 +1,7 @@ using NaughtyAttributes; using UnityEngine; -namespace Station46.Runtime +namespace Station46.Scripts { /// /// A holographic that changes its colour when it is pressed. diff --git a/Assets/Station46/Scripts/StatePuzzle.cs b/Assets/Station46/Scripts/StatePuzzle.cs index 0069953..27a262b 100644 --- a/Assets/Station46/Scripts/StatePuzzle.cs +++ b/Assets/Station46/Scripts/StatePuzzle.cs @@ -5,7 +5,7 @@ using JetBrains.Annotations; using NaughtyAttributes; using UnityEngine; -namespace Station46.Runtime +namespace Station46.Scripts { /// /// The of a puzzle that requires a specific state to be solved. diff --git a/Assets/Station46/Scripts/StepPuzzle.cs b/Assets/Station46/Scripts/StepPuzzle.cs index d9d2280..80bdbcb 100644 --- a/Assets/Station46/Scripts/StepPuzzle.cs +++ b/Assets/Station46/Scripts/StepPuzzle.cs @@ -5,7 +5,7 @@ using UnityEngine; using Logger = EscapeRoomEngine.Engine.Runtime.Utilities.Logger; using LogType = EscapeRoomEngine.Engine.Runtime.Utilities.LogType; -namespace Station46.Runtime +namespace Station46.Scripts { /// /// The of a puzzle that includes a number of steps that need to be completed to solve it.