From 403bb2681da10bd929aa060c073e78becd90e7e6 Mon Sep 17 00:00:00 2001 From: Ryan Macham Date: Sat, 28 Mar 2026 11:28:59 +0000 Subject: [PATCH] Refactored and Cleaned up some code. First iteration of Fireplace Lockbox puzzle. Additional artwork for the end of chapter one. --- Assets/Scripts/Data/Attributes.meta | 3 +++ .../Scripts/Data/Attributes/DisplayNameAttribute.cs | 12 ++++++++++++ .../Data/Attributes/DisplayNameAttribute.cs.meta | 3 +++ .../Scripts/Framework/Extensions/EnumExtensions.cs | 7 +++++++ .../Framework/Extensions/EnumExtensions.cs.meta | 3 +++ .../Scripts/Framework/Extensions/StringExtensions.cs | 7 +++++++ .../Framework/Extensions/StringExtensions.cs.meta | 3 +++ .../ChapterOne/LaxleyHouse/FireplaceLockbox.meta | 3 --- .../Game/Puzzles/ChapterOne/Fountain/GemPuzzle.meta | 3 +++ .../Scripts/Game/Puzzles/ChapterOne/LaxleyHouse.meta | 3 +++ .../Game/Puzzles/ChapterOne/LaxleyHouse/Clock.meta | 3 +++ .../LaxleyHouse/Clock/LaxleyClockBasePuzzle.cs | 7 +++++++ .../LaxleyHouse/Clock/LaxleyClockBasePuzzle.cs.meta | 3 +++ .../ChapterOne/LaxleyHouse/Clock/LaxleyClockFace.cs | 7 +++++++ .../LaxleyHouse/Clock/LaxleyClockFace.cs.meta | 3 +++ .../ChapterOne/LaxleyHouse/Clock/LaxleyClockHand.cs | 7 +++++++ .../LaxleyHouse/Clock/LaxleyClockHand.cs.meta | 3 +++ .../Puzzles/ChapterOne/LaxleyHouse/Fireplace.meta | 3 +++ .../LaxleyHouse/Fireplace/LockboxPuzzle.meta | 3 +++ .../LockboxPuzzle}/FireplaceLockboxBasePuzzle.cs | 0 .../FireplaceLockboxBasePuzzle.cs.meta | 0 .../Fireplace/LockboxPuzzle}/LockboxSlot.cs | 0 .../Fireplace/LockboxPuzzle}/LockboxSlot.cs.meta | 0 23 files changed, 83 insertions(+), 3 deletions(-) create mode 100644 Assets/Scripts/Data/Attributes.meta create mode 100644 Assets/Scripts/Data/Attributes/DisplayNameAttribute.cs create mode 100644 Assets/Scripts/Data/Attributes/DisplayNameAttribute.cs.meta create mode 100644 Assets/Scripts/Framework/Extensions/EnumExtensions.cs create mode 100644 Assets/Scripts/Framework/Extensions/EnumExtensions.cs.meta create mode 100644 Assets/Scripts/Framework/Extensions/StringExtensions.cs create mode 100644 Assets/Scripts/Framework/Extensions/StringExtensions.cs.meta delete mode 100644 Assets/Scripts/Game/Levels/ChapterOne/LaxleyHouse/FireplaceLockbox.meta create mode 100644 Assets/Scripts/Game/Puzzles/ChapterOne/Fountain/GemPuzzle.meta create mode 100644 Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse.meta create mode 100644 Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Clock.meta create mode 100644 Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Clock/LaxleyClockBasePuzzle.cs create mode 100644 Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Clock/LaxleyClockBasePuzzle.cs.meta create mode 100644 Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Clock/LaxleyClockFace.cs create mode 100644 Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Clock/LaxleyClockFace.cs.meta create mode 100644 Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Clock/LaxleyClockHand.cs create mode 100644 Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Clock/LaxleyClockHand.cs.meta create mode 100644 Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Fireplace.meta create mode 100644 Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Fireplace/LockboxPuzzle.meta rename Assets/Scripts/Game/{Levels/ChapterOne/LaxleyHouse => Puzzles/ChapterOne/LaxleyHouse/Fireplace/LockboxPuzzle}/FireplaceLockboxBasePuzzle.cs (100%) rename Assets/Scripts/Game/{Levels/ChapterOne/LaxleyHouse => Puzzles/ChapterOne/LaxleyHouse/Fireplace/LockboxPuzzle}/FireplaceLockboxBasePuzzle.cs.meta (100%) rename Assets/Scripts/Game/{Levels/ChapterOne/LaxleyHouse/FireplaceLockbox => Puzzles/ChapterOne/LaxleyHouse/Fireplace/LockboxPuzzle}/LockboxSlot.cs (100%) rename Assets/Scripts/Game/{Levels/ChapterOne/LaxleyHouse/FireplaceLockbox => Puzzles/ChapterOne/LaxleyHouse/Fireplace/LockboxPuzzle}/LockboxSlot.cs.meta (100%) diff --git a/Assets/Scripts/Data/Attributes.meta b/Assets/Scripts/Data/Attributes.meta new file mode 100644 index 0000000..fe1d997 --- /dev/null +++ b/Assets/Scripts/Data/Attributes.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 20d9cd597e2744d68f98eb903834b661 +timeCreated: 1774614274 \ No newline at end of file diff --git a/Assets/Scripts/Data/Attributes/DisplayNameAttribute.cs b/Assets/Scripts/Data/Attributes/DisplayNameAttribute.cs new file mode 100644 index 0000000..06e8d85 --- /dev/null +++ b/Assets/Scripts/Data/Attributes/DisplayNameAttribute.cs @@ -0,0 +1,12 @@ +using System; + +[AttributeUsage(AttributeTargets.Field)] +public abstract class DisplayNameAttribute : Attribute +{ + public string Name { get; } + + public DisplayNameAttribute(string name) + { + Name = name; + } +} \ No newline at end of file diff --git a/Assets/Scripts/Data/Attributes/DisplayNameAttribute.cs.meta b/Assets/Scripts/Data/Attributes/DisplayNameAttribute.cs.meta new file mode 100644 index 0000000..3ae2a7c --- /dev/null +++ b/Assets/Scripts/Data/Attributes/DisplayNameAttribute.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 8536073ed1ba42799f3c8c77bfdf9136 +timeCreated: 1774614265 \ No newline at end of file diff --git a/Assets/Scripts/Framework/Extensions/EnumExtensions.cs b/Assets/Scripts/Framework/Extensions/EnumExtensions.cs new file mode 100644 index 0000000..b70bc54 --- /dev/null +++ b/Assets/Scripts/Framework/Extensions/EnumExtensions.cs @@ -0,0 +1,7 @@ +namespace BriarQueen.Framework.Extensions +{ + public class EnumExtensions + { + + } +} \ No newline at end of file diff --git a/Assets/Scripts/Framework/Extensions/EnumExtensions.cs.meta b/Assets/Scripts/Framework/Extensions/EnumExtensions.cs.meta new file mode 100644 index 0000000..5f57bc3 --- /dev/null +++ b/Assets/Scripts/Framework/Extensions/EnumExtensions.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: acdcb8c77cb44558bd503f7ca838cf8c +timeCreated: 1774614255 \ No newline at end of file diff --git a/Assets/Scripts/Framework/Extensions/StringExtensions.cs b/Assets/Scripts/Framework/Extensions/StringExtensions.cs new file mode 100644 index 0000000..7e0e505 --- /dev/null +++ b/Assets/Scripts/Framework/Extensions/StringExtensions.cs @@ -0,0 +1,7 @@ +namespace BriarQueen.Framework.Extensions +{ + public class StringExtensions + { + + } +} \ No newline at end of file diff --git a/Assets/Scripts/Framework/Extensions/StringExtensions.cs.meta b/Assets/Scripts/Framework/Extensions/StringExtensions.cs.meta new file mode 100644 index 0000000..4ff70d3 --- /dev/null +++ b/Assets/Scripts/Framework/Extensions/StringExtensions.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: bc1187b147674ffbb57db70f1b5a8e43 +timeCreated: 1774689780 \ No newline at end of file diff --git a/Assets/Scripts/Game/Levels/ChapterOne/LaxleyHouse/FireplaceLockbox.meta b/Assets/Scripts/Game/Levels/ChapterOne/LaxleyHouse/FireplaceLockbox.meta deleted file mode 100644 index 5c3ddb1..0000000 --- a/Assets/Scripts/Game/Levels/ChapterOne/LaxleyHouse/FireplaceLockbox.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 1ea06ccd208c462bb1311b33057131c6 -timeCreated: 1774555158 \ No newline at end of file diff --git a/Assets/Scripts/Game/Puzzles/ChapterOne/Fountain/GemPuzzle.meta b/Assets/Scripts/Game/Puzzles/ChapterOne/Fountain/GemPuzzle.meta new file mode 100644 index 0000000..4ddeb11 --- /dev/null +++ b/Assets/Scripts/Game/Puzzles/ChapterOne/Fountain/GemPuzzle.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 6edb1657de0f4759b5563de3dd625799 +timeCreated: 1774694628 \ No newline at end of file diff --git a/Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse.meta b/Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse.meta new file mode 100644 index 0000000..36610f7 --- /dev/null +++ b/Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 123b22f5870243e5ba1fdbcda4bbabde +timeCreated: 1774694641 \ No newline at end of file diff --git a/Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Clock.meta b/Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Clock.meta new file mode 100644 index 0000000..d66889c --- /dev/null +++ b/Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Clock.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 38875deca26847619404eb281c98f21c +timeCreated: 1774694667 \ No newline at end of file diff --git a/Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Clock/LaxleyClockBasePuzzle.cs b/Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Clock/LaxleyClockBasePuzzle.cs new file mode 100644 index 0000000..82b83e1 --- /dev/null +++ b/Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Clock/LaxleyClockBasePuzzle.cs @@ -0,0 +1,7 @@ +namespace BriarQueen.Game.Puzzles.ChapterOne.LaxleyHouse.Clock +{ + public class LaxleyClockBasePuzzle + { + + } +} \ No newline at end of file diff --git a/Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Clock/LaxleyClockBasePuzzle.cs.meta b/Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Clock/LaxleyClockBasePuzzle.cs.meta new file mode 100644 index 0000000..6961ba9 --- /dev/null +++ b/Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Clock/LaxleyClockBasePuzzle.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 7162a53d3fc7482389473ef98dbb6f11 +timeCreated: 1774694726 \ No newline at end of file diff --git a/Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Clock/LaxleyClockFace.cs b/Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Clock/LaxleyClockFace.cs new file mode 100644 index 0000000..1cd8b34 --- /dev/null +++ b/Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Clock/LaxleyClockFace.cs @@ -0,0 +1,7 @@ +namespace BriarQueen.Game.Puzzles.ChapterOne.LaxleyHouse.Clock +{ + public class LaxleyClockFace + { + + } +} \ No newline at end of file diff --git a/Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Clock/LaxleyClockFace.cs.meta b/Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Clock/LaxleyClockFace.cs.meta new file mode 100644 index 0000000..ff4ca65 --- /dev/null +++ b/Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Clock/LaxleyClockFace.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 86f2d2fa28bf4e8aa2e5afdf00da6dca +timeCreated: 1774694771 \ No newline at end of file diff --git a/Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Clock/LaxleyClockHand.cs b/Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Clock/LaxleyClockHand.cs new file mode 100644 index 0000000..35e6b5c --- /dev/null +++ b/Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Clock/LaxleyClockHand.cs @@ -0,0 +1,7 @@ +namespace BriarQueen.Game.Puzzles.ChapterOne.LaxleyHouse.Clock +{ + public class LaxleyClockHand + { + + } +} \ No newline at end of file diff --git a/Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Clock/LaxleyClockHand.cs.meta b/Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Clock/LaxleyClockHand.cs.meta new file mode 100644 index 0000000..b2f072a --- /dev/null +++ b/Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Clock/LaxleyClockHand.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 34468c31870143d18f90a5c285f282f9 +timeCreated: 1774695987 \ No newline at end of file diff --git a/Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Fireplace.meta b/Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Fireplace.meta new file mode 100644 index 0000000..d5ce454 --- /dev/null +++ b/Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Fireplace.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 6f8d8ac8596d463daab5ce2a1a87f08b +timeCreated: 1774694641 \ No newline at end of file diff --git a/Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Fireplace/LockboxPuzzle.meta b/Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Fireplace/LockboxPuzzle.meta new file mode 100644 index 0000000..1c61572 --- /dev/null +++ b/Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Fireplace/LockboxPuzzle.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: f90b81f7232344f3b46f2470cc93c933 +timeCreated: 1774694641 \ No newline at end of file diff --git a/Assets/Scripts/Game/Levels/ChapterOne/LaxleyHouse/FireplaceLockboxBasePuzzle.cs b/Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Fireplace/LockboxPuzzle/FireplaceLockboxBasePuzzle.cs similarity index 100% rename from Assets/Scripts/Game/Levels/ChapterOne/LaxleyHouse/FireplaceLockboxBasePuzzle.cs rename to Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Fireplace/LockboxPuzzle/FireplaceLockboxBasePuzzle.cs diff --git a/Assets/Scripts/Game/Levels/ChapterOne/LaxleyHouse/FireplaceLockboxBasePuzzle.cs.meta b/Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Fireplace/LockboxPuzzle/FireplaceLockboxBasePuzzle.cs.meta similarity index 100% rename from Assets/Scripts/Game/Levels/ChapterOne/LaxleyHouse/FireplaceLockboxBasePuzzle.cs.meta rename to Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Fireplace/LockboxPuzzle/FireplaceLockboxBasePuzzle.cs.meta diff --git a/Assets/Scripts/Game/Levels/ChapterOne/LaxleyHouse/FireplaceLockbox/LockboxSlot.cs b/Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Fireplace/LockboxPuzzle/LockboxSlot.cs similarity index 100% rename from Assets/Scripts/Game/Levels/ChapterOne/LaxleyHouse/FireplaceLockbox/LockboxSlot.cs rename to Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Fireplace/LockboxPuzzle/LockboxSlot.cs diff --git a/Assets/Scripts/Game/Levels/ChapterOne/LaxleyHouse/FireplaceLockbox/LockboxSlot.cs.meta b/Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Fireplace/LockboxPuzzle/LockboxSlot.cs.meta similarity index 100% rename from Assets/Scripts/Game/Levels/ChapterOne/LaxleyHouse/FireplaceLockbox/LockboxSlot.cs.meta rename to Assets/Scripts/Game/Puzzles/ChapterOne/LaxleyHouse/Fireplace/LockboxPuzzle/LockboxSlot.cs.meta