From bd2a08695e38ac3e4cec2bfb0300bd8cad9872b7 Mon Sep 17 00:00:00 2001 From: Seni Date: Tue, 2 Jun 2026 17:07:21 -0700 Subject: [PATCH 01/27] chore(engine): upgrade target to Unity 6 LTS, fix deprecated FindObjectOfType calls --- ARCHITECTURE.md | 4 ++-- CLAUDE.md | 4 ++-- ROADMAP.md | 2 +- src/Assets/_Project/Scripts/Audio/AudioManager.cs | 2 +- src/Assets/_Project/Scripts/Combat/CombatSystem.cs | 2 +- src/Assets/_Project/Scripts/Evolution/EvolutionSequencer.cs | 2 +- src/Assets/_Project/Scripts/UI/EnergyBar.cs | 2 +- src/Assets/_Project/Scripts/UI/HUD.cs | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md index fe1064d..7ae4ada 100644 --- a/ARCHITECTURE.md +++ b/ARCHITECTURE.md @@ -10,7 +10,7 @@ | Layer | Choice | Rationale | | --- | --- | --- | -| Engine | Unity 2022 LTS | Proven stable, long-term support, strong iOS export | +| Engine | Unity 6 LTS | Proven stable, long-term support, strong iOS export | | Render pipeline | URP (Universal Render Pipeline) | Mobile-optimised, supports custom shaders, good lighting | | Language | C# (.NET Standard 2.1) | Unity standard | | Input | Unity New Input System | Touch-native, action-map based | @@ -294,7 +294,7 @@ Tested on-device only. Unit tests use `IKeychainBridge` mock returning a fixed s ## Phase 1 Deliverables -- [ ] Unity 2022 LTS project created, URP configured +- [ ] Unity 6 LTS project created, URP configured - [ ] `_Project/` folder structure scaffolded - [ ] New Input System package installed and configured - [ ] `Bootstrap.unity` scene with `ServiceLocator` skeleton diff --git a/CLAUDE.md b/CLAUDE.md index fb9ddf3..e6077b8 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -6,7 +6,7 @@ Context file for Claude Code. Read this before touching any file in the repo. ## What this project is -**Project Fenrir** is a semi-open-world action RPG for iOS built in Unity 2022 LTS (URP). +**Project Fenrir** is a semi-open-world action RPG for iOS built in Unity 6 LTS (URP). The core mechanic is a **hidden trait system**: the player's behavior shapes 10 invisible traits which, when thresholds are met, trigger an **evolution** — a permanent, character-defining transformation. Full design docs are in the repo root: @@ -28,7 +28,7 @@ Read the relevant doc before changing anything in its domain. | Layer | Choice | | --- | --- | -| Engine | Unity 2022 LTS + URP | +| Engine | Unity 6 LTS + URP | | Language | C# (.NET Standard 2.1) | | Rendering | URP (Universal Render Pipeline) | | Input | Unity Input System (Enhanced Touch) | diff --git a/ROADMAP.md b/ROADMAP.md index 5d9b319..2f98a54 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -13,7 +13,7 @@ ## Phase 1 — Repo / Foundation 🔄 IN PROGRESS -**Engine:** Unity 2022 LTS | **Language:** C# | **Pipeline:** URP +**Engine:** Unity 6 LTS | **Language:** C# | **Pipeline:** URP - [ ] Unity project created, URP configured - [ ] New Input System installed diff --git a/src/Assets/_Project/Scripts/Audio/AudioManager.cs b/src/Assets/_Project/Scripts/Audio/AudioManager.cs index 28f5c8d..f5e9488 100644 --- a/src/Assets/_Project/Scripts/Audio/AudioManager.cs +++ b/src/Assets/_Project/Scripts/Audio/AudioManager.cs @@ -31,7 +31,7 @@ private void Awake() private void Start() { - var cycle = FindObjectOfType(); + var cycle = FindFirstObjectByType(); if (cycle != null) cycle.OnPhaseChanged += OnPhaseChanged; BehaviorEventBus.Subscribe(_ => StopCombatMusic()); diff --git a/src/Assets/_Project/Scripts/Combat/CombatSystem.cs b/src/Assets/_Project/Scripts/Combat/CombatSystem.cs index 6e47760..ae7e2e1 100644 --- a/src/Assets/_Project/Scripts/Combat/CombatSystem.cs +++ b/src/Assets/_Project/Scripts/Combat/CombatSystem.cs @@ -19,7 +19,7 @@ public class CombatSystem : MonoBehaviour private void Awake() { - _playerCombat = FindObjectOfType(); + _playerCombat = FindFirstObjectByType(); } /// diff --git a/src/Assets/_Project/Scripts/Evolution/EvolutionSequencer.cs b/src/Assets/_Project/Scripts/Evolution/EvolutionSequencer.cs index 63710d9..4afd082 100644 --- a/src/Assets/_Project/Scripts/Evolution/EvolutionSequencer.cs +++ b/src/Assets/_Project/Scripts/Evolution/EvolutionSequencer.cs @@ -91,7 +91,7 @@ private IEnumerator RunSequence() private static void SetInputEnabled(bool enabled) { // Disable/enable via TouchMapper found in scene - var mapper = FindObjectOfType(); + var mapper = FindFirstObjectByType(); if (mapper != null) mapper.enabled = enabled; } } diff --git a/src/Assets/_Project/Scripts/UI/EnergyBar.cs b/src/Assets/_Project/Scripts/UI/EnergyBar.cs index 768dc7f..c1b20d2 100644 --- a/src/Assets/_Project/Scripts/UI/EnergyBar.cs +++ b/src/Assets/_Project/Scripts/UI/EnergyBar.cs @@ -22,7 +22,7 @@ public class EnergyBar : MonoBehaviour private void Awake() { if (_energy == null) - _energy = FindObjectOfType(); + _energy = FindFirstObjectByType(); if (_energy != null) _energy.OnEnergyChanged += Refresh; diff --git a/src/Assets/_Project/Scripts/UI/HUD.cs b/src/Assets/_Project/Scripts/UI/HUD.cs index 3de1f37..76c8d5f 100644 --- a/src/Assets/_Project/Scripts/UI/HUD.cs +++ b/src/Assets/_Project/Scripts/UI/HUD.cs @@ -21,7 +21,7 @@ public class HUD : MonoBehaviour private void Awake() { if (_health == null) - _health = FindObjectOfType(); + _health = FindFirstObjectByType(); if (_health != null) { From 2e504c14d6457a7a72bce954c6a7909841a52eee Mon Sep 17 00:00:00 2001 From: Seni Date: Tue, 2 Jun 2026 18:10:29 -0700 Subject: [PATCH 02/27] feat(phase1): Unity project setup, scenes, packages, asmdef --- .gitignore | 18 +- .../Assets/InputSystem_Actions.inputactions | 1057 +++++++++++++++ .../InputSystem_Actions.inputactions.meta | 14 + src/ProjectFenrir/Assets/Plugins.meta | 8 + src/ProjectFenrir/Assets/Plugins/iOS.meta | 8 + .../Assets/Plugins/iOS/KeychainPlugin.swift | 70 + .../Plugins/iOS/KeychainPlugin.swift.meta | 2 + .../Assets/Plugins/iOS/iCloudPlugin.swift | 58 + .../Plugins/iOS/iCloudPlugin.swift.meta | 2 + src/ProjectFenrir/Assets/Readme.asset | 34 + src/ProjectFenrir/Assets/Readme.asset.meta | 8 + src/ProjectFenrir/Assets/Scenes.meta | 8 + .../Assets/Scenes/SampleScene.unity | 432 ++++++ .../Assets/Scenes/SampleScene.unity.meta | 7 + src/ProjectFenrir/Assets/Settings.meta | 8 + .../Settings/DefaultVolumeProfile.asset | 982 ++++++++++++++ .../Settings/DefaultVolumeProfile.asset.meta | 8 + .../Assets/Settings/Mobile_RPAsset.asset | 144 ++ .../Assets/Settings/Mobile_RPAsset.asset.meta | 8 + .../Assets/Settings/Mobile_Renderer.asset | 52 + .../Settings/Mobile_Renderer.asset.meta | 8 + .../Assets/Settings/PC_RPAsset.asset | 144 ++ .../Assets/Settings/PC_RPAsset.asset.meta | 8 + .../Assets/Settings/PC_Renderer.asset | 95 ++ .../Assets/Settings/PC_Renderer.asset.meta | 8 + .../Assets/Settings/SampleSceneProfile.asset | 159 +++ .../Settings/SampleSceneProfile.asset.meta | 8 + ...niversalRenderPipelineGlobalSettings.asset | 443 +++++++ ...salRenderPipelineGlobalSettings.asset.meta | 8 + src/ProjectFenrir/Assets/StreamingAssets.meta | 8 + .../Assets/StreamingAssets/Config.meta | 8 + .../Config/EnemyDefinitions.json | 101 ++ .../Config/EnemyDefinitions.json.meta | 7 + .../Config/EvolutionSignatures.json | 40 + .../Config/EvolutionSignatures.json.meta | 7 + .../StreamingAssets/Config/TraitWeights.json | 45 + .../Config/TraitWeights.json.meta | 7 + src/ProjectFenrir/Assets/TutorialInfo.meta | 8 + .../Assets/TutorialInfo/Icons.meta | 9 + .../Assets/TutorialInfo/Icons/URP.png | Bin 0 -> 24069 bytes .../Assets/TutorialInfo/Icons/URP.png.meta | 134 ++ .../Assets/TutorialInfo/Layout.wlt | 654 +++++++++ .../Assets/TutorialInfo/Layout.wlt.meta | 8 + .../Assets/TutorialInfo/Scripts.meta | 9 + .../Assets/TutorialInfo/Scripts/Editor.meta | 9 + .../Scripts/Editor/ReadmeEditor.cs | 242 ++++ .../Scripts/Editor/ReadmeEditor.cs.meta | 12 + .../Assets/TutorialInfo/Scripts/Readme.cs | 16 + .../TutorialInfo/Scripts/Readme.cs.meta | 12 + src/ProjectFenrir/Assets/_Project.meta | 8 + src/ProjectFenrir/Assets/_Project/Editor.meta | 8 + .../_Project/Editor/Fenrir.Editor.asmdef | 18 + .../_Project/Editor/Fenrir.Editor.asmdef.meta | 7 + .../_Project/Editor/FenrirSceneSetup.cs | 158 +++ .../_Project/Editor/FenrirSceneSetup.cs.meta | 2 + src/ProjectFenrir/Assets/_Project/Scenes.meta | 8 + .../Assets/_Project/Scenes/Awakening.unity | 492 +++++++ .../_Project/Scenes/Awakening.unity.meta | 7 + .../Assets/_Project/Scenes/Bootstrap.unity | 242 ++++ .../_Project/Scenes/Bootstrap.unity.meta | 7 + .../Assets/_Project/Scenes/EmberForest.unity | 1179 +++++++++++++++++ .../_Project/Scenes/EmberForest.unity.meta | 7 + .../Assets/_Project/Scripts.meta | 8 + .../Assets/_Project/Scripts/Analytics.meta | 8 + .../_Project/Scripts/Analytics/EventLogger.cs | 45 + .../Scripts/Analytics/EventLogger.cs.meta | 2 + .../Assets/_Project/Scripts/Audio.meta | 8 + .../_Project/Scripts/Audio/AudioManager.cs | 97 ++ .../Scripts/Audio/AudioManager.cs.meta | 2 + .../_Project/Scripts/Audio/MusicLayer.cs | 58 + .../_Project/Scripts/Audio/MusicLayer.cs.meta | 2 + .../Assets/_Project/Scripts/Audio/SFXPool.cs | 52 + .../_Project/Scripts/Audio/SFXPool.cs.meta | 2 + .../Assets/_Project/Scripts/Awakening.meta | 8 + .../Scripts/Awakening/AwakeningSequencer.cs | 94 ++ .../Awakening/AwakeningSequencer.cs.meta | 2 + .../Scripts/Awakening/ElementDistribution.cs | 79 ++ .../Awakening/ElementDistribution.cs.meta | 2 + .../Scripts/Awakening/ElementSeedService.cs | 33 + .../Awakening/ElementSeedService.cs.meta | 2 + .../Assets/_Project/Scripts/Combat.meta | 8 + .../_Project/Scripts/Combat/AttackData.cs | 28 + .../Scripts/Combat/AttackData.cs.meta | 2 + .../_Project/Scripts/Combat/AttackResolver.cs | 38 + .../Scripts/Combat/AttackResolver.cs.meta | 2 + .../_Project/Scripts/Combat/CombatSystem.cs | 59 + .../Scripts/Combat/CombatSystem.cs.meta | 2 + .../Scripts/Combat/HitStateManager.cs | 69 + .../Scripts/Combat/HitStateManager.cs.meta | 2 + .../Assets/_Project/Scripts/Config.meta | 8 + .../Assets/_Project/Scripts/Config/Element.cs | 82 ++ .../_Project/Scripts/Config/Element.cs.meta | 2 + .../_Project/Scripts/Config/GameConfig.cs | 57 + .../Scripts/Config/GameConfig.cs.meta | 2 + .../Scripts/Config/TraitWeightsConfig.cs | 67 + .../Scripts/Config/TraitWeightsConfig.cs.meta | 2 + .../Assets/_Project/Scripts/Core.meta | 8 + .../Assets/_Project/Scripts/Core/Bootstrap.cs | 132 ++ .../_Project/Scripts/Core/Bootstrap.cs.meta | 2 + .../_Project/Scripts/Core/ServiceLocator.cs | 47 + .../Scripts/Core/ServiceLocator.cs.meta | 2 + .../_Project/Scripts/Core/TaskExtensions.cs | 15 + .../Scripts/Core/TaskExtensions.cs.meta | 2 + .../Assets/_Project/Scripts/Entities.meta | 8 + .../_Project/Scripts/Entities/Creatures.meta | 8 + .../_Project/Scripts/Entities/Enemies.meta | 8 + .../Scripts/Entities/Enemies/EnemyAI.cs | 145 ++ .../Scripts/Entities/Enemies/EnemyAI.cs.meta | 2 + .../Scripts/Entities/Enemies/EnemyBase.cs | 30 + .../Entities/Enemies/EnemyBase.cs.meta | 2 + .../Scripts/Entities/Enemies/EnemyCombat.cs | 34 + .../Entities/Enemies/EnemyCombat.cs.meta | 2 + .../Scripts/Entities/Enemies/EnemyHealth.cs | 51 + .../Entities/Enemies/EnemyHealth.cs.meta | 2 + .../Entities/Enemies/EnemyTraitEmitter.cs | 28 + .../Enemies/EnemyTraitEmitter.cs.meta | 2 + .../_Project/Scripts/Entities/Player.meta | 8 + .../Scripts/Entities/Player/PlayerCombat.cs | 135 ++ .../Entities/Player/PlayerCombat.cs.meta | 2 + .../Entities/Player/PlayerController.cs | 113 ++ .../Entities/Player/PlayerController.cs.meta | 2 + .../Scripts/Entities/Player/PlayerEnergy.cs | 48 + .../Entities/Player/PlayerEnergy.cs.meta | 2 + .../Scripts/Entities/Player/PlayerHealth.cs | 137 ++ .../Entities/Player/PlayerHealth.cs.meta | 2 + .../Entities/Player/PlayerTraitEmitter.cs | 107 ++ .../Player/PlayerTraitEmitter.cs.meta | 2 + .../Assets/_Project/Scripts/Evolution.meta | 8 + .../Scripts/Evolution/EvolutionCandidate.cs | 16 + .../Evolution/EvolutionCandidate.cs.meta | 2 + .../Scripts/Evolution/EvolutionChecker.cs | 57 + .../Evolution/EvolutionChecker.cs.meta | 2 + .../Scripts/Evolution/EvolutionSequencer.cs | 98 ++ .../Evolution/EvolutionSequencer.cs.meta | 2 + .../Evolution/EvolutionSignatureConfig.cs | 42 + .../EvolutionSignatureConfig.cs.meta | 2 + .../Scripts/Evolution/IEvolutionChecker.cs | 9 + .../Evolution/IEvolutionChecker.cs.meta | 2 + .../Scripts/Evolution/ShrineController.cs | 104 ++ .../Evolution/ShrineController.cs.meta | 2 + .../_Project/Scripts/Fenrir.Runtime.asmdef | 19 + .../Scripts/Fenrir.Runtime.asmdef.meta | 7 + .../Assets/_Project/Scripts/Input.meta | 8 + .../Scripts/Input/GestureRecognizer.cs | 138 ++ .../Scripts/Input/GestureRecognizer.cs.meta | 2 + .../_Project/Scripts/Input/InputHandler.cs | 54 + .../Scripts/Input/InputHandler.cs.meta | 2 + .../_Project/Scripts/Input/TouchMapper.cs | 35 + .../Scripts/Input/TouchMapper.cs.meta | 2 + .../Assets/_Project/Scripts/Save.meta | 8 + .../_Project/Scripts/Save/ISaveManager.cs | 12 + .../Scripts/Save/ISaveManager.cs.meta | 2 + .../_Project/Scripts/Save/KeychainBridge.cs | 53 + .../Scripts/Save/KeychainBridge.cs.meta | 2 + .../Assets/_Project/Scripts/Save/SaveData.cs | 48 + .../_Project/Scripts/Save/SaveData.cs.meta | 2 + .../_Project/Scripts/Save/SaveManager.cs | 63 + .../_Project/Scripts/Save/SaveManager.cs.meta | 2 + .../Assets/_Project/Scripts/StateMachine.meta | 8 + .../_Project/Scripts/StateMachine/AppState.cs | 11 + .../Scripts/StateMachine/AppState.cs.meta | 2 + .../Scripts/StateMachine/GameState.cs | 12 + .../Scripts/StateMachine/GameState.cs.meta | 2 + .../Scripts/StateMachine/PlayerState.cs | 16 + .../Scripts/StateMachine/PlayerState.cs.meta | 2 + .../Assets/_Project/Scripts/Traits.meta | 8 + .../_Project/Scripts/Traits/BehaviorEvent.cs | 74 ++ .../Scripts/Traits/BehaviorEvent.cs.meta | 2 + .../Scripts/Traits/BehaviorEventBus.cs | 54 + .../Scripts/Traits/BehaviorEventBus.cs.meta | 2 + .../Scripts/Traits/ITraitAccumulator.cs | 12 + .../Scripts/Traits/ITraitAccumulator.cs.meta | 2 + .../Scripts/Traits/TraitAccumulator.cs | 67 + .../Scripts/Traits/TraitAccumulator.cs.meta | 2 + .../_Project/Scripts/Traits/TraitKey.cs | 16 + .../_Project/Scripts/Traits/TraitKey.cs.meta | 2 + .../_Project/Scripts/Traits/TraitProfile.cs | 54 + .../Scripts/Traits/TraitProfile.cs.meta | 2 + .../Assets/_Project/Scripts/UI.meta | 8 + .../Assets/_Project/Scripts/UI/EnergyBar.cs | 49 + .../_Project/Scripts/UI/EnergyBar.cs.meta | 2 + .../Assets/_Project/Scripts/UI/HUD.cs | 70 + .../Assets/_Project/Scripts/UI/HUD.cs.meta | 2 + .../_Project/Scripts/UI/JournalController.cs | 87 ++ .../Scripts/UI/JournalController.cs.meta | 2 + .../Assets/_Project/Scripts/World.meta | 8 + .../_Project/Scripts/World/DayNightCycle.cs | 76 ++ .../Scripts/World/DayNightCycle.cs.meta | 2 + .../Assets/_Project/Scripts/World/DayPhase.cs | 10 + .../_Project/Scripts/World/DayPhase.cs.meta | 2 + .../_Project/Scripts/World/RegionLoader.cs | 59 + .../Scripts/World/RegionLoader.cs.meta | 2 + .../_Project/Scripts/World/WorldManager.cs | 89 ++ .../Scripts/World/WorldManager.cs.meta | 2 + src/ProjectFenrir/Packages/manifest.json | 52 + src/ProjectFenrir/Packages/packages-lock.json | 506 +++++++ .../ProjectSettings/AudioManager.asset | 19 + .../ProjectSettings/ClusterInputManager.asset | 6 + .../ProjectSettings/DynamicsManager.asset | 36 + .../ProjectSettings/EditorBuildSettings.asset | 12 + .../ProjectSettings/EditorSettings.asset | 52 + .../ProjectSettings/GraphicsSettings.asset | 69 + .../ProjectSettings/InputManager.asset | 487 +++++++ .../ProjectSettings/MemorySettings.asset | 35 + .../ProjectSettings/MultiplayerManager.asset | 7 + .../ProjectSettings/NavMeshAreas.asset | 91 ++ .../PackageManagerSettings.asset | 43 + .../ProjectSettings/Physics2DSettings.asset | 56 + .../ProjectSettings/PresetManager.asset | 7 + .../ProjectSettings/ProjectSettings.asset | 941 +++++++++++++ .../ProjectSettings/ProjectVersion.txt | 2 + .../ProjectSettings/QualitySettings.asset | 134 ++ .../SceneTemplateSettings.json | 121 ++ .../ProjectSettings/ShaderGraphSettings.asset | 19 + .../ProjectSettings/TagManager.asset | 76 ++ .../ProjectSettings/TimeManager.asset | 9 + .../ProjectSettings/URPProjectSettings.asset | 16 + .../UnityConnectSettings.asset | 40 + .../ProjectSettings/VFXManager.asset | 12 + .../VersionControlSettings.asset | 8 + .../ProjectSettings/XRSettings.asset | 10 + .../EditMode/ElementDistributionTests.cs | 68 + .../Tests/EditMode/EvolutionCheckerTests.cs | 104 ++ .../EditMode/Fenrir.Tests.EditMode.asmdef | 24 + .../Tests/EditMode/SaveManagerTests.cs | 99 ++ .../Tests/EditMode/TraitAccumulatorTests.cs | 112 ++ .../Tests/EditMode/TraitProfileTests.cs | 81 ++ 227 files changed, 14280 insertions(+), 9 deletions(-) create mode 100644 src/ProjectFenrir/Assets/InputSystem_Actions.inputactions create mode 100644 src/ProjectFenrir/Assets/InputSystem_Actions.inputactions.meta create mode 100644 src/ProjectFenrir/Assets/Plugins.meta create mode 100644 src/ProjectFenrir/Assets/Plugins/iOS.meta create mode 100644 src/ProjectFenrir/Assets/Plugins/iOS/KeychainPlugin.swift create mode 100644 src/ProjectFenrir/Assets/Plugins/iOS/KeychainPlugin.swift.meta create mode 100644 src/ProjectFenrir/Assets/Plugins/iOS/iCloudPlugin.swift create mode 100644 src/ProjectFenrir/Assets/Plugins/iOS/iCloudPlugin.swift.meta create mode 100644 src/ProjectFenrir/Assets/Readme.asset create mode 100644 src/ProjectFenrir/Assets/Readme.asset.meta create mode 100644 src/ProjectFenrir/Assets/Scenes.meta create mode 100644 src/ProjectFenrir/Assets/Scenes/SampleScene.unity create mode 100644 src/ProjectFenrir/Assets/Scenes/SampleScene.unity.meta create mode 100644 src/ProjectFenrir/Assets/Settings.meta create mode 100644 src/ProjectFenrir/Assets/Settings/DefaultVolumeProfile.asset create mode 100644 src/ProjectFenrir/Assets/Settings/DefaultVolumeProfile.asset.meta create mode 100644 src/ProjectFenrir/Assets/Settings/Mobile_RPAsset.asset create mode 100644 src/ProjectFenrir/Assets/Settings/Mobile_RPAsset.asset.meta create mode 100644 src/ProjectFenrir/Assets/Settings/Mobile_Renderer.asset create mode 100644 src/ProjectFenrir/Assets/Settings/Mobile_Renderer.asset.meta create mode 100644 src/ProjectFenrir/Assets/Settings/PC_RPAsset.asset create mode 100644 src/ProjectFenrir/Assets/Settings/PC_RPAsset.asset.meta create mode 100644 src/ProjectFenrir/Assets/Settings/PC_Renderer.asset create mode 100644 src/ProjectFenrir/Assets/Settings/PC_Renderer.asset.meta create mode 100644 src/ProjectFenrir/Assets/Settings/SampleSceneProfile.asset create mode 100644 src/ProjectFenrir/Assets/Settings/SampleSceneProfile.asset.meta create mode 100644 src/ProjectFenrir/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset create mode 100644 src/ProjectFenrir/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset.meta create mode 100644 src/ProjectFenrir/Assets/StreamingAssets.meta create mode 100644 src/ProjectFenrir/Assets/StreamingAssets/Config.meta create mode 100644 src/ProjectFenrir/Assets/StreamingAssets/Config/EnemyDefinitions.json create mode 100644 src/ProjectFenrir/Assets/StreamingAssets/Config/EnemyDefinitions.json.meta create mode 100644 src/ProjectFenrir/Assets/StreamingAssets/Config/EvolutionSignatures.json create mode 100644 src/ProjectFenrir/Assets/StreamingAssets/Config/EvolutionSignatures.json.meta create mode 100644 src/ProjectFenrir/Assets/StreamingAssets/Config/TraitWeights.json create mode 100644 src/ProjectFenrir/Assets/StreamingAssets/Config/TraitWeights.json.meta create mode 100644 src/ProjectFenrir/Assets/TutorialInfo.meta create mode 100644 src/ProjectFenrir/Assets/TutorialInfo/Icons.meta create mode 100644 src/ProjectFenrir/Assets/TutorialInfo/Icons/URP.png create mode 100644 src/ProjectFenrir/Assets/TutorialInfo/Icons/URP.png.meta create mode 100644 src/ProjectFenrir/Assets/TutorialInfo/Layout.wlt create mode 100644 src/ProjectFenrir/Assets/TutorialInfo/Layout.wlt.meta create mode 100644 src/ProjectFenrir/Assets/TutorialInfo/Scripts.meta create mode 100644 src/ProjectFenrir/Assets/TutorialInfo/Scripts/Editor.meta create mode 100644 src/ProjectFenrir/Assets/TutorialInfo/Scripts/Editor/ReadmeEditor.cs create mode 100644 src/ProjectFenrir/Assets/TutorialInfo/Scripts/Editor/ReadmeEditor.cs.meta create mode 100644 src/ProjectFenrir/Assets/TutorialInfo/Scripts/Readme.cs create mode 100644 src/ProjectFenrir/Assets/TutorialInfo/Scripts/Readme.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Editor.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Editor/Fenrir.Editor.asmdef create mode 100644 src/ProjectFenrir/Assets/_Project/Editor/Fenrir.Editor.asmdef.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Editor/FenrirSceneSetup.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Editor/FenrirSceneSetup.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scenes.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scenes/Awakening.unity create mode 100644 src/ProjectFenrir/Assets/_Project/Scenes/Awakening.unity.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scenes/Bootstrap.unity create mode 100644 src/ProjectFenrir/Assets/_Project/Scenes/Bootstrap.unity.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scenes/EmberForest.unity create mode 100644 src/ProjectFenrir/Assets/_Project/Scenes/EmberForest.unity.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Analytics.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Analytics/EventLogger.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Analytics/EventLogger.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Audio.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Audio/AudioManager.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Audio/AudioManager.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Audio/MusicLayer.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Audio/MusicLayer.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Audio/SFXPool.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Audio/SFXPool.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Awakening.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Awakening/AwakeningSequencer.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Awakening/AwakeningSequencer.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Awakening/ElementDistribution.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Awakening/ElementDistribution.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Awakening/ElementSeedService.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Awakening/ElementSeedService.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Combat.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Combat/AttackData.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Combat/AttackData.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Combat/AttackResolver.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Combat/AttackResolver.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatSystem.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatSystem.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Combat/HitStateManager.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Combat/HitStateManager.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Config.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Config/Element.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Config/Element.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Config/GameConfig.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Config/GameConfig.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Config/TraitWeightsConfig.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Config/TraitWeightsConfig.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Core.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Core/Bootstrap.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Core/Bootstrap.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Core/ServiceLocator.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Core/ServiceLocator.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Core/TaskExtensions.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Core/TaskExtensions.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Entities.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Entities/Creatures.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyAI.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyAI.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyBase.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyBase.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyCombat.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyCombat.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyHealth.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyHealth.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyTraitEmitter.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyTraitEmitter.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerCombat.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerCombat.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerController.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerController.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerEnergy.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerEnergy.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerTraitEmitter.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerTraitEmitter.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Evolution.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Evolution/EvolutionCandidate.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Evolution/EvolutionCandidate.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Evolution/EvolutionChecker.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Evolution/EvolutionChecker.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Evolution/EvolutionSequencer.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Evolution/EvolutionSequencer.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Evolution/EvolutionSignatureConfig.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Evolution/EvolutionSignatureConfig.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Evolution/IEvolutionChecker.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Evolution/IEvolutionChecker.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Evolution/ShrineController.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Evolution/ShrineController.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Fenrir.Runtime.asmdef create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Fenrir.Runtime.asmdef.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Input.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Input/GestureRecognizer.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Input/GestureRecognizer.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Input/InputHandler.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Input/InputHandler.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Input/TouchMapper.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Input/TouchMapper.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Save.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Save/ISaveManager.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Save/ISaveManager.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Save/KeychainBridge.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Save/KeychainBridge.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Save/SaveData.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Save/SaveData.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Save/SaveManager.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Save/SaveManager.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/StateMachine.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/AppState.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/AppState.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/GameState.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/GameState.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/PlayerState.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/PlayerState.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Traits.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Traits/BehaviorEvent.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Traits/BehaviorEvent.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Traits/BehaviorEventBus.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Traits/BehaviorEventBus.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Traits/ITraitAccumulator.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Traits/ITraitAccumulator.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Traits/TraitAccumulator.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Traits/TraitAccumulator.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Traits/TraitKey.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Traits/TraitKey.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Traits/TraitProfile.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Traits/TraitProfile.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/UI.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/UI/EnergyBar.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/UI/EnergyBar.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/UI/HUD.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/UI/HUD.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/UI/JournalController.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/UI/JournalController.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/World.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/World/DayNightCycle.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/World/DayNightCycle.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/World/DayPhase.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/World/DayPhase.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/World/RegionLoader.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/World/RegionLoader.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/World/WorldManager.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/World/WorldManager.cs.meta create mode 100644 src/ProjectFenrir/Packages/manifest.json create mode 100644 src/ProjectFenrir/Packages/packages-lock.json create mode 100644 src/ProjectFenrir/ProjectSettings/AudioManager.asset create mode 100644 src/ProjectFenrir/ProjectSettings/ClusterInputManager.asset create mode 100644 src/ProjectFenrir/ProjectSettings/DynamicsManager.asset create mode 100644 src/ProjectFenrir/ProjectSettings/EditorBuildSettings.asset create mode 100644 src/ProjectFenrir/ProjectSettings/EditorSettings.asset create mode 100644 src/ProjectFenrir/ProjectSettings/GraphicsSettings.asset create mode 100644 src/ProjectFenrir/ProjectSettings/InputManager.asset create mode 100644 src/ProjectFenrir/ProjectSettings/MemorySettings.asset create mode 100644 src/ProjectFenrir/ProjectSettings/MultiplayerManager.asset create mode 100644 src/ProjectFenrir/ProjectSettings/NavMeshAreas.asset create mode 100644 src/ProjectFenrir/ProjectSettings/PackageManagerSettings.asset create mode 100644 src/ProjectFenrir/ProjectSettings/Physics2DSettings.asset create mode 100644 src/ProjectFenrir/ProjectSettings/PresetManager.asset create mode 100644 src/ProjectFenrir/ProjectSettings/ProjectSettings.asset create mode 100644 src/ProjectFenrir/ProjectSettings/ProjectVersion.txt create mode 100644 src/ProjectFenrir/ProjectSettings/QualitySettings.asset create mode 100644 src/ProjectFenrir/ProjectSettings/SceneTemplateSettings.json create mode 100644 src/ProjectFenrir/ProjectSettings/ShaderGraphSettings.asset create mode 100644 src/ProjectFenrir/ProjectSettings/TagManager.asset create mode 100644 src/ProjectFenrir/ProjectSettings/TimeManager.asset create mode 100644 src/ProjectFenrir/ProjectSettings/URPProjectSettings.asset create mode 100644 src/ProjectFenrir/ProjectSettings/UnityConnectSettings.asset create mode 100644 src/ProjectFenrir/ProjectSettings/VFXManager.asset create mode 100644 src/ProjectFenrir/ProjectSettings/VersionControlSettings.asset create mode 100644 src/ProjectFenrir/ProjectSettings/XRSettings.asset create mode 100644 src/ProjectFenrir/Tests/EditMode/ElementDistributionTests.cs create mode 100644 src/ProjectFenrir/Tests/EditMode/EvolutionCheckerTests.cs create mode 100644 src/ProjectFenrir/Tests/EditMode/Fenrir.Tests.EditMode.asmdef create mode 100644 src/ProjectFenrir/Tests/EditMode/SaveManagerTests.cs create mode 100644 src/ProjectFenrir/Tests/EditMode/TraitAccumulatorTests.cs create mode 100644 src/ProjectFenrir/Tests/EditMode/TraitProfileTests.cs diff --git a/.gitignore b/.gitignore index 9605b35..72e1712 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,13 @@ # ─────────────────────────────────────── -# Unity generated -# ─────────────────────────────────────── -/[Ll]ibrary/ -/[Tt]emp/ -/[Oo]bj/ -/[Bb]uild/ -/[Bb]uilds/ -/[Ll]ogs/ -/[Uu]ser[Ss]ettings/ +# Unity generated (any depth — covers src/ProjectFenrir/ and repo root) +# ─────────────────────────────────────── +[Ll]ibrary/ +[Tt]emp/ +[Oo]bj/ +[Bb]uild/ +[Bb]uilds/ +[Ll]ogs/ +[Uu]ser[Ss]ettings/ # Unity cache and packaging *.pidb.meta diff --git a/src/ProjectFenrir/Assets/InputSystem_Actions.inputactions b/src/ProjectFenrir/Assets/InputSystem_Actions.inputactions new file mode 100644 index 0000000..1a12cb9 --- /dev/null +++ b/src/ProjectFenrir/Assets/InputSystem_Actions.inputactions @@ -0,0 +1,1057 @@ +{ + "name": "InputSystem_Actions", + "maps": [ + { + "name": "Player", + "id": "df70fa95-8a34-4494-b137-73ab6b9c7d37", + "actions": [ + { + "name": "Move", + "type": "Value", + "id": "351f2ccd-1f9f-44bf-9bec-d62ac5c5f408", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Look", + "type": "Value", + "id": "6b444451-8a00-4d00-a97e-f47457f736a8", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Attack", + "type": "Button", + "id": "6c2ab1b8-8984-453a-af3d-a3c78ae1679a", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Interact", + "type": "Button", + "id": "852140f2-7766-474d-8707-702459ba45f3", + "expectedControlType": "Button", + "processors": "", + "interactions": "Hold", + "initialStateCheck": false + }, + { + "name": "Crouch", + "type": "Button", + "id": "27c5f898-bc57-4ee1-8800-db469aca5fe3", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Jump", + "type": "Button", + "id": "f1ba0d36-48eb-4cd5-b651-1c94a6531f70", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Previous", + "type": "Button", + "id": "2776c80d-3c14-4091-8c56-d04ced07a2b0", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Next", + "type": "Button", + "id": "b7230bb6-fc9b-4f52-8b25-f5e19cb2c2ba", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Sprint", + "type": "Button", + "id": "641cd816-40e6-41b4-8c3d-04687c349290", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + } + ], + "bindings": [ + { + "name": "", + "id": "978bfe49-cc26-4a3d-ab7b-7d7a29327403", + "path": "/leftStick", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Move", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "WASD", + "id": "00ca640b-d935-4593-8157-c05846ea39b3", + "path": "Dpad", + "interactions": "", + "processors": "", + "groups": "", + "action": "Move", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "e2062cb9-1b15-46a2-838c-2f8d72a0bdd9", + "path": "/w", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "up", + "id": "8180e8bd-4097-4f4e-ab88-4523101a6ce9", + "path": "/upArrow", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "320bffee-a40b-4347-ac70-c210eb8bc73a", + "path": "/s", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "1c5327b5-f71c-4f60-99c7-4e737386f1d1", + "path": "/downArrow", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "d2581a9b-1d11-4566-b27d-b92aff5fabbc", + "path": "/a", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "2e46982e-44cc-431b-9f0b-c11910bf467a", + "path": "/leftArrow", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "fcfe95b8-67b9-4526-84b5-5d0bc98d6400", + "path": "/d", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "77bff152-3580-4b21-b6de-dcd0c7e41164", + "path": "/rightArrow", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "", + "id": "1635d3fe-58b6-4ba9-a4e2-f4b964f6b5c8", + "path": "/{Primary2DAxis}", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "Move", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "3ea4d645-4504-4529-b061-ab81934c3752", + "path": "/stick", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Move", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "c1f7a91b-d0fd-4a62-997e-7fb9b69bf235", + "path": "/rightStick", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Look", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "8c8e490b-c610-4785-884f-f04217b23ca4", + "path": "/delta", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse;Touch", + "action": "Look", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "3e5f5442-8668-4b27-a940-df99bad7e831", + "path": "/{Hatswitch}", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Look", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "143bb1cd-cc10-4eca-a2f0-a3664166fe91", + "path": "/buttonWest", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Attack", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "05f6913d-c316-48b2-a6bb-e225f14c7960", + "path": "/leftButton", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Attack", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "886e731e-7071-4ae4-95c0-e61739dad6fd", + "path": "/primaryTouch/tap", + "interactions": "", + "processors": "", + "groups": ";Touch", + "action": "Attack", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "ee3d0cd2-254e-47a7-a8cb-bc94d9658c54", + "path": "/trigger", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Attack", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "8255d333-5683-4943-a58a-ccb207ff1dce", + "path": "/{PrimaryAction}", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "Attack", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "b3c1c7f0-bd20-4ee7-a0f1-899b24bca6d7", + "path": "/enter", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Attack", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "cbac6039-9c09-46a1-b5f2-4e5124ccb5ed", + "path": "/2", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Next", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "e15ca19d-e649-4852-97d5-7fe8ccc44e94", + "path": "/dpad/right", + "interactions": "", + "processors": "", + "groups": "Gamepad", + "action": "Next", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "f2e9ba44-c423-42a7-ad56-f20975884794", + "path": "/leftShift", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Sprint", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "8cbb2f4b-a784-49cc-8d5e-c010b8c7f4e6", + "path": "/leftStickPress", + "interactions": "", + "processors": "", + "groups": "Gamepad", + "action": "Sprint", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "d8bf24bf-3f2f-4160-a97c-38ec1eb520ba", + "path": "/trigger", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "Sprint", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "eb40bb66-4559-4dfa-9a2f-820438abb426", + "path": "/space", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Jump", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "daba33a1-ad0c-4742-a909-43ad1cdfbeb6", + "path": "/buttonSouth", + "interactions": "", + "processors": "", + "groups": "Gamepad", + "action": "Jump", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "603f3daf-40bd-4854-8724-93e8017f59e3", + "path": "/secondaryButton", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "Jump", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "1534dc16-a6aa-499d-9c3a-22b47347b52a", + "path": "/1", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Previous", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "25060bbd-a3a6-476e-8fba-45ae484aad05", + "path": "/dpad/left", + "interactions": "", + "processors": "", + "groups": "Gamepad", + "action": "Previous", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "1c04ea5f-b012-41d1-a6f7-02e963b52893", + "path": "/e", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Interact", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "b3f66d0b-7751-423f-908b-a11c5bd95930", + "path": "/buttonNorth", + "interactions": "", + "processors": "", + "groups": "Gamepad", + "action": "Interact", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "4f4649ac-64a8-4a73-af11-b3faef356a4d", + "path": "/buttonEast", + "interactions": "", + "processors": "", + "groups": "Gamepad", + "action": "Crouch", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "36e52cba-0905-478e-a818-f4bfcb9f3b9a", + "path": "/c", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Crouch", + "isComposite": false, + "isPartOfComposite": false + } + ] + }, + { + "name": "UI", + "id": "272f6d14-89ba-496f-b7ff-215263d3219f", + "actions": [ + { + "name": "Navigate", + "type": "PassThrough", + "id": "c95b2375-e6d9-4b88-9c4c-c5e76515df4b", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Submit", + "type": "Button", + "id": "7607c7b6-cd76-4816-beef-bd0341cfe950", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Cancel", + "type": "Button", + "id": "15cef263-9014-4fd5-94d9-4e4a6234a6ef", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Point", + "type": "PassThrough", + "id": "32b35790-4ed0-4e9a-aa41-69ac6d629449", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Click", + "type": "PassThrough", + "id": "3c7022bf-7922-4f7c-a998-c437916075ad", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "RightClick", + "type": "PassThrough", + "id": "44b200b1-1557-4083-816c-b22cbdf77ddf", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "MiddleClick", + "type": "PassThrough", + "id": "dad70c86-b58c-4b17-88ad-f5e53adf419e", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "ScrollWheel", + "type": "PassThrough", + "id": "0489e84a-4833-4c40-bfae-cea84b696689", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "TrackedDevicePosition", + "type": "PassThrough", + "id": "24908448-c609-4bc3-a128-ea258674378a", + "expectedControlType": "Vector3", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "TrackedDeviceOrientation", + "type": "PassThrough", + "id": "9caa3d8a-6b2f-4e8e-8bad-6ede561bd9be", + "expectedControlType": "Quaternion", + "processors": "", + "interactions": "", + "initialStateCheck": false + } + ], + "bindings": [ + { + "name": "Gamepad", + "id": "809f371f-c5e2-4e7a-83a1-d867598f40dd", + "path": "2DVector", + "interactions": "", + "processors": "", + "groups": "", + "action": "Navigate", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "14a5d6e8-4aaf-4119-a9ef-34b8c2c548bf", + "path": "/leftStick/up", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "up", + "id": "9144cbe6-05e1-4687-a6d7-24f99d23dd81", + "path": "/rightStick/up", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "2db08d65-c5fb-421b-983f-c71163608d67", + "path": "/leftStick/down", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "58748904-2ea9-4a80-8579-b500e6a76df8", + "path": "/rightStick/down", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "8ba04515-75aa-45de-966d-393d9bbd1c14", + "path": "/leftStick/left", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "712e721c-bdfb-4b23-a86c-a0d9fcfea921", + "path": "/rightStick/left", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "fcd248ae-a788-4676-a12e-f4d81205600b", + "path": "/leftStick/right", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "1f04d9bc-c50b-41a1-bfcc-afb75475ec20", + "path": "/rightStick/right", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "", + "id": "fb8277d4-c5cd-4663-9dc7-ee3f0b506d90", + "path": "/dpad", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "Joystick", + "id": "e25d9774-381c-4a61-b47c-7b6b299ad9f9", + "path": "2DVector", + "interactions": "", + "processors": "", + "groups": "", + "action": "Navigate", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "3db53b26-6601-41be-9887-63ac74e79d19", + "path": "/stick/up", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "0cb3e13e-3d90-4178-8ae6-d9c5501d653f", + "path": "/stick/down", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "0392d399-f6dd-4c82-8062-c1e9c0d34835", + "path": "/stick/left", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "942a66d9-d42f-43d6-8d70-ecb4ba5363bc", + "path": "/stick/right", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "Keyboard", + "id": "ff527021-f211-4c02-933e-5976594c46ed", + "path": "2DVector", + "interactions": "", + "processors": "", + "groups": "", + "action": "Navigate", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "563fbfdd-0f09-408d-aa75-8642c4f08ef0", + "path": "/w", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "up", + "id": "eb480147-c587-4a33-85ed-eb0ab9942c43", + "path": "/upArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "2bf42165-60bc-42ca-8072-8c13ab40239b", + "path": "/s", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "85d264ad-e0a0-4565-b7ff-1a37edde51ac", + "path": "/downArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "74214943-c580-44e4-98eb-ad7eebe17902", + "path": "/a", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "cea9b045-a000-445b-95b8-0c171af70a3b", + "path": "/leftArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "8607c725-d935-4808-84b1-8354e29bab63", + "path": "/d", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "4cda81dc-9edd-4e03-9d7c-a71a14345d0b", + "path": "/rightArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "", + "id": "9e92bb26-7e3b-4ec4-b06b-3c8f8e498ddc", + "path": "*/{Submit}", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse;Gamepad;Touch;Joystick;XR", + "action": "Submit", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "82627dcc-3b13-4ba9-841d-e4b746d6553e", + "path": "*/{Cancel}", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse;Gamepad;Touch;Joystick;XR", + "action": "Cancel", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "c52c8e0b-8179-41d3-b8a1-d149033bbe86", + "path": "/position", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Point", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "e1394cbc-336e-44ce-9ea8-6007ed6193f7", + "path": "/position", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Point", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "5693e57a-238a-46ed-b5ae-e64e6e574302", + "path": "/touch*/position", + "interactions": "", + "processors": "", + "groups": "Touch", + "action": "Point", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "4faf7dc9-b979-4210-aa8c-e808e1ef89f5", + "path": "/leftButton", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "8d66d5ba-88d7-48e6-b1cd-198bbfef7ace", + "path": "/tip", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "47c2a644-3ebc-4dae-a106-589b7ca75b59", + "path": "/touch*/press", + "interactions": "", + "processors": "", + "groups": "Touch", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "bb9e6b34-44bf-4381-ac63-5aa15d19f677", + "path": "/trigger", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "38c99815-14ea-4617-8627-164d27641299", + "path": "/scroll", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "ScrollWheel", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "4c191405-5738-4d4b-a523-c6a301dbf754", + "path": "/rightButton", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "RightClick", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "24066f69-da47-44f3-a07e-0015fb02eb2e", + "path": "/middleButton", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "MiddleClick", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "7236c0d9-6ca3-47cf-a6ee-a97f5b59ea77", + "path": "/devicePosition", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "TrackedDevicePosition", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "23e01e3a-f935-4948-8d8b-9bcac77714fb", + "path": "/deviceRotation", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "TrackedDeviceOrientation", + "isComposite": false, + "isPartOfComposite": false + } + ] + } + ], + "controlSchemes": [ + { + "name": "Keyboard&Mouse", + "bindingGroup": "Keyboard&Mouse", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + }, + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + }, + { + "name": "Gamepad", + "bindingGroup": "Gamepad", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + }, + { + "name": "Touch", + "bindingGroup": "Touch", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + }, + { + "name": "Joystick", + "bindingGroup": "Joystick", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + }, + { + "name": "XR", + "bindingGroup": "XR", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + } + ] +} \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/InputSystem_Actions.inputactions.meta b/src/ProjectFenrir/Assets/InputSystem_Actions.inputactions.meta new file mode 100644 index 0000000..6b38b04 --- /dev/null +++ b/src/ProjectFenrir/Assets/InputSystem_Actions.inputactions.meta @@ -0,0 +1,14 @@ +fileFormatVersion: 2 +guid: 052faaac586de48259a63d0c4782560b +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 8404be70184654265930450def6a9037, type: 3} + generateWrapperCode: 0 + wrapperCodePath: + wrapperClassName: + wrapperCodeNamespace: diff --git a/src/ProjectFenrir/Assets/Plugins.meta b/src/ProjectFenrir/Assets/Plugins.meta new file mode 100644 index 0000000..f95561a --- /dev/null +++ b/src/ProjectFenrir/Assets/Plugins.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8b652d6a6d34f42ed9f62f3c9aa35e7f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/Plugins/iOS.meta b/src/ProjectFenrir/Assets/Plugins/iOS.meta new file mode 100644 index 0000000..b6a4fa6 --- /dev/null +++ b/src/ProjectFenrir/Assets/Plugins/iOS.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5a6efb48b6ed64e6898f9acaafc1db38 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/Plugins/iOS/KeychainPlugin.swift b/src/ProjectFenrir/Assets/Plugins/iOS/KeychainPlugin.swift new file mode 100644 index 0000000..abc0f9a --- /dev/null +++ b/src/ProjectFenrir/Assets/Plugins/iOS/KeychainPlugin.swift @@ -0,0 +1,70 @@ +import Foundation +import Security + +@objc public class KeychainPlugin: NSObject { + + private static let service = "com.fenrir.projectfenrir" + + @objc public static func getSeed(key: String) -> String? { + let query: [String: Any] = [ + kSecClass as String: kSecClassGenericPassword, + kSecAttrService as String: service, + kSecAttrAccount as String: key, + kSecReturnData as String: true, + kSecMatchLimit as String: kSecMatchLimitOne + ] + + var result: AnyObject? + let status = SecItemCopyMatching(query as CFDictionary, &result) + + guard status == errSecSuccess, + let data = result as? Data, + let value = String(data: data, encoding: .utf8) + else { return nil } + + return value + } + + @objc public static func setSeed(key: String, value: String) -> Bool { + guard let data = value.data(using: .utf8) else { return false } + + // Delete any existing entry first + let deleteQuery: [String: Any] = [ + kSecClass as String: kSecClassGenericPassword, + kSecAttrService as String: service, + kSecAttrAccount as String: key + ] + SecItemDelete(deleteQuery as CFDictionary) + + let addQuery: [String: Any] = [ + kSecClass as String: kSecClassGenericPassword, + kSecAttrService as String: service, + kSecAttrAccount as String: key, + kSecValueData as String: data, + kSecAttrAccessible as String: kSecAttrAccessibleAfterFirstUnlockThisDeviceOnly + ] + + let status = SecItemAdd(addQuery as CFDictionary, nil) + return status == errSecSuccess + } +} + +// ── C-callable shims for Unity DllImport ───────────────────────────────────── + +@_cdecl("Keychain_GetSeed") +func Keychain_GetSeed(key: UnsafePointer) -> UnsafePointer? { + let keyString = String(cString: key) + guard let value = KeychainPlugin.getSeed(key: keyString) else { return nil } + // Caller does not free — returned pointer lives in a static buffer per call. + // Unity marshals the value before the next call. + let buffer = UnsafeMutablePointer.allocate(capacity: value.utf8.count + 1) + value.withCString { src in _ = strcpy(buffer, src) } + return UnsafePointer(buffer) +} + +@_cdecl("Keychain_SetSeed") +func Keychain_SetSeed(key: UnsafePointer, value: UnsafePointer) -> Bool { + let keyString = String(cString: key) + let valueString = String(cString: value) + return KeychainPlugin.setSeed(key: keyString, value: valueString) +} diff --git a/src/ProjectFenrir/Assets/Plugins/iOS/KeychainPlugin.swift.meta b/src/ProjectFenrir/Assets/Plugins/iOS/KeychainPlugin.swift.meta new file mode 100644 index 0000000..0ec78bf --- /dev/null +++ b/src/ProjectFenrir/Assets/Plugins/iOS/KeychainPlugin.swift.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 7cbfe256b2ae647d58358a539d049ff7 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/Plugins/iOS/iCloudPlugin.swift b/src/ProjectFenrir/Assets/Plugins/iOS/iCloudPlugin.swift new file mode 100644 index 0000000..9100582 --- /dev/null +++ b/src/ProjectFenrir/Assets/Plugins/iOS/iCloudPlugin.swift @@ -0,0 +1,58 @@ +import Foundation + +/// Wraps NSUbiquitousKeyValueStore for optional iCloud save sync. +/// Player opt-in only. Never syncs Keychain slot seeds — those are intentionally device-bound. +@objc public class iCloudPlugin: NSObject { + + private static let saveKey = "fenrir_save_json" + private static let store = NSUbiquitousKeyValueStore.default + + /// Returns true if iCloud Key-Value Store is available on this device/account. + @objc public static func isAvailable() -> Bool { + return store.dictionaryRepresentation.count >= 0 // always succeeds when iCloud is configured + } + + /// Writes the full JSON save string to iCloud KV store and flushes synchronously. + @objc public static func uploadSave(json: String) -> Bool { + store.set(json, forKey: saveKey) + return store.synchronize() + } + + /// Returns the iCloud-stored save JSON, or nil if not found. + @objc public static func downloadSave() -> String? { + store.synchronize() + return store.string(forKey: saveKey) + } + + /// Clears the iCloud entry (e.g. on explicit player opt-out). + @objc public static func deleteSave() { + store.removeObject(forKey: saveKey) + store.synchronize() + } +} + +// ── C-callable shims for Unity DllImport ───────────────────────────────────── + +@_cdecl("iCloud_IsAvailable") +func iCloud_IsAvailable() -> Bool { + return iCloudPlugin.isAvailable() +} + +@_cdecl("iCloud_UploadSave") +func iCloud_UploadSave(json: UnsafePointer) -> Bool { + let jsonString = String(cString: json) + return iCloudPlugin.uploadSave(json: jsonString) +} + +@_cdecl("iCloud_DownloadSave") +func iCloud_DownloadSave() -> UnsafePointer? { + guard let value = iCloudPlugin.downloadSave() else { return nil } + let buffer = UnsafeMutablePointer.allocate(capacity: value.utf8.count + 1) + value.withCString { src in _ = strcpy(buffer, src) } + return UnsafePointer(buffer) +} + +@_cdecl("iCloud_DeleteSave") +func iCloud_DeleteSave() { + iCloudPlugin.deleteSave() +} diff --git a/src/ProjectFenrir/Assets/Plugins/iOS/iCloudPlugin.swift.meta b/src/ProjectFenrir/Assets/Plugins/iOS/iCloudPlugin.swift.meta new file mode 100644 index 0000000..6c5e983 --- /dev/null +++ b/src/ProjectFenrir/Assets/Plugins/iOS/iCloudPlugin.swift.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 015c1d97926a04253a59a7d6e85582e2 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/Readme.asset b/src/ProjectFenrir/Assets/Readme.asset new file mode 100644 index 0000000..77c2f83 --- /dev/null +++ b/src/ProjectFenrir/Assets/Readme.asset @@ -0,0 +1,34 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fcf7219bab7fe46a1ad266029b2fee19, type: 3} + m_Name: Readme + m_EditorClassIdentifier: + icon: {fileID: 2800000, guid: 727a75301c3d24613a3ebcec4a24c2c8, type: 3} + title: URP Empty Template + sections: + - heading: Welcome to the Universal Render Pipeline + text: This template includes the settings and assets you need to start creating with the Universal Render Pipeline. + linkText: + url: + - heading: URP Documentation + text: + linkText: Read more about URP + url: https://docs.unity3d.com/Packages/com.unity.render-pipelines.universal@latest + - heading: Forums + text: + linkText: Get answers and support + url: https://forum.unity.com/forums/universal-render-pipeline.383/ + - heading: Report bugs + text: + linkText: Submit a report + url: https://unity3d.com/unity/qa/bug-reporting + loadedLayout: 1 diff --git a/src/ProjectFenrir/Assets/Readme.asset.meta b/src/ProjectFenrir/Assets/Readme.asset.meta new file mode 100644 index 0000000..ab3ad45 --- /dev/null +++ b/src/ProjectFenrir/Assets/Readme.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8105016687592461f977c054a80ce2f2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/Scenes.meta b/src/ProjectFenrir/Assets/Scenes.meta new file mode 100644 index 0000000..bcbbc65 --- /dev/null +++ b/src/ProjectFenrir/Assets/Scenes.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 13bbe19c65232490fb7209a807604715 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/Scenes/SampleScene.unity b/src/ProjectFenrir/Assets/Scenes/SampleScene.unity new file mode 100644 index 0000000..1c63aa8 --- /dev/null +++ b/src/ProjectFenrir/Assets/Scenes/SampleScene.unity @@ -0,0 +1,432 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 10 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + 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_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 3 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &330585543 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 330585546} + - component: {fileID: 330585545} + - component: {fileID: 330585544} + - component: {fileID: 330585547} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &330585544 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 330585543} + m_Enabled: 1 +--- !u!20 &330585545 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 330585543} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &330585546 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 330585543} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &330585547 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 330585543} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 1 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 + m_TaaSettings: + quality: 3 + frameInfluence: 0.1 + jitterScale: 1 + mipBias: 0 + varianceClampScale: 0.9 + contrastAdaptiveSharpening: 0 +--- !u!1 &410087039 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 410087041} + - component: {fileID: 410087040} + - component: {fileID: 410087042} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &410087040 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 410087039} + m_Enabled: 1 + serializedVersion: 11 + m_Type: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 2 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 5000 + m_UseColorTemperature: 1 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &410087041 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 410087039} + serializedVersion: 2 + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!114 &410087042 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 410087039} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 3 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_RenderingLayers: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 1 +--- !u!1 &832575517 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 832575519} + - component: {fileID: 832575518} + m_Layer: 0 + m_Name: Global Volume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &832575518 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 832575517} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IsGlobal: 1 + priority: 0 + blendDistance: 0 + weight: 1 + sharedProfile: {fileID: 11400000, guid: 10fc4df2da32a41aaa32d77bc913491c, type: 2} +--- !u!4 &832575519 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 832575517} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 330585546} + - {fileID: 410087041} + - {fileID: 832575519} diff --git a/src/ProjectFenrir/Assets/Scenes/SampleScene.unity.meta b/src/ProjectFenrir/Assets/Scenes/SampleScene.unity.meta new file mode 100644 index 0000000..9531828 --- /dev/null +++ b/src/ProjectFenrir/Assets/Scenes/SampleScene.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 99c9720ab356a0642a771bea13969a05 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/Settings.meta b/src/ProjectFenrir/Assets/Settings.meta new file mode 100644 index 0000000..39b94dd --- /dev/null +++ b/src/ProjectFenrir/Assets/Settings.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 709f11a7f3c4041caa4ef136ea32d874 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/Settings/DefaultVolumeProfile.asset b/src/ProjectFenrir/Assets/Settings/DefaultVolumeProfile.asset new file mode 100644 index 0000000..6fb1822 --- /dev/null +++ b/src/ProjectFenrir/Assets/Settings/DefaultVolumeProfile.asset @@ -0,0 +1,982 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-9167874883656233139 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5485954d14dfb9a4c8ead8edb0ded5b1, type: 3} + m_Name: LiftGammaGain + m_EditorClassIdentifier: + active: 1 + lift: + m_OverrideState: 1 + m_Value: {x: 1, y: 1, z: 1, w: 0} + gamma: + m_OverrideState: 1 + m_Value: {x: 1, y: 1, z: 1, w: 0} + gain: + m_OverrideState: 1 + m_Value: {x: 1, y: 1, z: 1, w: 0} +--- !u!114 &-8270506406425502121 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 70afe9e12c7a7ed47911bb608a23a8ff, type: 3} + m_Name: SplitToning + m_EditorClassIdentifier: + active: 1 + shadows: + m_OverrideState: 1 + m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} + highlights: + m_OverrideState: 1 + m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} + balance: + m_OverrideState: 1 + m_Value: 0 +--- !u!114 &-8104416584915340131 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 0} + m_Name: CopyPasteTestComponent2 + m_EditorClassIdentifier: Unity.RenderPipelines.Core.Editor.Tests:UnityEditor.Rendering.Tests:VolumeComponentCopyPasteTests/CopyPasteTestComponent2 + active: 1 + p1: + m_OverrideState: 1 + m_Value: 0 + p2: + m_OverrideState: 1 + m_Value: 0 + p21: + m_OverrideState: 1 + m_Value: 0 +--- !u!114 &-7750755424749557576 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60f3b30c03e6ba64d9a27dc9dba8f28d, type: 3} + m_Name: OutlineVolumeComponent + m_EditorClassIdentifier: + active: 1 + Enabled: + m_OverrideState: 1 + m_Value: 0 +--- !u!114 &-7743500325797982168 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ccf1aba9553839d41ae37dd52e9ebcce, type: 3} + m_Name: MotionBlur + m_EditorClassIdentifier: + active: 1 + mode: + m_OverrideState: 1 + m_Value: 0 + quality: + m_OverrideState: 1 + m_Value: 0 + intensity: + m_OverrideState: 1 + m_Value: 0 + clamp: + m_OverrideState: 1 + m_Value: 0.05 +--- !u!114 &-7274224791359825572 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0fd9ee276a1023e439cf7a9c393195fa, type: 3} + m_Name: TestAnimationCurveVolumeComponent + m_EditorClassIdentifier: + active: 1 + testParameter: + m_OverrideState: 1 + m_Value: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.5 + value: 10 + inSlope: 0 + outSlope: 10 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 15 + inSlope: 10 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &-6335409530604852063 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 66f335fb1ffd8684294ad653bf1c7564, type: 3} + m_Name: ColorAdjustments + m_EditorClassIdentifier: + active: 1 + postExposure: + m_OverrideState: 1 + m_Value: 0 + contrast: + m_OverrideState: 1 + m_Value: 0 + colorFilter: + m_OverrideState: 1 + m_Value: {r: 1, g: 1, b: 1, a: 1} + hueShift: + m_OverrideState: 1 + m_Value: 0 + saturation: + m_OverrideState: 1 + m_Value: 0 +--- !u!114 &-6288072647309666549 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 29fa0085f50d5e54f8144f766051a691, type: 3} + m_Name: FilmGrain + m_EditorClassIdentifier: + active: 1 + type: + m_OverrideState: 1 + m_Value: 0 + intensity: + m_OverrideState: 1 + m_Value: 0 + response: + m_OverrideState: 1 + m_Value: 0.8 + texture: + m_OverrideState: 1 + m_Value: {fileID: 0} +--- !u!114 &-5520245016509672950 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 97c23e3b12dc18c42a140437e53d3951, type: 3} + m_Name: Tonemapping + m_EditorClassIdentifier: + active: 1 + mode: + m_OverrideState: 1 + m_Value: 0 + neutralHDRRangeReductionMode: + m_OverrideState: 1 + m_Value: 2 + acesPreset: + m_OverrideState: 1 + m_Value: 3 + hueShiftAmount: + m_OverrideState: 1 + m_Value: 0 + detectPaperWhite: + m_OverrideState: 1 + m_Value: 0 + paperWhite: + m_OverrideState: 1 + m_Value: 300 + detectBrightnessLimits: + m_OverrideState: 1 + m_Value: 1 + minNits: + m_OverrideState: 1 + m_Value: 0.005 + maxNits: + m_OverrideState: 1 + m_Value: 1000 +--- !u!114 &-5360449096862653589 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 0} + m_Name: VolumeComponentSupportedEverywhere + m_EditorClassIdentifier: Unity.RenderPipelines.Core.Editor.Tests:UnityEngine.Rendering.Tests:VolumeComponentEditorSupportedOnTests/VolumeComponentSupportedEverywhere + active: 1 +--- !u!114 &-5139089513906902183 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a00a63fdd6bd2a45ab1f2d869305ffd, type: 3} + m_Name: OasisFogVolumeComponent + m_EditorClassIdentifier: + active: 1 + Density: + m_OverrideState: 1 + m_Value: 0 + StartDistance: + m_OverrideState: 1 + m_Value: 0 + HeightRange: + m_OverrideState: 1 + m_Value: {x: 0, y: 50} + Tint: + m_OverrideState: 1 + m_Value: {r: 1, g: 1, b: 1, a: 1} + SunScatteringIntensity: + m_OverrideState: 1 + m_Value: 2 +--- !u!114 &-4463884970436517307 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fb60a22f311433c4c962b888d1393f88, type: 3} + m_Name: PaniniProjection + m_EditorClassIdentifier: + active: 1 + distance: + m_OverrideState: 1 + m_Value: 0 + cropToFit: + m_OverrideState: 1 + m_Value: 1 +--- !u!114 &-1410297666881709256 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6bd486065ce11414fa40e631affc4900, type: 3} + m_Name: ProbeVolumesOptions + m_EditorClassIdentifier: + active: 1 + normalBias: + m_OverrideState: 1 + m_Value: 0.33 + viewBias: + m_OverrideState: 1 + m_Value: 0 + scaleBiasWithMinProbeDistance: + m_OverrideState: 1 + m_Value: 0 + samplingNoise: + m_OverrideState: 1 + m_Value: 0.1 + animateSamplingNoise: + m_OverrideState: 1 + m_Value: 1 + leakReductionMode: + m_OverrideState: 1 + m_Value: 1 + minValidDotProductValue: + m_OverrideState: 1 + m_Value: 0.1 + occlusionOnlyReflectionNormalization: + m_OverrideState: 1 + m_Value: 1 + intensityMultiplier: + m_OverrideState: 1 + m_Value: 1 + skyOcclusionIntensityMultiplier: + m_OverrideState: 1 + m_Value: 1 +--- !u!114 &-1216621516061285780 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0b2db86121404754db890f4c8dfe81b2, type: 3} + m_Name: Bloom + m_EditorClassIdentifier: + active: 1 + skipIterations: + m_OverrideState: 1 + m_Value: 1 + threshold: + m_OverrideState: 1 + m_Value: 0.9 + intensity: + m_OverrideState: 1 + m_Value: 0 + scatter: + m_OverrideState: 1 + m_Value: 0.7 + clamp: + m_OverrideState: 1 + m_Value: 65472 + tint: + m_OverrideState: 1 + m_Value: {r: 1, g: 1, b: 1, a: 1} + highQualityFiltering: + m_OverrideState: 1 + m_Value: 0 + downscale: + m_OverrideState: 1 + m_Value: 0 + maxIterations: + m_OverrideState: 1 + m_Value: 6 + dirtTexture: + m_OverrideState: 1 + m_Value: {fileID: 0} + dimension: 1 + dirtIntensity: + m_OverrideState: 1 + m_Value: 0 +--- !u!114 &-1170528603972255243 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 221518ef91623a7438a71fef23660601, type: 3} + m_Name: WhiteBalance + m_EditorClassIdentifier: + active: 1 + temperature: + m_OverrideState: 1 + m_Value: 0 + tint: + m_OverrideState: 1 + m_Value: 0 +--- !u!114 &-581120513425526550 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 0} + m_Name: CopyPasteTestComponent3 + m_EditorClassIdentifier: Unity.RenderPipelines.Core.Editor.Tests:UnityEditor.Rendering.Tests:VolumeComponentCopyPasteTests/CopyPasteTestComponent3 + active: 1 + p1: + m_OverrideState: 1 + m_Value: 0 + p2: + m_OverrideState: 1 + m_Value: 0 + p31: + m_OverrideState: 1 + m_Value: {r: 0, g: 0, b: 0, a: 1} +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3} + m_Name: DefaultVolumeProfile + m_EditorClassIdentifier: + components: + - {fileID: -9167874883656233139} + - {fileID: 1918650496244738858} + - {fileID: 853819529557874667} + - {fileID: 1052315754049611418} + - {fileID: -1170528603972255243} + - {fileID: -8270506406425502121} + - {fileID: -5520245016509672950} + - {fileID: 7173750748008157695} + - {fileID: 1666464333004379222} + - {fileID: 9001657382290151224} + - {fileID: -6335409530604852063} + - {fileID: -1216621516061285780} + - {fileID: 3959858460715838825} + - {fileID: -7743500325797982168} + - {fileID: 4644742534064026673} + - {fileID: -4463884970436517307} + - {fileID: -6288072647309666549} + - {fileID: 7518938298396184218} + - {fileID: -1410297666881709256} + - {fileID: -7750755424749557576} + - {fileID: -5139089513906902183} +--- !u!114 &853819529557874667 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 06437c1ff663d574d9447842ba0a72e4, type: 3} + m_Name: ScreenSpaceLensFlare + m_EditorClassIdentifier: + active: 1 + intensity: + m_OverrideState: 1 + m_Value: 0 + tintColor: + m_OverrideState: 1 + m_Value: {r: 1, g: 1, b: 1, a: 1} + bloomMip: + m_OverrideState: 1 + m_Value: 1 + firstFlareIntensity: + m_OverrideState: 1 + m_Value: 1 + secondaryFlareIntensity: + m_OverrideState: 1 + m_Value: 1 + warpedFlareIntensity: + m_OverrideState: 1 + m_Value: 1 + warpedFlareScale: + m_OverrideState: 1 + m_Value: {x: 1, y: 1} + samples: + m_OverrideState: 1 + m_Value: 1 + sampleDimmer: + m_OverrideState: 1 + m_Value: 0.5 + vignetteEffect: + m_OverrideState: 1 + m_Value: 1 + startingPosition: + m_OverrideState: 1 + m_Value: 1.25 + scale: + m_OverrideState: 1 + m_Value: 1.5 + streaksIntensity: + m_OverrideState: 1 + m_Value: 0 + streaksLength: + m_OverrideState: 1 + m_Value: 0.5 + streaksOrientation: + m_OverrideState: 1 + m_Value: 0 + streaksThreshold: + m_OverrideState: 1 + m_Value: 0.25 + resolution: + m_OverrideState: 1 + m_Value: 4 + chromaticAbberationIntensity: + m_OverrideState: 1 + m_Value: 0.5 +--- !u!114 &1052315754049611418 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 558a8e2b6826cf840aae193990ba9f2e, type: 3} + m_Name: ShadowsMidtonesHighlights + m_EditorClassIdentifier: + active: 1 + shadows: + m_OverrideState: 1 + m_Value: {x: 1, y: 1, z: 1, w: 0} + midtones: + m_OverrideState: 1 + m_Value: {x: 1, y: 1, z: 1, w: 0} + highlights: + m_OverrideState: 1 + m_Value: {x: 1, y: 1, z: 1, w: 0} + shadowsStart: + m_OverrideState: 1 + m_Value: 0 + shadowsEnd: + m_OverrideState: 1 + m_Value: 0.3 + highlightsStart: + m_OverrideState: 1 + m_Value: 0.55 + highlightsEnd: + m_OverrideState: 1 + m_Value: 1 +--- !u!114 &1666464333004379222 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3eb4b772797da9440885e8bd939e9560, type: 3} + m_Name: ColorCurves + m_EditorClassIdentifier: + active: 1 + master: + m_OverrideState: 1 + m_Value: + k__BackingField: 2 + m_Loop: 0 + m_ZeroValue: 0 + m_Range: 1 + m_Curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 1 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 1 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + red: + m_OverrideState: 1 + m_Value: + k__BackingField: 2 + m_Loop: 0 + m_ZeroValue: 0 + m_Range: 1 + m_Curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 1 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 1 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + green: + m_OverrideState: 1 + m_Value: + k__BackingField: 2 + m_Loop: 0 + m_ZeroValue: 0 + m_Range: 1 + m_Curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 1 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 1 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + blue: + m_OverrideState: 1 + m_Value: + k__BackingField: 2 + m_Loop: 0 + m_ZeroValue: 0 + m_Range: 1 + m_Curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 1 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 1 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + hueVsHue: + m_OverrideState: 1 + m_Value: + k__BackingField: 0 + m_Loop: 1 + m_ZeroValue: 0.5 + m_Range: 1 + m_Curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + hueVsSat: + m_OverrideState: 1 + m_Value: + k__BackingField: 0 + m_Loop: 1 + m_ZeroValue: 0.5 + m_Range: 1 + m_Curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + satVsSat: + m_OverrideState: 1 + m_Value: + k__BackingField: 0 + m_Loop: 0 + m_ZeroValue: 0.5 + m_Range: 1 + m_Curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + lumVsSat: + m_OverrideState: 1 + m_Value: + k__BackingField: 0 + m_Loop: 0 + m_ZeroValue: 0.5 + m_Range: 1 + m_Curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &1918650496244738858 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e021b4c809a781e468c2988c016ebbea, type: 3} + m_Name: ColorLookup + m_EditorClassIdentifier: + active: 1 + texture: + m_OverrideState: 1 + m_Value: {fileID: 0} + dimension: 1 + contribution: + m_OverrideState: 1 + m_Value: 0 +--- !u!114 &3959858460715838825 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c01700fd266d6914ababb731e09af2eb, type: 3} + m_Name: DepthOfField + m_EditorClassIdentifier: + active: 1 + mode: + m_OverrideState: 1 + m_Value: 0 + gaussianStart: + m_OverrideState: 1 + m_Value: 10 + gaussianEnd: + m_OverrideState: 1 + m_Value: 30 + gaussianMaxRadius: + m_OverrideState: 1 + m_Value: 1 + highQualitySampling: + m_OverrideState: 1 + m_Value: 0 + focusDistance: + m_OverrideState: 1 + m_Value: 10 + aperture: + m_OverrideState: 1 + m_Value: 5.6 + focalLength: + m_OverrideState: 1 + m_Value: 50 + bladeCount: + m_OverrideState: 1 + m_Value: 5 + bladeCurvature: + m_OverrideState: 1 + m_Value: 1 + bladeRotation: + m_OverrideState: 1 + m_Value: 0 +--- !u!114 &4251301726029935498 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 74955a4b0b4243bc87231e8b59ed9140, type: 3} + m_Name: TestVolume + m_EditorClassIdentifier: + active: 1 + param: + m_OverrideState: 1 + m_Value: 123 +--- !u!114 &4644742534064026673 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 81180773991d8724ab7f2d216912b564, type: 3} + m_Name: ChromaticAberration + m_EditorClassIdentifier: + active: 1 + intensity: + m_OverrideState: 1 + m_Value: 0 +--- !u!114 &6940869943325143175 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 0} + m_Name: VolumeComponentSupportedOnAnySRP + m_EditorClassIdentifier: Unity.RenderPipelines.Core.Editor.Tests:UnityEngine.Rendering.Tests:VolumeComponentEditorSupportedOnTests/VolumeComponentSupportedOnAnySRP + active: 1 +--- !u!114 &7173750748008157695 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 899c54efeace73346a0a16faa3afe726, type: 3} + m_Name: Vignette + m_EditorClassIdentifier: + active: 1 + color: + m_OverrideState: 1 + m_Value: {r: 0, g: 0, b: 0, a: 1} + center: + m_OverrideState: 1 + m_Value: {x: 0.5, y: 0.5} + intensity: + m_OverrideState: 1 + m_Value: 0 + smoothness: + m_OverrideState: 1 + m_Value: 0.2 + rounded: + m_OverrideState: 1 + m_Value: 0 +--- !u!114 &7518938298396184218 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c5e1dc532bcb41949b58bc4f2abfbb7e, type: 3} + m_Name: LensDistortion + m_EditorClassIdentifier: + active: 1 + intensity: + m_OverrideState: 1 + m_Value: 0 + xMultiplier: + m_OverrideState: 1 + m_Value: 1 + yMultiplier: + m_OverrideState: 1 + m_Value: 1 + center: + m_OverrideState: 1 + m_Value: {x: 0.5, y: 0.5} + scale: + m_OverrideState: 1 + m_Value: 1 +--- !u!114 &9001657382290151224 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cdfbdbb87d3286943a057f7791b43141, type: 3} + m_Name: ChannelMixer + m_EditorClassIdentifier: + active: 1 + redOutRedIn: + m_OverrideState: 1 + m_Value: 100 + redOutGreenIn: + m_OverrideState: 1 + m_Value: 0 + redOutBlueIn: + m_OverrideState: 1 + m_Value: 0 + greenOutRedIn: + m_OverrideState: 1 + m_Value: 0 + greenOutGreenIn: + m_OverrideState: 1 + m_Value: 100 + greenOutBlueIn: + m_OverrideState: 1 + m_Value: 0 + blueOutRedIn: + m_OverrideState: 1 + m_Value: 0 + blueOutGreenIn: + m_OverrideState: 1 + m_Value: 0 + blueOutBlueIn: + m_OverrideState: 1 + m_Value: 100 +--- !u!114 &9122958982931076880 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 0} + m_Name: CopyPasteTestComponent1 + m_EditorClassIdentifier: Unity.RenderPipelines.Core.Editor.Tests:UnityEditor.Rendering.Tests:VolumeComponentCopyPasteTests/CopyPasteTestComponent1 + active: 1 + p1: + m_OverrideState: 1 + m_Value: 0 + p2: + m_OverrideState: 1 + m_Value: 0 diff --git a/src/ProjectFenrir/Assets/Settings/DefaultVolumeProfile.asset.meta b/src/ProjectFenrir/Assets/Settings/DefaultVolumeProfile.asset.meta new file mode 100644 index 0000000..53b314a --- /dev/null +++ b/src/ProjectFenrir/Assets/Settings/DefaultVolumeProfile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ab09877e2e707104187f6f83e2f62510 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/Settings/Mobile_RPAsset.asset b/src/ProjectFenrir/Assets/Settings/Mobile_RPAsset.asset new file mode 100644 index 0000000..4ccfb70 --- /dev/null +++ b/src/ProjectFenrir/Assets/Settings/Mobile_RPAsset.asset @@ -0,0 +1,144 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} + m_Name: Mobile_RPAsset + m_EditorClassIdentifier: + k_AssetVersion: 13 + k_AssetPreviousVersion: 13 + m_RendererType: 1 + m_RendererData: {fileID: 0} + m_RendererDataList: + - {fileID: 11400000, guid: 65bc7dbf4170f435aa868c779acfb082, type: 2} + m_DefaultRendererIndex: 0 + m_RequireDepthTexture: 0 + m_RequireOpaqueTexture: 0 + m_OpaqueDownsampling: 0 + m_SupportsTerrainHoles: 1 + m_SupportsHDR: 1 + m_HDRColorBufferPrecision: 0 + m_MSAA: 1 + m_RenderScale: 0.8 + m_UpscalingFilter: 0 + m_FsrOverrideSharpness: 0 + m_FsrSharpness: 0.92 + m_EnableLODCrossFade: 1 + m_LODCrossFadeDitheringType: 1 + m_ShEvalMode: 0 + m_LightProbeSystem: 0 + m_ProbeVolumeMemoryBudget: 1024 + m_ProbeVolumeBlendingMemoryBudget: 256 + m_SupportProbeVolumeGPUStreaming: 0 + m_SupportProbeVolumeDiskStreaming: 0 + m_SupportProbeVolumeScenarios: 0 + m_SupportProbeVolumeScenarioBlending: 0 + m_ProbeVolumeSHBands: 1 + m_MainLightRenderingMode: 1 + m_MainLightShadowsSupported: 1 + m_MainLightShadowmapResolution: 1024 + m_AdditionalLightsRenderingMode: 1 + m_AdditionalLightsPerObjectLimit: 4 + m_AdditionalLightShadowsSupported: 0 + m_AdditionalLightsShadowmapResolution: 2048 + m_AdditionalLightsShadowResolutionTierLow: 256 + m_AdditionalLightsShadowResolutionTierMedium: 512 + m_AdditionalLightsShadowResolutionTierHigh: 1024 + m_ReflectionProbeBlending: 1 + m_ReflectionProbeBoxProjection: 1 + m_ReflectionProbeAtlas: 1 + m_ShadowDistance: 50 + m_ShadowCascadeCount: 1 + m_Cascade2Split: 0.25 + m_Cascade3Split: {x: 0.1, y: 0.3} + m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467} + m_CascadeBorder: 0.2 + m_ShadowDepthBias: 1 + m_ShadowNormalBias: 1 + m_AnyShadowsSupported: 1 + m_SoftShadowsSupported: 0 + m_ConservativeEnclosingSphere: 1 + m_NumIterationsEnclosingSphere: 64 + m_SoftShadowQuality: 2 + m_AdditionalLightsCookieResolution: 1024 + m_AdditionalLightsCookieFormat: 1 + m_UseSRPBatcher: 1 + m_SupportsDynamicBatching: 0 + m_MixedLightingSupported: 1 + m_SupportsLightCookies: 1 + m_SupportsLightLayers: 1 + m_DebugLevel: 0 + m_StoreActionsOptimization: 0 + m_UseAdaptivePerformance: 1 + m_ColorGradingMode: 0 + m_ColorGradingLutSize: 32 + m_AllowPostProcessAlphaOutput: 0 + m_UseFastSRGBLinearConversion: 1 + m_SupportDataDrivenLensFlare: 1 + m_SupportScreenSpaceLensFlare: 1 + m_GPUResidentDrawerMode: 0 + m_SmallMeshScreenPercentage: 0 + m_GPUResidentDrawerEnableOcclusionCullingInCameras: 0 + m_ShadowType: 1 + m_LocalShadowsSupported: 0 + m_LocalShadowsAtlasResolution: 256 + m_MaxPixelLights: 0 + m_ShadowAtlasResolution: 256 + m_VolumeFrameworkUpdateMode: 0 + m_VolumeProfile: {fileID: 11400000, guid: 10fc4df2da32a41aaa32d77bc913491c, type: 2} + apvScenesData: + obsoleteSceneBounds: + m_Keys: [] + m_Values: [] + obsoleteHasProbeVolumes: + m_Keys: [] + m_Values: + m_PrefilteringModeMainLightShadows: 3 + m_PrefilteringModeAdditionalLight: 4 + m_PrefilteringModeAdditionalLightShadows: 0 + m_PrefilterXRKeywords: 1 + m_PrefilteringModeForwardPlus: 1 + m_PrefilteringModeDeferredRendering: 0 + m_PrefilteringModeScreenSpaceOcclusion: 0 + m_PrefilterDebugKeywords: 1 + m_PrefilterWriteRenderingLayers: 1 + m_PrefilterHDROutput: 1 + m_PrefilterAlphaOutput: 0 + m_PrefilterSSAODepthNormals: 1 + m_PrefilterSSAOSourceDepthLow: 1 + m_PrefilterSSAOSourceDepthMedium: 0 + m_PrefilterSSAOSourceDepthHigh: 1 + m_PrefilterSSAOInterleaved: 0 + m_PrefilterSSAOBlueNoise: 1 + m_PrefilterSSAOSampleCountLow: 1 + m_PrefilterSSAOSampleCountMedium: 0 + m_PrefilterSSAOSampleCountHigh: 1 + m_PrefilterDBufferMRT1: 1 + m_PrefilterDBufferMRT2: 1 + m_PrefilterDBufferMRT3: 1 + m_PrefilterSoftShadowsQualityLow: 1 + m_PrefilterSoftShadowsQualityMedium: 1 + m_PrefilterSoftShadowsQualityHigh: 1 + m_PrefilterSoftShadows: 0 + m_PrefilterScreenCoord: 1 + m_PrefilterScreenSpaceIrradiance: 0 + m_PrefilterNativeRenderPass: 1 + m_PrefilterUseLegacyLightmaps: 0 + m_PrefilterBicubicLightmapSampling: 0 + m_PrefilterReflectionProbeRotation: 0 + m_PrefilterReflectionProbeBlending: 0 + m_PrefilterReflectionProbeBoxProjection: 0 + m_PrefilterReflectionProbeAtlas: 0 + m_PrefilterPointSamplingUpsampling: 0 + m_ShaderVariantLogLevel: 0 + m_ShadowCascades: 0 + m_Textures: + blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} + bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} diff --git a/src/ProjectFenrir/Assets/Settings/Mobile_RPAsset.asset.meta b/src/ProjectFenrir/Assets/Settings/Mobile_RPAsset.asset.meta new file mode 100644 index 0000000..3660d15 --- /dev/null +++ b/src/ProjectFenrir/Assets/Settings/Mobile_RPAsset.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5e6cbd92db86f4b18aec3ed561671858 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/Settings/Mobile_Renderer.asset b/src/ProjectFenrir/Assets/Settings/Mobile_Renderer.asset new file mode 100644 index 0000000..ea246b2 --- /dev/null +++ b/src/ProjectFenrir/Assets/Settings/Mobile_Renderer.asset @@ -0,0 +1,52 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3} + m_Name: Mobile_Renderer + m_EditorClassIdentifier: + debugShaders: + debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, + type: 3} + hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3} + probeVolumeSamplingDebugComputeShader: {fileID: 7200000, guid: 53626a513ea68ce47b59dc1299fe3959, + type: 3} + probeVolumeResources: + probeVolumeDebugShader: {fileID: 0} + probeVolumeFragmentationDebugShader: {fileID: 0} + probeVolumeOffsetDebugShader: {fileID: 0} + probeVolumeSamplingDebugShader: {fileID: 0} + probeSamplingDebugMesh: {fileID: 0} + probeSamplingDebugTexture: {fileID: 0} + probeVolumeBlendStatesCS: {fileID: 0} + m_RendererFeatures: [] + m_RendererFeatureMap: + m_UseNativeRenderPass: 1 + postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} + m_AssetVersion: 2 + m_OpaqueLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_TransparentLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_DefaultStencilState: + overrideStencilState: 0 + stencilReference: 0 + stencilCompareFunction: 8 + passOperation: 2 + failOperation: 0 + zFailOperation: 0 + m_ShadowTransparentReceive: 0 + m_RenderingMode: 0 + m_DepthPrimingMode: 0 + m_CopyDepthMode: 0 + m_AccurateGbufferNormals: 0 + m_IntermediateTextureMode: 0 diff --git a/src/ProjectFenrir/Assets/Settings/Mobile_Renderer.asset.meta b/src/ProjectFenrir/Assets/Settings/Mobile_Renderer.asset.meta new file mode 100644 index 0000000..a3588b1 --- /dev/null +++ b/src/ProjectFenrir/Assets/Settings/Mobile_Renderer.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 65bc7dbf4170f435aa868c779acfb082 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/Settings/PC_RPAsset.asset b/src/ProjectFenrir/Assets/Settings/PC_RPAsset.asset new file mode 100644 index 0000000..d918ef6 --- /dev/null +++ b/src/ProjectFenrir/Assets/Settings/PC_RPAsset.asset @@ -0,0 +1,144 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} + m_Name: PC_RPAsset + m_EditorClassIdentifier: + k_AssetVersion: 13 + k_AssetPreviousVersion: 13 + m_RendererType: 1 + m_RendererData: {fileID: 0} + m_RendererDataList: + - {fileID: 11400000, guid: f288ae1f4751b564a96ac7587541f7a2, type: 2} + m_DefaultRendererIndex: 0 + m_RequireDepthTexture: 1 + m_RequireOpaqueTexture: 1 + m_OpaqueDownsampling: 1 + m_SupportsTerrainHoles: 1 + m_SupportsHDR: 1 + m_HDRColorBufferPrecision: 0 + m_MSAA: 1 + m_RenderScale: 1 + m_UpscalingFilter: 0 + m_FsrOverrideSharpness: 0 + m_FsrSharpness: 0.92 + m_EnableLODCrossFade: 1 + m_LODCrossFadeDitheringType: 1 + m_ShEvalMode: 0 + m_LightProbeSystem: 0 + m_ProbeVolumeMemoryBudget: 1024 + m_ProbeVolumeBlendingMemoryBudget: 256 + m_SupportProbeVolumeGPUStreaming: 0 + m_SupportProbeVolumeDiskStreaming: 0 + m_SupportProbeVolumeScenarios: 0 + m_SupportProbeVolumeScenarioBlending: 0 + m_ProbeVolumeSHBands: 1 + m_MainLightRenderingMode: 1 + m_MainLightShadowsSupported: 1 + m_MainLightShadowmapResolution: 2048 + m_AdditionalLightsRenderingMode: 1 + m_AdditionalLightsPerObjectLimit: 4 + m_AdditionalLightShadowsSupported: 1 + m_AdditionalLightsShadowmapResolution: 2048 + m_AdditionalLightsShadowResolutionTierLow: 256 + m_AdditionalLightsShadowResolutionTierMedium: 512 + m_AdditionalLightsShadowResolutionTierHigh: 1024 + m_ReflectionProbeBlending: 1 + m_ReflectionProbeBoxProjection: 1 + m_ReflectionProbeAtlas: 1 + m_ShadowDistance: 50 + m_ShadowCascadeCount: 4 + m_Cascade2Split: 0.25 + m_Cascade3Split: {x: 0.1, y: 0.3} + m_Cascade4Split: {x: 0.12299999, y: 0.2926, z: 0.53599995} + m_CascadeBorder: 0.107758604 + m_ShadowDepthBias: 0.1 + m_ShadowNormalBias: 0.5 + m_AnyShadowsSupported: 1 + m_SoftShadowsSupported: 1 + m_ConservativeEnclosingSphere: 1 + m_NumIterationsEnclosingSphere: 64 + m_SoftShadowQuality: 3 + m_AdditionalLightsCookieResolution: 2048 + m_AdditionalLightsCookieFormat: 3 + m_UseSRPBatcher: 1 + m_SupportsDynamicBatching: 0 + m_MixedLightingSupported: 1 + m_SupportsLightCookies: 1 + m_SupportsLightLayers: 1 + m_DebugLevel: 0 + m_StoreActionsOptimization: 0 + m_UseAdaptivePerformance: 1 + m_ColorGradingMode: 0 + m_ColorGradingLutSize: 32 + m_AllowPostProcessAlphaOutput: 0 + m_UseFastSRGBLinearConversion: 0 + m_SupportDataDrivenLensFlare: 1 + m_SupportScreenSpaceLensFlare: 1 + m_GPUResidentDrawerMode: 0 + m_SmallMeshScreenPercentage: 0 + m_GPUResidentDrawerEnableOcclusionCullingInCameras: 0 + m_ShadowType: 1 + m_LocalShadowsSupported: 0 + m_LocalShadowsAtlasResolution: 256 + m_MaxPixelLights: 0 + m_ShadowAtlasResolution: 256 + m_VolumeFrameworkUpdateMode: 0 + m_VolumeProfile: {fileID: 11400000, guid: 10fc4df2da32a41aaa32d77bc913491c, type: 2} + apvScenesData: + obsoleteSceneBounds: + m_Keys: [] + m_Values: [] + obsoleteHasProbeVolumes: + m_Keys: [] + m_Values: + m_PrefilteringModeMainLightShadows: 3 + m_PrefilteringModeAdditionalLight: 4 + m_PrefilteringModeAdditionalLightShadows: 0 + m_PrefilterXRKeywords: 1 + m_PrefilteringModeForwardPlus: 1 + m_PrefilteringModeDeferredRendering: 0 + m_PrefilteringModeScreenSpaceOcclusion: 1 + m_PrefilterDebugKeywords: 1 + m_PrefilterWriteRenderingLayers: 0 + m_PrefilterHDROutput: 1 + m_PrefilterAlphaOutput: 0 + m_PrefilterSSAODepthNormals: 0 + m_PrefilterSSAOSourceDepthLow: 1 + m_PrefilterSSAOSourceDepthMedium: 1 + m_PrefilterSSAOSourceDepthHigh: 1 + m_PrefilterSSAOInterleaved: 1 + m_PrefilterSSAOBlueNoise: 0 + m_PrefilterSSAOSampleCountLow: 1 + m_PrefilterSSAOSampleCountMedium: 0 + m_PrefilterSSAOSampleCountHigh: 1 + m_PrefilterDBufferMRT1: 1 + m_PrefilterDBufferMRT2: 1 + m_PrefilterDBufferMRT3: 0 + m_PrefilterSoftShadowsQualityLow: 0 + m_PrefilterSoftShadowsQualityMedium: 0 + m_PrefilterSoftShadowsQualityHigh: 0 + m_PrefilterSoftShadows: 0 + m_PrefilterScreenCoord: 1 + m_PrefilterScreenSpaceIrradiance: 0 + m_PrefilterNativeRenderPass: 1 + m_PrefilterUseLegacyLightmaps: 0 + m_PrefilterBicubicLightmapSampling: 0 + m_PrefilterReflectionProbeRotation: 0 + m_PrefilterReflectionProbeBlending: 0 + m_PrefilterReflectionProbeBoxProjection: 0 + m_PrefilterReflectionProbeAtlas: 0 + m_PrefilterPointSamplingUpsampling: 0 + m_ShaderVariantLogLevel: 0 + m_ShadowCascades: 0 + m_Textures: + blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} + bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} diff --git a/src/ProjectFenrir/Assets/Settings/PC_RPAsset.asset.meta b/src/ProjectFenrir/Assets/Settings/PC_RPAsset.asset.meta new file mode 100644 index 0000000..e286b2f --- /dev/null +++ b/src/ProjectFenrir/Assets/Settings/PC_RPAsset.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4b83569d67af61e458304325a23e5dfd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/Settings/PC_Renderer.asset b/src/ProjectFenrir/Assets/Settings/PC_Renderer.asset new file mode 100644 index 0000000..475b02e --- /dev/null +++ b/src/ProjectFenrir/Assets/Settings/PC_Renderer.asset @@ -0,0 +1,95 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3} + m_Name: PC_Renderer + m_EditorClassIdentifier: + debugShaders: + debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, + type: 3} + hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3} + probeVolumeSamplingDebugComputeShader: {fileID: 7200000, guid: 53626a513ea68ce47b59dc1299fe3959, + type: 3} + probeVolumeResources: + probeVolumeDebugShader: {fileID: 4800000, guid: e5c6678ed2aaa91408dd3df699057aae, + type: 3} + probeVolumeFragmentationDebugShader: {fileID: 4800000, guid: 03cfc4915c15d504a9ed85ecc404e607, + type: 3} + probeVolumeOffsetDebugShader: {fileID: 4800000, guid: 53a11f4ebaebf4049b3638ef78dc9664, + type: 3} + probeVolumeSamplingDebugShader: {fileID: 4800000, guid: 8f96cd657dc40064aa21efcc7e50a2e7, + type: 3} + probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 57d7c4c16e2765b47a4d2069b311bffe, + type: 3} + probeSamplingDebugTexture: {fileID: 2800000, guid: 24ec0e140fb444a44ab96ee80844e18e, + type: 3} + probeVolumeBlendStatesCS: {fileID: 7200000, guid: b9a23f869c4fd45f19c5ada54dd82176, + type: 3} + m_RendererFeatures: + - {fileID: 7833122117494664109} + m_RendererFeatureMap: ad6b866f10d7b46c + m_UseNativeRenderPass: 1 + postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} + m_AssetVersion: 2 + m_OpaqueLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_TransparentLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_DefaultStencilState: + overrideStencilState: 0 + stencilReference: 1 + stencilCompareFunction: 3 + passOperation: 2 + failOperation: 0 + zFailOperation: 0 + m_ShadowTransparentReceive: 1 + m_RenderingMode: 2 + m_DepthPrimingMode: 0 + m_CopyDepthMode: 0 + m_AccurateGbufferNormals: 0 + m_IntermediateTextureMode: 0 +--- !u!114 &7833122117494664109 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f62c9c65cf3354c93be831c8bc075510, type: 3} + m_Name: ScreenSpaceAmbientOcclusion + m_EditorClassIdentifier: + m_Active: 1 + m_Settings: + AOMethod: 0 + Downsample: 0 + AfterOpaque: 0 + Source: 1 + NormalSamples: 1 + Intensity: 0.4 + DirectLightingStrength: 0.25 + Radius: 0.3 + Samples: 1 + BlurQuality: 0 + Falloff: 100 + SampleCount: -1 + m_BlueNoise256Textures: + - {fileID: 2800000, guid: 36f118343fc974119bee3d09e2111500, type: 3} + - {fileID: 2800000, guid: 4b7b083e6b6734e8bb2838b0b50a0bc8, type: 3} + - {fileID: 2800000, guid: c06cc21c692f94f5fb5206247191eeee, type: 3} + - {fileID: 2800000, guid: cb76dd40fa7654f9587f6a344f125c9a, type: 3} + - {fileID: 2800000, guid: e32226222ff144b24bf3a5a451de54bc, type: 3} + - {fileID: 2800000, guid: 3302065f671a8450b82c9ddf07426f3a, type: 3} + - {fileID: 2800000, guid: 56a77a3e8d64f47b6afe9e3c95cb57d5, type: 3} + m_Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3} diff --git a/src/ProjectFenrir/Assets/Settings/PC_Renderer.asset.meta b/src/ProjectFenrir/Assets/Settings/PC_Renderer.asset.meta new file mode 100644 index 0000000..ddae6a5 --- /dev/null +++ b/src/ProjectFenrir/Assets/Settings/PC_Renderer.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f288ae1f4751b564a96ac7587541f7a2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/Settings/SampleSceneProfile.asset b/src/ProjectFenrir/Assets/Settings/SampleSceneProfile.asset new file mode 100644 index 0000000..c1b0f63 --- /dev/null +++ b/src/ProjectFenrir/Assets/Settings/SampleSceneProfile.asset @@ -0,0 +1,159 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7893295128165547882 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0b2db86121404754db890f4c8dfe81b2, type: 3} + m_Name: Bloom + m_EditorClassIdentifier: + active: 1 + skipIterations: + m_OverrideState: 1 + m_Value: 0 + threshold: + m_OverrideState: 1 + m_Value: 1 + intensity: + m_OverrideState: 1 + m_Value: 0.25 + scatter: + m_OverrideState: 1 + m_Value: 0.5 + clamp: + m_OverrideState: 0 + m_Value: 65472 + tint: + m_OverrideState: 0 + m_Value: {r: 1, g: 1, b: 1, a: 1} + highQualityFiltering: + m_OverrideState: 1 + m_Value: 1 + downscale: + m_OverrideState: 0 + m_Value: 0 + maxIterations: + m_OverrideState: 0 + m_Value: 6 + dirtTexture: + m_OverrideState: 0 + m_Value: {fileID: 0} + dimension: 1 + dirtIntensity: + m_OverrideState: 0 + m_Value: 0 +--- !u!114 &-3357603926938260329 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 899c54efeace73346a0a16faa3afe726, type: 3} + m_Name: Vignette + m_EditorClassIdentifier: + active: 1 + color: + m_OverrideState: 0 + m_Value: {r: 0, g: 0, b: 0, a: 1} + center: + m_OverrideState: 0 + m_Value: {x: 0.5, y: 0.5} + intensity: + m_OverrideState: 1 + m_Value: 0.2 + smoothness: + m_OverrideState: 0 + m_Value: 0.2 + rounded: + m_OverrideState: 0 + m_Value: 0 +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3} + m_Name: SampleSceneProfile + m_EditorClassIdentifier: + components: + - {fileID: 849379129802519247} + - {fileID: -7893295128165547882} + - {fileID: 7391319092446245454} + - {fileID: -3357603926938260329} +--- !u!114 &849379129802519247 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 97c23e3b12dc18c42a140437e53d3951, type: 3} + m_Name: Tonemapping + m_EditorClassIdentifier: + active: 1 + mode: + m_OverrideState: 1 + m_Value: 1 + neutralHDRRangeReductionMode: + m_OverrideState: 0 + m_Value: 2 + acesPreset: + m_OverrideState: 0 + m_Value: 3 + hueShiftAmount: + m_OverrideState: 0 + m_Value: 0 + detectPaperWhite: + m_OverrideState: 1 + m_Value: 0 + paperWhite: + m_OverrideState: 1 + m_Value: 234 + detectBrightnessLimits: + m_OverrideState: 1 + m_Value: 1 + minNits: + m_OverrideState: 1 + m_Value: 0.005 + maxNits: + m_OverrideState: 1 + m_Value: 647 +--- !u!114 &7391319092446245454 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ccf1aba9553839d41ae37dd52e9ebcce, type: 3} + m_Name: MotionBlur + m_EditorClassIdentifier: + active: 0 + mode: + m_OverrideState: 0 + m_Value: 0 + quality: + m_OverrideState: 1 + m_Value: 2 + intensity: + m_OverrideState: 1 + m_Value: 0.6 + clamp: + m_OverrideState: 0 + m_Value: 0.05 diff --git a/src/ProjectFenrir/Assets/Settings/SampleSceneProfile.asset.meta b/src/ProjectFenrir/Assets/Settings/SampleSceneProfile.asset.meta new file mode 100644 index 0000000..b82270c --- /dev/null +++ b/src/ProjectFenrir/Assets/Settings/SampleSceneProfile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 10fc4df2da32a41aaa32d77bc913491c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset b/src/ProjectFenrir/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset new file mode 100644 index 0000000..8b0387a --- /dev/null +++ b/src/ProjectFenrir/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset @@ -0,0 +1,443 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2ec995e51a6e251468d2a3fd8a686257, type: 3} + m_Name: UniversalRenderPipelineGlobalSettings + m_EditorClassIdentifier: + m_ShaderStrippingSetting: + m_Version: 0 + m_ExportShaderVariants: 1 + m_ShaderVariantLogLevel: 0 + m_StripRuntimeDebugShaders: 1 + m_URPShaderStrippingSetting: + m_Version: 0 + m_StripUnusedPostProcessingVariants: 1 + m_StripUnusedVariants: 1 + m_StripScreenCoordOverrideVariants: 1 + m_ShaderVariantLogLevel: 0 + m_ExportShaderVariants: 1 + m_StripDebugVariants: 1 + m_StripUnusedPostProcessingVariants: 1 + m_StripUnusedVariants: 1 + m_StripScreenCoordOverrideVariants: 1 + supportRuntimeDebugDisplay: 0 + m_Settings: + m_SettingsList: + m_List: + - rid: 6852985685364965376 + - rid: 6852985685364965377 + - rid: 6852985685364965378 + - rid: 6852985685364965379 + - rid: 6852985685364965380 + - rid: 6852985685364965381 + - rid: 6852985685364965382 + - rid: 6852985685364965383 + - rid: 6852985685364965384 + - rid: 6852985685364965385 + - rid: 6852985685364965386 + - rid: 6852985685364965387 + - rid: 6852985685364965388 + - rid: 6852985685364965389 + - rid: 6852985685364965390 + - rid: 6852985685364965391 + - rid: 6852985685364965392 + - rid: 6852985685364965393 + - rid: 6852985685364965394 + - rid: 8712630790384254976 + - rid: 8790098553149325315 + - rid: 8790098553149325316 + - rid: 8790098553149325317 + - rid: 8790098553149325318 + - rid: 8790098553149325319 + - rid: 8790098553149325320 + - rid: 8790098553149325321 + - rid: 8790098553149325322 + - rid: 8790098553149325323 + - rid: 8790098553149325324 + - rid: 8790098553149325325 + - rid: 8790098553149325326 + - rid: 8790098553149325327 + - rid: 8790098553149325328 + - rid: 8790098553149325329 + m_RuntimeSettings: + m_List: [] + m_AssetVersion: 10 + m_ObsoleteDefaultVolumeProfile: {fileID: 0} + m_RenderingLayerNames: + - Light Layer default + - Light Layer 1 + - Light Layer 2 + - Light Layer 3 + - Light Layer 4 + - Light Layer 5 + - Light Layer 6 + - Light Layer 7 + m_ValidRenderingLayers: 0 + lightLayerName0: Light Layer default + lightLayerName1: Light Layer 1 + lightLayerName2: Light Layer 2 + lightLayerName3: Light Layer 3 + lightLayerName4: Light Layer 4 + lightLayerName5: Light Layer 5 + lightLayerName6: Light Layer 6 + lightLayerName7: Light Layer 7 + apvScenesData: + obsoleteSceneBounds: + m_Keys: [] + m_Values: [] + obsoleteHasProbeVolumes: + m_Keys: [] + m_Values: + references: + version: 2 + RefIds: + - rid: 6852985685364965376 + type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Version: 0 + m_StripUnusedPostProcessingVariants: 1 + m_StripUnusedVariants: 1 + m_StripScreenCoordOverrideVariants: 1 + - rid: 6852985685364965377 + type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} + m_AutodeskInteractiveTransparent: {fileID: 4800000, guid: 5c81372d981403744adbdda4433c9c11, type: 3} + m_AutodeskInteractiveMasked: {fileID: 4800000, guid: 80aa867ac363ac043847b06ad71604cd, type: 3} + m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3} + m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3} + m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3} + - rid: 6852985685364965378 + type: {class: UniversalRendererResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Version: 0 + m_CopyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} + m_CameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, type: 3} + m_StencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} + m_ClusterDeferred: {fileID: 4800000, guid: 222cce62363a44a380c36bf03b392608, type: 3} + m_StencilDitherMaskSeedPS: {fileID: 4800000, guid: 8c3ee818f2efa514c889881ccb2e95a2, type: 3} + m_DBufferClear: {fileID: 4800000, guid: f056d8bd2a1c7e44e9729144b4c70395, type: 3} + - rid: 6852985685364965379 + type: {class: UniversalRenderPipelineDebugShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_DebugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3} + m_HdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3} + m_ProbeVolumeSamplingDebugComputeShader: {fileID: 7200000, guid: 53626a513ea68ce47b59dc1299fe3959, type: 3} + - rid: 6852985685364965380 + type: {class: UniversalRenderPipelineRuntimeShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Version: 0 + m_FallbackErrorShader: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} + m_BlitHDROverlay: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, type: 3} + m_CoreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} + m_CoreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, type: 3} + m_SamplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} + m_TerrainDetailLit: {fileID: 0} + m_TerrainDetailGrassBillboard: {fileID: 0} + m_TerrainDetailGrass: {fileID: 0} + - rid: 6852985685364965381 + type: {class: UniversalRenderPipelineRuntimeTextures, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Version: 1 + m_BlueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} + m_BayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} + m_DebugFontTex: {fileID: 2800000, guid: 26a413214480ef144b2915d6ff4d0beb, type: 3} + - rid: 6852985685364965382 + type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Version: 0 + m_LightShader: {fileID: 4800000, guid: 3f6c848ca3d7bca4bbe846546ac701a1, type: 3} + m_ProjectedShadowShader: {fileID: 4800000, guid: ce09d4a80b88c5a4eb9768fab4f1ee00, type: 3} + m_SpriteShadowShader: {fileID: 4800000, guid: 44fc62292b65ab04eabcf310e799ccf6, type: 3} + m_SpriteUnshadowShader: {fileID: 4800000, guid: de02b375720b5c445afe83cd483bedf3, type: 3} + m_GeometryShadowShader: {fileID: 4800000, guid: 19349a0f9a7ed4c48a27445bcf92e5e1, type: 3} + m_GeometryUnshadowShader: {fileID: 4800000, guid: 77774d9009bb81447b048c907d4c6273, type: 3} + m_CopyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} + m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2} + m_DefaultMesh2DLitMaterial: {fileID: 2100000, guid: 9452ae1262a74094f8a68013fbcd1834, type: 2} + - rid: 6852985685364965383 + type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_DefaultParticleMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2} + m_DefaultLineMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2} + m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2} + m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2} + m_DefaultSpriteMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + - rid: 6852985685364965384 + type: {class: URPDefaultVolumeProfileSettings, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Version: 0 + m_VolumeProfile: {fileID: 11400000, guid: ab09877e2e707104187f6f83e2f62510, type: 2} + - rid: 6852985685364965385 + type: {class: RenderGraphSettings, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Version: 0 + - rid: 6852985685364965386 + type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime} + data: + m_Version: 0 + m_InstanceDataBufferCopyKernels: {fileID: 7200000, guid: f984aeb540ded8b4fbb8a2047ab5b2e2, type: 3} + m_InstanceDataBufferUploadKernels: {fileID: 7200000, guid: 53864816eb00f2343b60e1a2c5a262ef, type: 3} + m_TransformUpdaterKernels: {fileID: 7200000, guid: 2a567b9b2733f8d47a700c3c85bed75b, type: 3} + m_WindDataUpdaterKernels: {fileID: 7200000, guid: fde76746e4fd0ed418c224f6b4084114, type: 3} + m_OccluderDepthPyramidKernels: {fileID: 7200000, guid: 08b2b5fb307b0d249860612774a987da, type: 3} + m_InstanceOcclusionCullingKernels: {fileID: 7200000, guid: f6d223acabc2f974795a5a7864b50e6c, type: 3} + m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3} + m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3} + m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3} + - rid: 6852985685364965387 + type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3} + m_preTaaCS: {fileID: 7200000, guid: a679dba8ec4d9ce45884a270b0e22dda, type: 3} + m_taaCS: {fileID: 7200000, guid: 3923900e2b41b5e47bc25bfdcbcdc9e6, type: 3} + - rid: 6852985685364965388 + type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 1 + dilationShader: {fileID: 7200000, guid: 6bb382f7de370af41b775f54182e491d, type: 3} + subdivideSceneCS: {fileID: 7200000, guid: bb86f1f0af829fd45b2ebddda1245c22, type: 3} + voxelizeSceneShader: {fileID: 4800000, guid: c8b6a681c7b4e2e4785ffab093907f9e, type: 3} + traceVirtualOffsetCS: {fileID: -6772857160820960102, guid: ff2cbab5da58bf04d82c5f34037ed123, type: 3} + traceVirtualOffsetRT: {fileID: -5126288278712620388, guid: ff2cbab5da58bf04d82c5f34037ed123, type: 3} + skyOcclusionCS: {fileID: -6772857160820960102, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3} + skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3} + renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} + renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} + - rid: 6852985685364965389 + type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 1 + m_ProbeVolumeDisableStreamingAssets: 0 + - rid: 6852985685364965390 + type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 1 + probeVolumeDebugShader: {fileID: 4800000, guid: 3b21275fd12d65f49babb5286f040f2d, type: 3} + probeVolumeFragmentationDebugShader: {fileID: 4800000, guid: 3a80877c579b9144ebdcc6d923bca303, type: 3} + probeVolumeSamplingDebugShader: {fileID: 4800000, guid: bf54e6528c79a224e96346799064c393, type: 3} + probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3} + probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3} + numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3} + - rid: 6852985685364965391 + type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_version: 0 + m_IncludeReferencedInScenes: 0 + m_IncludeAssetsByLabel: 0 + m_LabelToInclude: + - rid: 6852985685364965392 + type: {class: ShaderStrippingSetting, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 0 + m_ExportShaderVariants: 1 + m_ShaderVariantLogLevel: 0 + m_StripRuntimeDebugShaders: 1 + - rid: 6852985685364965393 + type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 1 + probeVolumeBlendStatesCS: {fileID: 7200000, guid: a3f7b8c99de28a94684cb1daebeccf5d, type: 3} + probeVolumeUploadDataCS: {fileID: 7200000, guid: 0951de5992461754fa73650732c4954c, type: 3} + probeVolumeUploadDataL2CS: {fileID: 7200000, guid: 6196f34ed825db14b81fb3eb0ea8d931, type: 3} + - rid: 6852985685364965394 + type: {class: RenderGraphGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_version: 0 + m_EnableCompilationCaching: 1 + m_EnableValidityChecks: 1 + - rid: 8712630790384254976 + type: {class: RenderGraphUtilsResources, ns: UnityEngine.Rendering.RenderGraphModule.Util, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 0 + m_CoreCopyPS: {fileID: 4800000, guid: 12dc59547ea167a4ab435097dd0f9add, type: 3} + - rid: 8790098553149325315 + type: {class: RayTracingRenderPipelineResources, ns: UnityEngine.Rendering.UnifiedRayTracing, asm: Unity.UnifiedRayTracing.Runtime} + data: + m_Version: 1 + m_GeometryPoolKernels: {fileID: 7200000, guid: 98e3d58cae7210c4786f67f504c9e899, type: 3} + m_CopyBuffer: {fileID: 7200000, guid: 1b95b5dcf48d1914c9e1e7405c7660e3, type: 3} + m_CopyPositions: {fileID: 7200000, guid: 1ad53a96b58d3c3488dde4f14db1aaeb, type: 3} + m_BitHistogram: {fileID: 7200000, guid: 8670f7ce4b60cef43bed36148aa1b0a2, type: 3} + m_BlockReducePart: {fileID: 7200000, guid: 4e034cc8ea2635c4e9f063e5ddc7ea7a, type: 3} + m_BlockScan: {fileID: 7200000, guid: 4d6d5de35fa45ef4a92119397a045cc9, type: 3} + m_BuildHlbvh: {fileID: 7200000, guid: 2d70cd6be91bd7843a39a54b51c15b13, type: 3} + m_RestructureBvh: {fileID: 7200000, guid: 56641cb88dcb31a4398a4997ef7a7a8c, type: 3} + m_Scatter: {fileID: 7200000, guid: a2eaeefdac4637a44b734e85b7be9186, type: 3} + - rid: 8790098553149325316 + type: {class: PostProcessData/ShaderResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + stopNanPS: {fileID: 4800000, guid: 1121bb4e615ca3c48b214e79e841e823, type: 3} + subpixelMorphologicalAntialiasingPS: {fileID: 4800000, guid: 63eaba0ebfb82cc43bde059b4a8c65f6, type: 3} + gaussianDepthOfFieldPS: {fileID: 4800000, guid: 5e7134d6e63e0bc47a1dd2669cedb379, type: 3} + bokehDepthOfFieldPS: {fileID: 4800000, guid: 2aed67ad60045d54ba3a00c91e2d2631, type: 3} + cameraMotionBlurPS: {fileID: 4800000, guid: 1edcd131364091c46a17cbff0b1de97a, type: 3} + paniniProjectionPS: {fileID: 4800000, guid: a15b78cf8ca26ca4fb2090293153c62c, type: 3} + lutBuilderLdrPS: {fileID: 4800000, guid: 65df88701913c224d95fc554db28381a, type: 3} + lutBuilderHdrPS: {fileID: 4800000, guid: ec9fec698a3456d4fb18cf8bacb7a2bc, type: 3} + bloomPS: {fileID: 4800000, guid: 5f1864addb451f54bae8c86d230f736e, type: 3} + temporalAntialiasingPS: {fileID: 4800000, guid: 9c70c1a35ff15f340b38ea84842358bf, type: 3} + LensFlareDataDrivenPS: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92, type: 3} + LensFlareScreenSpacePS: {fileID: 4800000, guid: 701880fecb344ea4c9cd0db3407ab287, type: 3} + scalingSetupPS: {fileID: 4800000, guid: e8ee25143a34b8c4388709ea947055d1, type: 3} + easuPS: {fileID: 4800000, guid: 562b7ae4f629f144aa97780546fce7c6, type: 3} + uberPostPS: {fileID: 4800000, guid: e7857e9d0c934dc4f83f270f8447b006, type: 3} + finalPostPassPS: {fileID: 4800000, guid: c49e63ed1bbcb334780a3bd19dfed403, type: 3} + m_ShaderResourcesVersion: 0 + - rid: 8790098553149325317 + type: {class: PostProcessData/TextureResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + blueNoise16LTex: + - {fileID: 2800000, guid: 81200413a40918d4d8702e94db29911c, type: 3} + - {fileID: 2800000, guid: d50c5e07c9911a74982bddf7f3075e7b, type: 3} + - {fileID: 2800000, guid: 1134690bf9216164dbc75050e35b7900, type: 3} + - {fileID: 2800000, guid: 7ce2118f74614a94aa8a0cdf2e6062c3, type: 3} + - {fileID: 2800000, guid: 2ca97df9d1801e84a8a8f2c53cb744f0, type: 3} + - {fileID: 2800000, guid: e63eef8f54aa9dc4da9a5ac094b503b5, type: 3} + - {fileID: 2800000, guid: 39451254daebd6d40b52899c1f1c0c1b, type: 3} + - {fileID: 2800000, guid: c94ad916058dff743b0f1c969ddbe660, type: 3} + - {fileID: 2800000, guid: ed5ea7ce59ca8ec4f9f14bf470a30f35, type: 3} + - {fileID: 2800000, guid: 071e954febf155243a6c81e48f452644, type: 3} + - {fileID: 2800000, guid: 96aaab9cc247d0b4c98132159688c1af, type: 3} + - {fileID: 2800000, guid: fc3fa8f108657e14486697c9a84ccfc5, type: 3} + - {fileID: 2800000, guid: bfed3e498947fcb4890b7f40f54d85b9, type: 3} + - {fileID: 2800000, guid: d512512f4af60a442ab3458489412954, type: 3} + - {fileID: 2800000, guid: 47a45908f6db0cb44a0d5e961143afec, type: 3} + - {fileID: 2800000, guid: 4dcc0502f8586f941b5c4a66717205e8, type: 3} + - {fileID: 2800000, guid: 9d92991794bb5864c8085468b97aa067, type: 3} + - {fileID: 2800000, guid: 14381521ff11cb74abe3fe65401c23be, type: 3} + - {fileID: 2800000, guid: d36f0fe53425e08499a2333cf423634c, type: 3} + - {fileID: 2800000, guid: d4044ea2490d63b43aa1765f8efbf8a9, type: 3} + - {fileID: 2800000, guid: c9bd74624d8070f429e3f46d161f9204, type: 3} + - {fileID: 2800000, guid: d5c9b274310e5524ebe32a4e4da3df1f, type: 3} + - {fileID: 2800000, guid: f69770e54f2823f43badf77916acad83, type: 3} + - {fileID: 2800000, guid: 10b6c6d22e73dea46a8ab36b6eebd629, type: 3} + - {fileID: 2800000, guid: a2ec5cbf5a9b64345ad3fab0912ddf7b, type: 3} + - {fileID: 2800000, guid: 1c3c6d69a645b804fa232004b96b7ad3, type: 3} + - {fileID: 2800000, guid: d18a24d7b4ed50f4387993566d9d3ae2, type: 3} + - {fileID: 2800000, guid: c989e1ed85cf7154caa922fec53e6af6, type: 3} + - {fileID: 2800000, guid: ff47e5a0f105eb34883b973e51f4db62, type: 3} + - {fileID: 2800000, guid: fa042edbfc40fbd4bad0ab9d505b1223, type: 3} + - {fileID: 2800000, guid: 896d9004736809c4fb5973b7c12eb8b9, type: 3} + - {fileID: 2800000, guid: 179f794063d2a66478e6e726f84a65bc, type: 3} + filmGrainTex: + - {fileID: 2800000, guid: 654c582f7f8a5a14dbd7d119cbde215d, type: 3} + - {fileID: 2800000, guid: dd77ffd079630404e879388999033049, type: 3} + - {fileID: 2800000, guid: 1097e90e1306e26439701489f391a6c0, type: 3} + - {fileID: 2800000, guid: f0b67500f7fad3b4c9f2b13e8f41ba6e, type: 3} + - {fileID: 2800000, guid: 9930fb4528622b34687b00bbe6883de7, type: 3} + - {fileID: 2800000, guid: bd9e8c758250ef449a4b4bfaad7a2133, type: 3} + - {fileID: 2800000, guid: 510a2f57334933e4a8dbabe4c30204e4, type: 3} + - {fileID: 2800000, guid: b4db8180660810945bf8d55ab44352ad, type: 3} + - {fileID: 2800000, guid: fd2fd78b392986e42a12df2177d3b89c, type: 3} + - {fileID: 2800000, guid: 5cdee82a77d13994f83b8fdabed7c301, type: 3} + smaaAreaTex: {fileID: 2800000, guid: d1f1048909d55cd4fa1126ab998f617e, type: 3} + smaaSearchTex: {fileID: 2800000, guid: 51eee22c2a633ef4aada830eed57c3fd, type: 3} + m_TexturesResourcesVersion: 0 + - rid: 8790098553149325318 + type: {class: OnTilePostProcessResource, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Version: 0 + m_UberPostShader: {fileID: 4800000, guid: fe4f13c1004a07d4ea1e30bfd0326d9e, type: 3} + - rid: 8790098553149325319 + type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2} + - rid: 8790098553149325320 + type: {class: UniversalRenderPipelineRuntimeTerrainShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Version: 0 + m_TerrainDetailLit: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, type: 3} + m_TerrainDetailGrassBillboard: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, type: 3} + m_TerrainDetailGrass: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, type: 3} + - rid: 8790098553149325321 + type: {class: UniversalRenderPipelineRuntimeXRResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_xrOcclusionMeshPS: {fileID: 4800000, guid: 4431b1f1f743fbf4eb310a967890cbea, type: 3} + m_xrMirrorViewPS: {fileID: 4800000, guid: d5a307c014552314b9f560906d708772, type: 3} + m_xrMotionVector: {fileID: 4800000, guid: f89aac1e4f84468418fe30e611dff395, type: 3} + - rid: 8790098553149325322 + type: {class: URPReflectionProbeSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Universal.Runtime} + data: + version: 1 + useReflectionProbeRotation: 0 + - rid: 8790098553149325323 + type: {class: ScreenSpaceAmbientOcclusionDynamicResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_BlueNoise256Textures: + - {fileID: 2800000, guid: 36f118343fc974119bee3d09e2111500, type: 3} + - {fileID: 2800000, guid: 4b7b083e6b6734e8bb2838b0b50a0bc8, type: 3} + - {fileID: 2800000, guid: c06cc21c692f94f5fb5206247191eeee, type: 3} + - {fileID: 2800000, guid: cb76dd40fa7654f9587f6a344f125c9a, type: 3} + - {fileID: 2800000, guid: e32226222ff144b24bf3a5a451de54bc, type: 3} + - {fileID: 2800000, guid: 3302065f671a8450b82c9ddf07426f3a, type: 3} + - {fileID: 2800000, guid: 56a77a3e8d64f47b6afe9e3c95cb57d5, type: 3} + m_Version: 0 + - rid: 8790098553149325324 + type: {class: ScreenSpaceAmbientOcclusionPersistentResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3} + m_Version: 0 + - rid: 8790098553149325325 + type: {class: URPTerrainShaderSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Version: 0 + m_IncludeTerrainShaders: 1 + - rid: 8790098553149325326 + type: {class: VrsRenderPipelineRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_TextureComputeShader: {fileID: 7200000, guid: cacb30de6c40c7444bbc78cb0a81fd2a, type: 3} + m_VisualizationShader: {fileID: 4800000, guid: 620b55b8040a88d468e94abe55bed5ba, type: 3} + m_VisualizationLookupTable: + m_Data: + - {r: 0.785, g: 0.23, b: 0.2, a: 1} + - {r: 1, g: 0.8, b: 0.8, a: 1} + - {r: 0.4, g: 0.2, b: 0.2, a: 1} + - {r: 0.51, g: 0.8, b: 0.6, a: 1} + - {r: 0.6, g: 0.8, b: 1, a: 1} + - {r: 0.2, g: 0.4, b: 0.6, a: 1} + - {r: 0.8, g: 1, b: 0.8, a: 1} + - {r: 0.2, g: 0.4, b: 0.2, a: 1} + - {r: 0.125, g: 0.22, b: 0.36, a: 1} + m_ConversionLookupTable: + m_Data: + - {r: 0.785, g: 0.23, b: 0.2, a: 1} + - {r: 1, g: 0.8, b: 0.8, a: 1} + - {r: 0.4, g: 0.2, b: 0.2, a: 1} + - {r: 0.51, g: 0.8, b: 0.6, a: 1} + - {r: 0.6, g: 0.8, b: 1, a: 1} + - {r: 0.2, g: 0.4, b: 0.6, a: 1} + - {r: 0.8, g: 1, b: 0.8, a: 1} + - {r: 0.2, g: 0.4, b: 0.2, a: 1} + - {r: 0.125, g: 0.22, b: 0.36, a: 1} + - rid: 8790098553149325327 + type: {class: RenderingDebuggerRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_version: 0 + - rid: 8790098553149325328 + type: {class: LightmapSamplingSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 1 + m_UseBicubicLightmapSampling: 0 + - rid: 8790098553149325329 + type: {class: WorldRenderPipelineResources, ns: UnityEngine.PathTracing.Core, asm: Unity.PathTracing.Runtime} + data: + _version: 3 + _blitCubemap: {fileID: 7200000, guid: 5a992812cb320d146a66cc600200cce7, type: 3} + _blitGrayScaleCookie: {fileID: 7200000, guid: 557fa399e33bf7647bda5697c5c158df, type: 3} + _setAlphaChannelShader: {fileID: 7200000, guid: 5efaea0e81c66334aa9d062d6573e6fd, type: 3} + _environmentImportanceSamplingBuild: {fileID: 7200000, guid: 5bb2534d2411d344cbc54f880232640f, type: 3} + _skyBoxMesh: {fileID: 4300000, guid: 0529e6c5f6dea8c4a8c2835ed7de57cb, type: 2} + _sixFaceSkyBoxMesh: {fileID: 4300000, guid: a80925ceebd011741b42509226cefc74, type: 2} + _buildLightGridShader: {fileID: 7200000, guid: 16e47c1641bd0104e92b624601457bb0, type: 3} diff --git a/src/ProjectFenrir/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset.meta b/src/ProjectFenrir/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset.meta new file mode 100644 index 0000000..81b84f2 --- /dev/null +++ b/src/ProjectFenrir/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 18dc0cd2c080841dea60987a38ce93fa +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/StreamingAssets.meta b/src/ProjectFenrir/Assets/StreamingAssets.meta new file mode 100644 index 0000000..97d023c --- /dev/null +++ b/src/ProjectFenrir/Assets/StreamingAssets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e54b7b74c518747f48ad39b2831f9732 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/StreamingAssets/Config.meta b/src/ProjectFenrir/Assets/StreamingAssets/Config.meta new file mode 100644 index 0000000..87db2e0 --- /dev/null +++ b/src/ProjectFenrir/Assets/StreamingAssets/Config.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f687505f6bd6e4446ac7ad5e167e2a64 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/StreamingAssets/Config/EnemyDefinitions.json b/src/ProjectFenrir/Assets/StreamingAssets/Config/EnemyDefinitions.json new file mode 100644 index 0000000..2d90f61 --- /dev/null +++ b/src/ProjectFenrir/Assets/StreamingAssets/Config/EnemyDefinitions.json @@ -0,0 +1,101 @@ +{ + "Enemies": [ + { + "Id": "ash_wolf", + "DisplayName": "Ash Wolf", + "Element": "Fire", + "Zone": "TheThreshold", + "MaxHealth": 80, + "BaseAttack": 12, + "MoveSpeed": 4.5, + "AggroRange": 8.0, + "AttackRange": 1.8, + "Behaviours": ["Patrol", "Chase", "Lunge"], + "TraitEvents": ["CreatureHuntedRepeatEvent"] + }, + { + "Id": "flame_sprite", + "DisplayName": "Flame Sprite", + "Element": "Fire", + "Zone": "TheAshwood", + "MaxHealth": 45, + "BaseAttack": 8, + "MoveSpeed": 6.0, + "AggroRange": 10.0, + "AttackRange": 5.0, + "Behaviours": ["Patrol", "Chase", "RangedBurst"], + "TraitEvents": [] + }, + { + "Id": "ember_stag", + "DisplayName": "Ember Stag", + "Element": "Fire", + "Zone": "TheEmberFields", + "MaxHealth": 140, + "BaseAttack": 18, + "MoveSpeed": 5.0, + "AggroRange": 6.0, + "AttackRange": 2.5, + "Behaviours": ["Graze", "Chase", "Charge"], + "TraitEvents": ["CreatureSparedEvent"] + }, + { + "Id": "ash_revenant", + "DisplayName": "Ash Revenant", + "Element": "Fire", + "Zone": "CharRavine", + "MaxHealth": 200, + "BaseAttack": 22, + "MoveSpeed": 3.5, + "AggroRange": 7.0, + "AttackRange": 2.2, + "Behaviours": ["Patrol", "Chase", "SlowCombo", "Enrage"], + "TraitEvents": [] + }, + { + "Id": "inferno_wisp", + "DisplayName": "Inferno Wisp", + "Element": "Fire", + "Zone": "AnyNight", + "MaxHealth": 60, + "BaseAttack": 15, + "MoveSpeed": 7.0, + "AggroRange": 12.0, + "AttackRange": 4.0, + "Behaviours": ["Float", "Chase", "SpiralBurst"], + "SpawnCondition": "Night", + "TraitEvents": ["NightExplorationEvent"] + } + ], + "Bosses": [ + { + "Id": "emberlord", + "DisplayName": "The Emberlord", + "Element": "Fire", + "Zone": "CharRavine", + "MaxHealth": 1200, + "BaseAttack": 35, + "MoveSpeed": 3.0, + "AggroRange": 20.0, + "AttackRange": 3.5, + "Phases": [ + { + "PhaseIndex": 0, + "HealthThreshold": 1.0, + "Behaviours": ["Patrol", "HeavySlam", "BurningSwipe"] + }, + { + "PhaseIndex": 1, + "HealthThreshold": 0.6, + "Behaviours": ["Patrol", "HeavySlam", "BurningSwipe", "InfernoAura"] + }, + { + "PhaseIndex": 2, + "HealthThreshold": 0.3, + "Behaviours": ["Berserk", "HeavySlam", "BurningSwipe", "InfernoAura", "MeteorPlunge"] + } + ], + "TraitEvents": ["BossKilledEvent"] + } + ] +} diff --git a/src/ProjectFenrir/Assets/StreamingAssets/Config/EnemyDefinitions.json.meta b/src/ProjectFenrir/Assets/StreamingAssets/Config/EnemyDefinitions.json.meta new file mode 100644 index 0000000..9a021cb --- /dev/null +++ b/src/ProjectFenrir/Assets/StreamingAssets/Config/EnemyDefinitions.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 46ef228d6697e4dd089d1dc879a6688a +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/StreamingAssets/Config/EvolutionSignatures.json b/src/ProjectFenrir/Assets/StreamingAssets/Config/EvolutionSignatures.json new file mode 100644 index 0000000..ec3e978 --- /dev/null +++ b/src/ProjectFenrir/Assets/StreamingAssets/Config/EvolutionSignatures.json @@ -0,0 +1,40 @@ +{ + "Signatures": { + "inferno": { + "Element": "Fire", + "Thresholds": { + "Aggression": { "Min": 70 }, + "Dominance": { "Min": 65 }, + "Mercy": { "Max": 35 }, + "Recklessness": { "Min": 55 } + } + }, + "abyssal_current": { + "Element": "Water", + "Thresholds": { + "Patience": { "Min": 70 }, + "Wisdom": { "Min": 65 }, + "Curiosity": { "Min": 60 }, + "Aggression": { "Max": 40 } + } + }, + "bedrock": { + "Element": "Earth", + "Thresholds": { + "Sacrifice": { "Min": 70 }, + "Loyalty": { "Min": 65 }, + "Dominance": { "Min": 55 }, + "Exploration": { "Max": 40 } + } + }, + "galeform": { + "Element": "Air", + "Thresholds": { + "Exploration": { "Min": 70 }, + "Curiosity": { "Min": 65 }, + "Patience": { "Max": 40 }, + "Recklessness": { "Min": 50 } + } + } + } +} diff --git a/src/ProjectFenrir/Assets/StreamingAssets/Config/EvolutionSignatures.json.meta b/src/ProjectFenrir/Assets/StreamingAssets/Config/EvolutionSignatures.json.meta new file mode 100644 index 0000000..33c4052 --- /dev/null +++ b/src/ProjectFenrir/Assets/StreamingAssets/Config/EvolutionSignatures.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a9942d83ef6e34340aa222fcfa5c2b09 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/StreamingAssets/Config/TraitWeights.json b/src/ProjectFenrir/Assets/StreamingAssets/Config/TraitWeights.json new file mode 100644 index 0000000..fd320f8 --- /dev/null +++ b/src/ProjectFenrir/Assets/StreamingAssets/Config/TraitWeights.json @@ -0,0 +1,45 @@ +{ + "Weights": { + "DodgeUsedEvent": { "Patience": 2.0, "Aggression": -1.5 }, + "CounterLandedEvent": { "Dominance": 3.0, "Wisdom": 2.0 }, + "PerfectBlockEvent": { "Patience": 3.0, "Dominance": 2.0 }, + "BlockUsedEvent": { "Patience": 1.5, "Sacrifice": 1.0 }, + "HeavyAttackLandedEvent": { "Aggression": 1.5 }, + "LightAttackLandedEvent": { "Patience": 1.0, "Wisdom": 0.5 }, + "AbilityUsedFullEnergyEvent": { "Patience": 2.5, "Wisdom": 1.5 }, + "AbilityUsedLowEnergyEvent": { "Recklessness": 2.0 }, + "CombatCompletedNoDodgeEvent": { "Aggression": 2.0, "Recklessness": 1.0 }, + "HitTakenNoDodgeEvent": { "Recklessness": 1.5, "Sacrifice": 1.0 }, + + "DeathRecklessEvent": { "Recklessness": 4.0, "Patience": -2.0 }, + "DeathSacrificeEvent": { "Sacrifice": 3.0, "Recklessness": 1.5 }, + "DeathOverwhelmedEvent": { "Recklessness": -1.0, "Wisdom": -1.0 }, + "DeathPatternFailEvent": { "Wisdom": -3.0 }, + + "CreatureSparedEvent": { "Mercy": 3.0, "Curiosity": 1.5 }, + "CreatureHuntedRepeatEvent": { "Dominance": 2.0, "Aggression": 1.5 }, + + "DialogueMercyEvent": { "Mercy": 3.0, "Loyalty": 1.5 }, + "DialoguePunishmentEvent": { "Mercy": -2.0, "Dominance": 2.5 }, + "NpcHelpedEvent": { "Loyalty": 3.0, "Wisdom": 1.0 }, + "NpcIgnoredEvent": { "Loyalty": -2.0 }, + "LoreObjectReadEvent": { "Wisdom": 2.0, "Curiosity": 1.5 }, + "SecretAreaDiscoveredEvent": { "Exploration": 4.0, "Curiosity": 2.0 }, + "OriginVillageReturnEvent": { "Loyalty": 3.5 }, + "AreaRevisitedEvent": { "Loyalty": 1.5, "Curiosity": 1.0 }, + "QuestCompletedEvent": { "Loyalty": 2.5, "Wisdom": 1.0 }, + + "OffensiveUpgradePurchasedEvent": { "Aggression": 2.0 }, + "DefensiveUpgradePurchasedEvent": { "Sacrifice": 2.0, "Patience": 1.5 }, + "KnowledgeItemPurchasedEvent": { "Wisdom": 2.5, "Curiosity": 1.5 }, + "CurrencyHoardedEvent": { "Patience": 2.0, "Wisdom": 1.0 }, + "CurrencySpentImmediatelyEvent": { "Recklessness": 1.5 }, + + "ExtendedDangerZoneEvent": { "Aggression": 1.5, "Recklessness": 1.5 }, + "ExtendedSafeZoneEvent": { "Loyalty": 1.5, "Patience": 1.5 }, + "AllSecretsFoundEvent": { "Exploration": 4.0, "Wisdom": 2.0 }, + "NightExplorationEvent": { "Curiosity": 1.5 }, + + "BossKilledEvent": { "Dominance": 3.0, "Wisdom": 2.0 } + } +} diff --git a/src/ProjectFenrir/Assets/StreamingAssets/Config/TraitWeights.json.meta b/src/ProjectFenrir/Assets/StreamingAssets/Config/TraitWeights.json.meta new file mode 100644 index 0000000..def7cd7 --- /dev/null +++ b/src/ProjectFenrir/Assets/StreamingAssets/Config/TraitWeights.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2bbd9b4649a2e4ecea98c4ac8f8fab13 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/TutorialInfo.meta b/src/ProjectFenrir/Assets/TutorialInfo.meta new file mode 100644 index 0000000..a700bca --- /dev/null +++ b/src/ProjectFenrir/Assets/TutorialInfo.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ba062aa6c92b140379dbc06b43dd3b9b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/TutorialInfo/Icons.meta b/src/ProjectFenrir/Assets/TutorialInfo/Icons.meta new file mode 100644 index 0000000..1d19fb9 --- /dev/null +++ b/src/ProjectFenrir/Assets/TutorialInfo/Icons.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 8a0c9218a650547d98138cd835033977 +folderAsset: yes +timeCreated: 1484670163 +licenseType: Store +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/TutorialInfo/Icons/URP.png b/src/ProjectFenrir/Assets/TutorialInfo/Icons/URP.png new file mode 100644 index 0000000000000000000000000000000000000000..6194a807e27158f864a7c7677f4cbf62d8b94503 GIT binary patch literal 24069 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 HejoV(); + + // EventSystem (needed for UI) + CreateEventSystem(); + + EditorSceneManager.SaveScene(scene, ScenePath + "Bootstrap.unity"); + Debug.Log("[FenrirSceneSetup] ✓ Bootstrap scene created."); + } + + // ── Awakening ───────────────────────────────────────────────────────── + + private static void CreateAwakeningScene() + { + var scene = EditorSceneManager.NewScene(NewSceneSetup.DefaultGameObjects, NewSceneMode.Single); + + // AwakeningSequencer + var sequencer = new GameObject("AwakeningSequencer"); + sequencer.AddComponent(); + + // Placeholder UI panels (empty GameObjects — designer fills in) + CreateUIPanel("CharacterCreationPanel", sequencer.transform); + CreateUIPanel("ElementRevealPanel", sequencer.transform); + CreateUIPanel("LoadingPanel", sequencer.transform); + + EditorSceneManager.SaveScene(scene, ScenePath + "Awakening.unity"); + Debug.Log("[FenrirSceneSetup] ✓ Awakening scene created."); + } + + // ── EmberForest ─────────────────────────────────────────────────────── + + private static void CreateEmberForestScene() + { + var scene = EditorSceneManager.NewScene(NewSceneSetup.DefaultGameObjects, NewSceneMode.Single); + + // ── Player ──────────────────────────────────────────────────────── + var player = new GameObject("Player"); + player.tag = "Player"; + player.AddComponent(); + player.AddComponent(); + player.AddComponent(); + player.AddComponent(); + player.AddComponent(); + var combat = player.AddComponent(); + var emitter = player.AddComponent(); + + // ── Input ───────────────────────────────────────────────────────── + var inputGo = new GameObject("InputSystem"); + var mapper = inputGo.AddComponent(); + var gesture = inputGo.AddComponent(); + var inputHandler = inputGo.AddComponent(); + + // ── World ───────────────────────────────────────────────────────── + var worldGo = new GameObject("WorldManager"); + worldGo.AddComponent(); + + // DayNightCycle — wire directional light in Inspector + var dnGo = new GameObject("DayNightCycle"); + dnGo.AddComponent(); + + // ── Combat System ───────────────────────────────────────────────── + var csGo = new GameObject("CombatSystem"); + csGo.AddComponent(); + + // ── Audio ───────────────────────────────────────────────────────── + var audioGo = new GameObject("AudioManager"); + audioGo.AddComponent(); + audioGo.AddComponent(); + audioGo.AddComponent(); + + // ── HUD (Canvas) ────────────────────────────────────────────────── + var hudCanvas = new GameObject("HUD"); + var canvas = hudCanvas.AddComponent(); + canvas.renderMode = RenderMode.ScreenSpaceOverlay; + hudCanvas.AddComponent(); + hudCanvas.AddComponent(); + hudCanvas.AddComponent(); + hudCanvas.AddComponent(); + hudCanvas.AddComponent(); + + CreateEventSystem(); + + EditorSceneManager.SaveScene(scene, ScenePath + "EmberForest.unity"); + Debug.Log("[FenrirSceneSetup] ✓ EmberForest scene created."); + } + + // ── Build Settings ──────────────────────────────────────────────────── + + private static void AddScenesToBuildSettings() + { + var scenes = new List + { + new EditorBuildSettingsScene(ScenePath + "Bootstrap.unity", true), + new EditorBuildSettingsScene(ScenePath + "Awakening.unity", true), + new EditorBuildSettingsScene(ScenePath + "EmberForest.unity", true), + }; + EditorBuildSettings.scenes = scenes.ToArray(); + } + + // ── Helpers ─────────────────────────────────────────────────────────── + + private static void CreateEventSystem() + { + var es = new GameObject("EventSystem"); + es.AddComponent(); + es.AddComponent(); + } + + private static GameObject CreateUIPanel(string name, Transform parent) + { + var go = new GameObject(name); + go.transform.SetParent(parent); + go.SetActive(false); + return go; + } + } +} +#endif diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirSceneSetup.cs.meta b/src/ProjectFenrir/Assets/_Project/Editor/FenrirSceneSetup.cs.meta new file mode 100644 index 0000000..9455f46 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Editor/FenrirSceneSetup.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: b0e951d1a1e9b4516bf49715843179a5 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scenes.meta b/src/ProjectFenrir/Assets/_Project/Scenes.meta new file mode 100644 index 0000000..96a9838 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scenes.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 388ad55a72a6644cc9fe6e22f52b76a4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/_Project/Scenes/Awakening.unity b/src/ProjectFenrir/Assets/_Project/Scenes/Awakening.unity new file mode 100644 index 0000000..88a1e90 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scenes/Awakening.unity @@ -0,0 +1,492 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 10 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 2 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 1 + m_PVRFilteringGaussRadiusAO: 1 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 3 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &237775108 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 237775109} + m_Layer: 0 + m_Name: CharacterCreationPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &237775109 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 237775108} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1472117039} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &499936954 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 499936957} + - component: {fileID: 499936956} + - component: {fileID: 499936955} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &499936955 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 499936954} + m_Enabled: 1 +--- !u!20 &499936956 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 499936954} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &499936957 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 499936954} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &754552381 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 754552384} + - component: {fileID: 754552383} + - component: {fileID: 754552382} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &754552382 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 754552381} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalLightData + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_CustomShadowLayers: 0 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 +--- !u!108 &754552383 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 754552381} + m_Enabled: 1 + serializedVersion: 13 + m_Type: 1 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize2D: {x: 0.5, y: 0.5} + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 + m_ShapeRadius: 0.025 + m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 +--- !u!4 &754552384 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 754552381} + serializedVersion: 2 + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &1177490285 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1177490286} + m_Layer: 0 + m_Name: ElementRevealPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1177490286 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1177490285} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1472117039} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1472117037 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1472117039} + - component: {fileID: 1472117038} + m_Layer: 0 + m_Name: AwakeningSequencer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1472117038 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1472117037} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45ba041f54cef4e708961f90b03e29ea, type: 3} + m_Name: + m_EditorClassIdentifier: Fenrir.Runtime::Fenrir.Awakening.AwakeningSequencer + _gameScene: EmberForest + _characterCreationPanel: {fileID: 0} + _elementRevealPanel: {fileID: 0} + _loadingPanel: {fileID: 0} + _elementRevealHoldSeconds: 3 +--- !u!4 &1472117039 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1472117037} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 237775109} + - {fileID: 1177490286} + - {fileID: 1825290730} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1825290729 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1825290730} + m_Layer: 0 + m_Name: LoadingPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1825290730 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1825290729} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1472117039} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 499936957} + - {fileID: 754552384} + - {fileID: 1472117039} diff --git a/src/ProjectFenrir/Assets/_Project/Scenes/Awakening.unity.meta b/src/ProjectFenrir/Assets/_Project/Scenes/Awakening.unity.meta new file mode 100644 index 0000000..2ae2de4 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scenes/Awakening.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0f4151566f9e14d5b977b8627d5e5c92 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/_Project/Scenes/Bootstrap.unity b/src/ProjectFenrir/Assets/_Project/Scenes/Bootstrap.unity new file mode 100644 index 0000000..76c0e6c --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scenes/Bootstrap.unity @@ -0,0 +1,242 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 10 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 2 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 1 + m_PVRFilteringGaussRadiusAO: 1 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 3 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &1472117037 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1472117040} + - component: {fileID: 1472117039} + - component: {fileID: 1472117038} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1472117038 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1472117037} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.EventSystems.StandaloneInputModule + m_SendPointerHoverToParent: 1 + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &1472117039 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1472117037} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.EventSystems.EventSystem + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &1472117040 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1472117037} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1825290729 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1825290731} + - component: {fileID: 1825290730} + m_Layer: 0 + m_Name: Bootstrap + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1825290730 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1825290729} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0370b35fac4624423839f6d8bf9ef882, type: 3} + m_Name: + m_EditorClassIdentifier: Fenrir.Runtime::Fenrir.Core.Bootstrap + _mainMenuScene: MainMenu + _awakeningScene: Awakening + _gameScene: EmberForest +--- !u!4 &1825290731 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1825290729} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1825290731} + - {fileID: 1472117040} diff --git a/src/ProjectFenrir/Assets/_Project/Scenes/Bootstrap.unity.meta b/src/ProjectFenrir/Assets/_Project/Scenes/Bootstrap.unity.meta new file mode 100644 index 0000000..ba0fecf --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scenes/Bootstrap.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: db83ce571a9c6408d82604187eb23ef9 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/_Project/Scenes/EmberForest.unity b/src/ProjectFenrir/Assets/_Project/Scenes/EmberForest.unity new file mode 100644 index 0000000..1171687 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scenes/EmberForest.unity @@ -0,0 +1,1179 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 10 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 2 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 1 + m_PVRFilteringGaussRadiusAO: 1 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 3 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &419592642 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 419592644} + - component: {fileID: 419592643} + m_Layer: 0 + m_Name: WorldManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &419592643 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 419592642} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e4d7c2b710cf6428986fa6c537f9e4a4, type: 3} + m_Name: + m_EditorClassIdentifier: Fenrir.Runtime::Fenrir.World.WorldManager + _dayNight: {fileID: 0} +--- !u!4 &419592644 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 419592642} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &537506421 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 537506424} + - component: {fileID: 537506423} + - component: {fileID: 537506422} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &537506422 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 537506421} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.EventSystems.StandaloneInputModule + m_SendPointerHoverToParent: 1 + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &537506423 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 537506421} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.EventSystems.EventSystem + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &537506424 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 537506421} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &585957744 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 585957747} + - component: {fileID: 585957746} + - component: {fileID: 585957745} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &585957745 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 585957744} + m_Enabled: 1 +--- !u!20 &585957746 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 585957744} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &585957747 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 585957744} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &654603743 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 654603745} + - component: {fileID: 654603744} + m_Layer: 0 + m_Name: DayNightCycle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &654603744 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 654603743} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ce1eeee18935247f2b706257b08182f6, type: 3} + m_Name: + m_EditorClassIdentifier: Fenrir.Runtime::Fenrir.World.DayNightCycle + _directionalLight: {fileID: 0} + _lightColorGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + _lightIntensityCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!4 &654603745 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 654603743} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &673948126 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 673948129} + - component: {fileID: 673948128} + - component: {fileID: 673948127} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &673948127 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 673948126} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalLightData + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_CustomShadowLayers: 0 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 +--- !u!108 &673948128 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 673948126} + m_Enabled: 1 + serializedVersion: 13 + m_Type: 1 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize2D: {x: 0.5, y: 0.5} + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 + m_ShapeRadius: 0.025 + m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 +--- !u!4 &673948129 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 673948126} + serializedVersion: 2 + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &746947356 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 746947366} + - component: {fileID: 746947365} + - component: {fileID: 746947364} + - component: {fileID: 746947363} + - component: {fileID: 746947362} + - component: {fileID: 746947361} + - component: {fileID: 746947360} + - component: {fileID: 746947359} + - component: {fileID: 746947358} + - component: {fileID: 746947357} + m_Layer: 0 + m_Name: Player + m_TagString: Player + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &746947357 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 746947356} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 81cdd3ccd9f07487c909e0c7b7efe385, type: 3} + m_Name: + m_EditorClassIdentifier: Fenrir.Runtime::Fenrir.Entities.Player.PlayerTraitEmitter +--- !u!114 &746947358 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 746947356} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 81e51eab9310d4a30ab9ffc5a3fed505, type: 3} + m_Name: + m_EditorClassIdentifier: Fenrir.Runtime::Fenrir.Entities.Player.PlayerCombat + _lightAttackDamage: 15 + _heavyAttackDamage: 35 + _abilityDamage: 50 + _abilityEnergyCost: 40 +--- !u!114 &746947359 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 746947356} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 81cdd3ccd9f07487c909e0c7b7efe385, type: 3} + m_Name: + m_EditorClassIdentifier: Fenrir.Runtime::Fenrir.Entities.Player.PlayerTraitEmitter +--- !u!114 &746947360 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 746947356} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3072b2113ec774481af5d2b5df536db7, type: 3} + m_Name: + m_EditorClassIdentifier: Fenrir.Runtime::Fenrir.Combat.HitStateManager + _blockWindowDuration: 0.25 + _perfectBlockWindowDuration: 0.12 + _dodgeInvincibilityDuration: 0.4 +--- !u!114 &746947361 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 746947356} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 91c00435c520149858958f23569959f8, type: 3} + m_Name: + m_EditorClassIdentifier: Fenrir.Runtime::Fenrir.Entities.Player.PlayerEnergy + _rechargePerSecond: 8 +--- !u!114 &746947362 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 746947356} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d280ba2a8c164415cb48f7b41a9ade11, type: 3} + m_Name: + m_EditorClassIdentifier: Fenrir.Runtime::Fenrir.Entities.Player.PlayerHealth + _maxHp: 100 +--- !u!114 &746947363 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 746947356} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3072b2113ec774481af5d2b5df536db7, type: 3} + m_Name: + m_EditorClassIdentifier: Fenrir.Runtime::Fenrir.Combat.HitStateManager + _blockWindowDuration: 0.25 + _perfectBlockWindowDuration: 0.12 + _dodgeInvincibilityDuration: 0.4 +--- !u!114 &746947364 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 746947356} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9a8a6577dcfef4a6aaebdce573ac235c, type: 3} + m_Name: + m_EditorClassIdentifier: Fenrir.Runtime::Fenrir.Entities.Player.PlayerController + _moveSpeed: 5 + _dodgeSpeed: 12 + _rotateSpeed: 720 + _gravity: -20 +--- !u!143 &746947365 +CharacterController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 746947356} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Height: 2 + m_Radius: 0.5 + m_SlopeLimit: 45 + m_StepOffset: 0.3 + m_SkinWidth: 0.08 + m_MinMoveDistance: 0.001 + m_Center: {x: 0, y: 0, z: 0} +--- !u!4 &746947366 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 746947356} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1249111294 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1249111296} + - component: {fileID: 1249111295} + m_Layer: 0 + m_Name: CombatSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1249111295 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1249111294} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d3e8c23ff183d4f05860571128c4d931, type: 3} + m_Name: + m_EditorClassIdentifier: Fenrir.Runtime::Fenrir.Combat.CombatSystem +--- !u!4 &1249111296 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1249111294} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1291737293 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1291737300} + - component: {fileID: 1291737299} + - component: {fileID: 1291737298} + - component: {fileID: 1291737297} + - component: {fileID: 1291737296} + - component: {fileID: 1291737295} + - component: {fileID: 1291737294} + m_Layer: 0 + m_Name: HUD + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1291737294 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1291737293} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 454ab1424baba49b18377cbfa226ee06, type: 3} + m_Name: + m_EditorClassIdentifier: Fenrir.Runtime::Fenrir.UI.JournalController + _journalPanel: {fileID: 0} + _entryContainer: {fileID: 0} + _entryPrefab: {fileID: 0} + _hud: {fileID: 0} +--- !u!114 &1291737295 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1291737293} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0a47fc82c6c6a4e8d8de0e4803216417, type: 3} + m_Name: + m_EditorClassIdentifier: Fenrir.Runtime::Fenrir.UI.EnergyBar + _fillImage: {fileID: 0} + _energy: {fileID: 0} + _fullColor: {r: 0.95, g: 0.75, b: 0.2, a: 1} + _midColor: {r: 0.9, g: 0.45, b: 0.1, a: 1} + _lowColor: {r: 0.85, g: 0.15, b: 0.1, a: 1} +--- !u!114 &1291737296 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1291737293} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6c4c5a06f81044f6180acaea6f2c6e2c, type: 3} + m_Name: + m_EditorClassIdentifier: Fenrir.Runtime::Fenrir.UI.HUD + _hpFill: {fileID: 0} + _health: {fileID: 0} + _combatPanel: {fileID: 0} + _journalNotification: {fileID: 0} +--- !u!114 &1291737297 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1291737293} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.GraphicRaycaster + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1291737298 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1291737293} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.CanvasScaler + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &1291737299 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1291737293} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_UseReflectionProbes: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &1291737300 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1291737293} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!1 &1298511996 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1298512001} + - component: {fileID: 1298512000} + - component: {fileID: 1298511999} + - component: {fileID: 1298511998} + - component: {fileID: 1298511997} + m_Layer: 0 + m_Name: AudioManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1298511997 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1298511996} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 33ad52f10c00341139d1df4414437c59, type: 3} + m_Name: + m_EditorClassIdentifier: Fenrir.Runtime::Fenrir.Audio.SFXPool + _poolSize: 16 + _prefab: {fileID: 0} +--- !u!114 &1298511998 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1298511996} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30a89e948c715410a9f676aec6c0899f, type: 3} + m_Name: + m_EditorClassIdentifier: Fenrir.Runtime::Fenrir.Audio.MusicLayer + _source: {fileID: 1298511999} + _targetVolume: 0.7 +--- !u!82 &1298511999 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1298511996} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &1298512000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1298511996} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d72e03a4c50ba4270b333bf12dc38afa, type: 3} + m_Name: + m_EditorClassIdentifier: Fenrir.Runtime::Fenrir.Audio.AudioManager + _musicLayer: {fileID: 0} + _sfxPool: {fileID: 0} + _dawnMusic: {fileID: 0} + _dayMusic: {fileID: 0} + _duskMusic: {fileID: 0} + _nightMusic: {fileID: 0} + _combatMusic: {fileID: 0} +--- !u!4 &1298512001 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1298511996} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2042922182 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2042922186} + - component: {fileID: 2042922185} + - component: {fileID: 2042922184} + - component: {fileID: 2042922183} + m_Layer: 0 + m_Name: InputSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2042922183 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2042922182} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6c8e1210723ff41398d93eab911c9ada, type: 3} + m_Name: + m_EditorClassIdentifier: Fenrir.Runtime::Fenrir.Input.InputHandler + _gesture: {fileID: 0} + _mapper: {fileID: 0} +--- !u!114 &2042922184 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2042922182} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31bdd25d7a4ff4f949384f15a49fb15b, type: 3} + m_Name: + m_EditorClassIdentifier: Fenrir.Runtime::Fenrir.Input.GestureRecognizer + _mapper: {fileID: 0} + _swipeDistanceThreshold: 60 + _holdThreshold: 0.3 +--- !u!114 &2042922185 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2042922182} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 71c06312ce0064a07a7af3acd0e6d7d6, type: 3} + m_Name: + m_EditorClassIdentifier: Fenrir.Runtime::Fenrir.Input.TouchMapper + _controller: {fileID: 0} + _combat: {fileID: 0} +--- !u!4 &2042922186 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2042922182} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 585957747} + - {fileID: 673948129} + - {fileID: 746947366} + - {fileID: 2042922186} + - {fileID: 419592644} + - {fileID: 654603745} + - {fileID: 1249111296} + - {fileID: 1298512001} + - {fileID: 1291737300} + - {fileID: 537506424} diff --git a/src/ProjectFenrir/Assets/_Project/Scenes/EmberForest.unity.meta b/src/ProjectFenrir/Assets/_Project/Scenes/EmberForest.unity.meta new file mode 100644 index 0000000..3d347a5 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scenes/EmberForest.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: baf21476c5d6844e8b5dc7db4fa6f22e +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/_Project/Scripts.meta b/src/ProjectFenrir/Assets/_Project/Scripts.meta new file mode 100644 index 0000000..5ac4ff9 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fd74e88d2cf804482ab3d1578f95f1ab +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Analytics.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Analytics.meta new file mode 100644 index 0000000..497a19e --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Analytics.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 868d6fff7c39c401891f7491b0fda42f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Analytics/EventLogger.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Analytics/EventLogger.cs new file mode 100644 index 0000000..8db4225 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Analytics/EventLogger.cs @@ -0,0 +1,45 @@ +using Fenrir.Traits; +using UnityEngine; + +namespace Fenrir.Analytics +{ + /// + /// Lightweight event logger. Listens to BehaviorEventBus and writes to + /// Unity console in development. Post-MVP: route to analytics backend. + /// + public class EventLogger + { + private readonly bool _verbose; + + public EventLogger(bool verbose = false) + { + _verbose = verbose; + SubscribeAll(); + } + + private void SubscribeAll() + { + // Log every BehaviorEvent type in development +#if UNITY_EDITOR || DEVELOPMENT_BUILD + BehaviorEventBus.Subscribe(LogEvent); + BehaviorEventBus.Subscribe(LogEvent); + BehaviorEventBus.Subscribe(LogEvent); + BehaviorEventBus.Subscribe(LogEvent); + BehaviorEventBus.Subscribe(LogEvent); + BehaviorEventBus.Subscribe(LogEvent); + BehaviorEventBus.Subscribe(LogEvent); + BehaviorEventBus.Subscribe(LogEvent); + BehaviorEventBus.Subscribe(e => + Debug.Log($"[EventLogger] ★ EVOLUTION: {e.EvolutionId}")); + BehaviorEventBus.Subscribe(e => + Debug.Log($"[EventLogger] ★ BOSS DEFEATED: {e.BossId}")); +#endif + } + + private void LogEvent(BehaviorEvent evt) + { + if (_verbose) + Debug.Log($"[EventLogger] {evt.EventKey}"); + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Analytics/EventLogger.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Analytics/EventLogger.cs.meta new file mode 100644 index 0000000..af244ab --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Analytics/EventLogger.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 31fa4238d35fc463e81fdf65534b0c2e \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Audio.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Audio.meta new file mode 100644 index 0000000..fd7f56c --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Audio.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5fbaf9a70ab9540e2a1eccb8d94bd7a9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Audio/AudioManager.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Audio/AudioManager.cs new file mode 100644 index 0000000..e6c2fb2 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Audio/AudioManager.cs @@ -0,0 +1,97 @@ +using System.Collections; +using Fenrir.Traits; +using Fenrir.World; +using UnityEngine; + +namespace Fenrir.Audio +{ + public class AudioManager : MonoBehaviour + { + [SerializeField] private MusicLayer _musicLayer; + [SerializeField] private SFXPool _sfxPool; + + [Header("Phase Clips")] + [SerializeField] private AudioClip _dawnMusic; + [SerializeField] private AudioClip _dayMusic; + [SerializeField] private AudioClip _duskMusic; + [SerializeField] private AudioClip _nightMusic; + [SerializeField] private AudioClip _combatMusic; + + private bool _inCombat; + private DayPhase _currentPhase = DayPhase.Day; + + public static AudioManager Instance { get; private set; } + + private void Awake() + { + if (Instance != null && Instance != this) { Destroy(gameObject); return; } + Instance = this; + DontDestroyOnLoad(gameObject); + } + + private void Start() + { + var cycle = FindAnyObjectByType(); + if (cycle != null) cycle.OnPhaseChanged += OnPhaseChanged; + + BehaviorEventBus.Subscribe(_ => StopCombatMusic()); + } + + // ── Day/Night ───────────────────────────────────────────────────────── + + private void OnPhaseChanged(DayPhase phase) + { + _currentPhase = phase; + if (!_inCombat) PlayPhaseMusic(phase); + } + + private void PlayPhaseMusic(DayPhase phase) + { + AudioClip clip = phase switch + { + DayPhase.Dawn => _dawnMusic, + DayPhase.Day => _dayMusic, + DayPhase.Dusk => _duskMusic, + DayPhase.Night => _nightMusic, + _ => _dayMusic + }; + if (clip) PlayMusic(clip); + } + + // ── Combat ──────────────────────────────────────────────────────────── + + public void StartCombatMusic() + { + _inCombat = true; + if (_combatMusic) PlayMusic(_combatMusic, fadeDuration: 0.5f); + } + + public void StopCombatMusic() + { + _inCombat = false; + PlayPhaseMusic(_currentPhase); + } + + // ── Core ────────────────────────────────────────────────────────────── + + public void PlayMusic(AudioClip clip, float fadeDuration = 1f) + { + _musicLayer.CrossFade(clip, fadeDuration); + } + + public void StopMusic(float fadeDuration = 1f) + { + _musicLayer.FadeOut(fadeDuration); + } + + public void PlaySFX(AudioClip clip, Vector3 worldPosition = default, float volume = 1f) + { + _sfxPool.Play(clip, worldPosition, volume); + } + + public void SetMasterVolume(float volume) + { + AudioListener.volume = Mathf.Clamp01(volume); + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Audio/AudioManager.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Audio/AudioManager.cs.meta new file mode 100644 index 0000000..d3dc066 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Audio/AudioManager.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: d72e03a4c50ba4270b333bf12dc38afa \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Audio/MusicLayer.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Audio/MusicLayer.cs new file mode 100644 index 0000000..53b7149 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Audio/MusicLayer.cs @@ -0,0 +1,58 @@ +using System.Collections; +using UnityEngine; + +namespace Fenrir.Audio +{ + [RequireComponent(typeof(AudioSource))] + public class MusicLayer : MonoBehaviour + { + [SerializeField] private AudioSource _source; + [SerializeField] [Range(0f, 1f)] private float _targetVolume = 0.7f; + + private Coroutine _fadeCoroutine; + + private void Reset() => _source = GetComponent(); + + public void CrossFade(AudioClip clip, float duration) + { + if (_fadeCoroutine != null) StopCoroutine(_fadeCoroutine); + _fadeCoroutine = StartCoroutine(DoCrossFade(clip, duration)); + } + + public void FadeOut(float duration) + { + if (_fadeCoroutine != null) StopCoroutine(_fadeCoroutine); + _fadeCoroutine = StartCoroutine(DoFade(0f, duration, stopAfter: true)); + } + + private IEnumerator DoCrossFade(AudioClip clip, float duration) + { + if (_source.isPlaying) + { + yield return DoFade(0f, duration * 0.5f, stopAfter: true); + } + + _source.clip = clip; + _source.loop = true; + _source.Play(); + + yield return DoFade(_targetVolume, duration * 0.5f, stopAfter: false); + } + + private IEnumerator DoFade(float targetVolume, float duration, bool stopAfter) + { + float startVolume = _source.volume; + float elapsed = 0f; + + while (elapsed < duration) + { + elapsed += Time.unscaledDeltaTime; + _source.volume = Mathf.Lerp(startVolume, targetVolume, elapsed / duration); + yield return null; + } + + _source.volume = targetVolume; + if (stopAfter) _source.Stop(); + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Audio/MusicLayer.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Audio/MusicLayer.cs.meta new file mode 100644 index 0000000..fcec0aa --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Audio/MusicLayer.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 30a89e948c715410a9f676aec6c0899f \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Audio/SFXPool.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Audio/SFXPool.cs new file mode 100644 index 0000000..e138c65 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Audio/SFXPool.cs @@ -0,0 +1,52 @@ +using System.Collections.Generic; +using UnityEngine; + +namespace Fenrir.Audio +{ + public class SFXPool : MonoBehaviour + { + [SerializeField] private int _poolSize = 16; + [SerializeField] private AudioSource _prefab; + + private readonly Queue _pool = new(); + + private void Awake() + { + for (int i = 0; i < _poolSize; i++) + { + AudioSource source = Instantiate(_prefab, transform); + source.gameObject.SetActive(false); + _pool.Enqueue(source); + } + } + + public void Play(AudioClip clip, Vector3 worldPosition, float volume = 1f) + { + if (clip == null) return; + + AudioSource source = GetFree(); + source.transform.position = worldPosition; + source.volume = volume; + source.clip = clip; + source.gameObject.SetActive(true); + source.Play(); + + StartCoroutine(ReturnAfterPlay(source, clip.length)); + } + + private AudioSource GetFree() + { + // Steal the oldest source if all are busy + AudioSource candidate = _pool.Dequeue(); + if (candidate.isPlaying) candidate.Stop(); + _pool.Enqueue(candidate); + return candidate; + } + + private System.Collections.IEnumerator ReturnAfterPlay(AudioSource source, float delay) + { + yield return new WaitForSeconds(delay); + source.gameObject.SetActive(false); + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Audio/SFXPool.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Audio/SFXPool.cs.meta new file mode 100644 index 0000000..153b44c --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Audio/SFXPool.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 33ad52f10c00341139d1df4414437c59 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Awakening.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Awakening.meta new file mode 100644 index 0000000..d71543a --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Awakening.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6abfa359576ce4893951ef5bda0e6690 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Awakening/AwakeningSequencer.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Awakening/AwakeningSequencer.cs new file mode 100644 index 0000000..e397961 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Awakening/AwakeningSequencer.cs @@ -0,0 +1,94 @@ +using System.Collections; +using Fenrir.Core; +using Fenrir.Save; +using UnityEngine; +using UnityEngine.SceneManagement; + +namespace Fenrir.Awakening +{ + /// + /// Drives the one-time awakening flow at first launch: + /// 1. Show character creation UI + /// 2. Derive element from Keychain seed + /// 3. Write CharacterData to save + /// 4. Play awakening cutscene + /// 5. Load main game scene + /// + /// Attach to the Awakening scene root. + /// + public class AwakeningSequencer : MonoBehaviour + { + [SerializeField] private string _gameScene = "EmberForest"; + + [Header("UI Panels")] + [SerializeField] private GameObject _characterCreationPanel; + [SerializeField] private GameObject _elementRevealPanel; + [SerializeField] private GameObject _loadingPanel; + + [Header("Timing")] + [SerializeField] private float _elementRevealHoldSeconds = 3f; + + // Filled by CharacterCreationUI before calling Confirm() + private string _pendingName; + private int _pendingSlotIndex; + + private void Start() + { + ShowCharacterCreation(); + } + + // ── UI callbacks (called by CharacterCreationUI buttons) ─────────────── + + public void SetCharacterName(string name) => _pendingName = name; + public void SetSlotIndex(int index) => _pendingSlotIndex = index; + + public void ConfirmCreation() + { + if (string.IsNullOrWhiteSpace(_pendingName)) return; + StartCoroutine(RunAwakening()); + } + + // ── Sequence ────────────────────────────────────────────────────────── + + private IEnumerator RunAwakening() + { + ShowPanel(null); // hide all + + // 1. Derive element from seed (synchronous; Keychain read is fast) + var seedService = ServiceLocator.Get(); + var element = seedService.GetSlotElement(_pendingSlotIndex); + + // 2. Write character data + if (ServiceLocator.TryGet(out var save)) + { + var c = save.Current.Character; + c.Name = _pendingName; + c.SlotIndex = _pendingSlotIndex; + c.CurrentElement = element; + c.HasAwakened = true; + save.MarkDirty(); + yield return save.SaveAsync().AsCoroutine(); + } + + // 3. Reveal element + ShowPanel(_elementRevealPanel); + // ElementRevealUI reads save to display element name/VFX + yield return new WaitForSeconds(_elementRevealHoldSeconds); + + // 4. Load game + ShowPanel(_loadingPanel); + SceneManager.LoadScene(_gameScene); + } + + // ── Helpers ─────────────────────────────────────────────────────────── + + private void ShowCharacterCreation() => ShowPanel(_characterCreationPanel); + + private void ShowPanel(GameObject panel) + { + if (_characterCreationPanel) _characterCreationPanel.SetActive(panel == _characterCreationPanel); + if (_elementRevealPanel) _elementRevealPanel .SetActive(panel == _elementRevealPanel); + if (_loadingPanel) _loadingPanel .SetActive(panel == _loadingPanel); + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Awakening/AwakeningSequencer.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Awakening/AwakeningSequencer.cs.meta new file mode 100644 index 0000000..4abaa9e --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Awakening/AwakeningSequencer.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 45ba041f54cef4e708961f90b03e29ea \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Awakening/ElementDistribution.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Awakening/ElementDistribution.cs new file mode 100644 index 0000000..8a829a5 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Awakening/ElementDistribution.cs @@ -0,0 +1,79 @@ +using System; +using Fenrir.Config; + +namespace Fenrir.Awakening +{ + /// + /// Derives an Element deterministically from a seed GUID. + /// The same seed always produces the same element. + /// + /// In MVP, non-Common results fall back to Common. + /// Full distribution activates when non-Common elements are implemented. + /// + public static class ElementDistribution + { + private const bool MvpCommonOnly = true; // flip to false when rare elements ship + + public static Element Derive(Guid seed) + { + // Convert first 8 bytes of GUID to a stable double in [0, 1) + byte[] bytes = seed.ToByteArray(); + long raw = BitConverter.ToInt64(bytes, 0) & long.MaxValue; + double roll = (double)raw / long.MaxValue; + + Element element = RollElement(roll); + + if (MvpCommonOnly && element.GetTier() != ElementTier.Common) + element = RollCommon(roll); + + return element; + } + + private static Element RollElement(double roll) + { + // Supreme: top 0.1% + if (roll >= 0.999) return RollSupreme(roll); + // Very Rare: next 0.9% + if (roll >= 0.990) return RollVeryRare(roll); + // Rare: next 6% + if (roll >= 0.930) return RollRare(roll); + // Common: bottom 93% + return RollCommon(roll); + } + + private static Element RollCommon(double roll) + { + double r = roll / 0.930; // normalise into [0,1) within Common band + if (r < 0.25) return Element.Fire; + if (r < 0.50) return Element.Water; + if (r < 0.75) return Element.Earth; + return Element.Air; + } + + private static Element RollRare(double roll) + { + double r = (roll - 0.930) / 0.060; + if (r < 0.25) return Element.Lightning; + if (r < 0.50) return Element.Metal; + if (r < 0.75) return Element.Ice; + return Element.Nature; + } + + private static Element RollVeryRare(double roll) + { + double r = (roll - 0.990) / 0.009; + if (r < 0.333) return Element.Light; + if (r < 0.666) return Element.Darkness; + return Element.Shadow; + } + + private static Element RollSupreme(double roll) + { + double r = (roll - 0.999) / 0.001; + if (r < 0.25) return Element.Space; + if (r < 0.50) return Element.Time; + if (r < 0.75) return Element.Life; + return Element.Death; + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Awakening/ElementDistribution.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Awakening/ElementDistribution.cs.meta new file mode 100644 index 0000000..c8c71b2 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Awakening/ElementDistribution.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 1c29f9014057146869e0f00e9d124285 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Awakening/ElementSeedService.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Awakening/ElementSeedService.cs new file mode 100644 index 0000000..c0a274c --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Awakening/ElementSeedService.cs @@ -0,0 +1,33 @@ +using Fenrir.Config; +using Fenrir.Save; + +namespace Fenrir.Awakening +{ + public class ElementSeedService + { + public Element GetSlotElement(int slotIndex) + { + var seed = KeychainBridge.GetOrCreateSeed(slotIndex); + return ElementDistribution.Derive(seed); + } + + /// + /// Rolls a new element for a reroll, excluding the current one. + /// Reroll still uses the full distribution — the player may land on + /// the same tier (just not the identical element). + /// + public Element Reroll(Element current) + { + Element result; + int attempts = 0; + do + { + result = ElementDistribution.Derive(System.Guid.NewGuid()); + attempts++; + } + while (result == current && attempts < 20); + + return result; + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Awakening/ElementSeedService.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Awakening/ElementSeedService.cs.meta new file mode 100644 index 0000000..c357c7b --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Awakening/ElementSeedService.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: fdf1e0127e2c94a65b2c396779f080be \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Combat.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Combat.meta new file mode 100644 index 0000000..e439f63 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Combat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4455adaf934dc48ec82eaccd4b5e7a5c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Combat/AttackData.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/AttackData.cs new file mode 100644 index 0000000..a4a1a88 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/AttackData.cs @@ -0,0 +1,28 @@ +using Fenrir.Config; + +namespace Fenrir.Combat +{ + public enum AttackType { Light, Heavy, Ability } + + /// + /// Immutable descriptor produced by PlayerCombat or EnemyCombat and consumed by AttackResolver. + /// + public readonly struct AttackData + { + public readonly AttackType Type; + public readonly float BaseDamage; + public readonly Element AttackerElement; + public readonly bool IsCounter; // landed via perfect-block window + public readonly bool IsAbility; + + public AttackData(AttackType type, float baseDamage, Element element, + bool isCounter = false, bool isAbility = false) + { + Type = type; + BaseDamage = baseDamage; + AttackerElement = element; + IsCounter = isCounter; + IsAbility = isAbility; + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Combat/AttackData.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/AttackData.cs.meta new file mode 100644 index 0000000..a7b0448 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/AttackData.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 97a7d6658dbaa4d4c8b235846d05e89a \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Combat/AttackResolver.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/AttackResolver.cs new file mode 100644 index 0000000..b8e318d --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/AttackResolver.cs @@ -0,0 +1,38 @@ +using Fenrir.Config; +using UnityEngine; + +namespace Fenrir.Combat +{ + /// + /// Stateless helper that applies elemental resistances and returns final damage. + /// Resistances apply to ability hits only (IsAbility == true). + /// Same element: −25%. Opposite element: +25%. + /// + public static class AttackResolver + { + private const float SameElementMod = 0.75f; // −25% + private const float OppositeElementMod = 1.25f; // +25% + + public static float Resolve(AttackData attack, Element defenderElement) + { + float damage = attack.BaseDamage; + + if (attack.IsAbility) + { + Element atk = attack.AttackerElement; + Element def = defenderElement; + + if (atk == def) + { + damage *= SameElementMod; + } + else if (ElementExtensions.AreOpposites(atk, def)) + { + damage *= OppositeElementMod; + } + } + + return Mathf.Max(0f, damage); + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Combat/AttackResolver.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/AttackResolver.cs.meta new file mode 100644 index 0000000..4ac543b --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/AttackResolver.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: baf51504be5af453994506555732e716 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatSystem.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatSystem.cs new file mode 100644 index 0000000..8686175 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatSystem.cs @@ -0,0 +1,59 @@ +using Fenrir.Entities.Enemies; +using Fenrir.Entities.Player; +using Fenrir.Traits; +using UnityEngine; + +namespace Fenrir.Combat +{ + /// + /// Scene-level coordinator. Tracks active combats, enemy-kill counts per type, + /// and emits high-level signals (combat started, enemy defeated, area cleared). + /// Attach to the scene root or a persistent manager object. + /// + public class CombatSystem : MonoBehaviour + { + private PlayerCombat _playerCombat; + + // Key: enemyId, Value: consecutive kill count this session + private readonly System.Collections.Generic.Dictionary _killCounts = new(); + + private void Awake() + { + _playerCombat = FindAnyObjectByType(); + } + + /// + /// Called when an enemy spawns into an encounter. + /// Hooks up death listener and notifies PlayerCombat. + /// + public void RegisterEnemy(EnemyBase enemy) + { + string id = enemy.EnemyId; + var health = enemy.GetComponent(); + var emitter = enemy.GetComponent(); + + _playerCombat?.EnterCombat(id); + + if (health != null) + { + health.OnDied += () => HandleEnemyDeath(enemy, emitter); + } + } + + private void HandleEnemyDeath(EnemyBase enemy, EnemyTraitEmitter emitter) + { + string id = enemy.EnemyId; + + _killCounts.TryGetValue(id, out int count); + _killCounts[id] = count + 1; + + bool isBoss = enemy.Archetype == EnemyArchetype.Elite; + emitter?.OnKilledByPlayer(isBoss); + + if (_killCounts[id] >= 3) + emitter?.OnHuntedRepeat(); + + _playerCombat?.ExitCombat(playerWon: true); + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatSystem.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatSystem.cs.meta new file mode 100644 index 0000000..7fcad42 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatSystem.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: d3e8c23ff183d4f05860571128c4d931 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Combat/HitStateManager.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/HitStateManager.cs new file mode 100644 index 0000000..8f671c8 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/HitStateManager.cs @@ -0,0 +1,69 @@ +using UnityEngine; + +namespace Fenrir.Combat +{ + /// + /// Tracks per-entity block / perfect-block / dodge windows. + /// Attach one instance to any entity that can receive hits (player, enemy). + /// + public class HitStateManager : MonoBehaviour + { + // ── Tunables ────────────────────────────────────────────────────────── + [SerializeField] private float _blockWindowDuration = 0.25f; + [SerializeField] private float _perfectBlockWindowDuration = 0.12f; + [SerializeField] private float _dodgeInvincibilityDuration = 0.4f; + + // ── State ───────────────────────────────────────────────────────────── + public bool IsBlocking { get; private set; } + public bool IsDodging { get; private set; } + public bool IsInvincible { get; private set; } + + private float _blockTimer; + private float _perfectBlockTimer; + private float _dodgeTimer; + + // ── Public API ──────────────────────────────────────────────────────── + + public void BeginBlock() + { + IsBlocking = true; + _blockTimer = _blockWindowDuration; + _perfectBlockTimer = _perfectBlockWindowDuration; + } + + public void EndBlock() => IsBlocking = false; + + public bool IsPerfectBlockWindow => IsBlocking && _perfectBlockTimer > 0f; + + public void BeginDodge() + { + IsDodging = true; + IsInvincible = true; + _dodgeTimer = _dodgeInvincibilityDuration; + } + + // ── Lifecycle ───────────────────────────────────────────────────────── + + private void Update() + { + if (_perfectBlockTimer > 0f) + _perfectBlockTimer -= Time.deltaTime; + + if (_blockTimer > 0f) + { + _blockTimer -= Time.deltaTime; + if (_blockTimer <= 0f) IsBlocking = false; + } + + if (_dodgeTimer > 0f) + { + _dodgeTimer -= Time.deltaTime; + if (_dodgeTimer <= 0f) + { + IsDodging = false; + IsInvincible = false; + } + } + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Combat/HitStateManager.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/HitStateManager.cs.meta new file mode 100644 index 0000000..2cab1f5 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/HitStateManager.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 3072b2113ec774481af5d2b5df536db7 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Config.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Config.meta new file mode 100644 index 0000000..96b7fa1 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Config.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 20a9d805042b44c19be62833abac4a98 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Config/Element.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Config/Element.cs new file mode 100644 index 0000000..c8be373 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Config/Element.cs @@ -0,0 +1,82 @@ +namespace Fenrir.Config +{ + public enum Element + { + // Common + Fire, + Water, + Earth, + Air, + + // Rare + Lightning, + Metal, + Ice, + Nature, + + // Very Rare + Light, + Darkness, + Shadow, + + // Supreme + Space, + Time, + Life, + Death, + + None + } + + public enum ElementTier + { + Common, + Rare, + VeryRare, + Supreme + } + + public static class ElementExtensions + { + public static ElementTier GetTier(this Element element) => element switch + { + Element.Fire or Element.Water or Element.Earth or Element.Air + => ElementTier.Common, + Element.Lightning or Element.Metal or Element.Ice or Element.Nature + => ElementTier.Rare, + Element.Light or Element.Darkness or Element.Shadow + => ElementTier.VeryRare, + Element.Space or Element.Time or Element.Life or Element.Death + => ElementTier.Supreme, + _ => ElementTier.Common + }; + + /// + /// Canonical elemental opposites used by the resistance system. + /// Fire↔Water, Earth↔Air, Lightning↔Metal, Ice↔Nature, + /// Light↔Darkness, Shadow↔Light, Space↔Time, Life↔Death. + /// + public static bool AreOpposites(Element a, Element b) + { + return (a, b) switch + { + (Element.Fire, Element.Water) => true, + (Element.Water, Element.Fire) => true, + (Element.Earth, Element.Air) => true, + (Element.Air, Element.Earth) => true, + (Element.Lightning, Element.Metal) => true, + (Element.Metal, Element.Lightning) => true, + (Element.Ice, Element.Nature) => true, + (Element.Nature, Element.Ice) => true, + (Element.Light, Element.Darkness) => true, + (Element.Darkness, Element.Light) => true, + (Element.Shadow, Element.Light) => true, + (Element.Space, Element.Time) => true, + (Element.Time, Element.Space) => true, + (Element.Life, Element.Death) => true, + (Element.Death, Element.Life) => true, + _ => false + }; + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Config/Element.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Config/Element.cs.meta new file mode 100644 index 0000000..8e074b8 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Config/Element.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: f9d18ae30238b4a65b84a5d0b8685d64 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Config/GameConfig.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Config/GameConfig.cs new file mode 100644 index 0000000..4701e9d --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Config/GameConfig.cs @@ -0,0 +1,57 @@ +namespace Fenrir.Config +{ + /// + /// All magic numbers live here. Nothing hardcoded elsewhere. + /// + public static class GameConfig + { + // ── Trait System ───────────────────────────────────────────────────── + public const float TraitNeutral = 50f; + public const float TraitMin = 0f; + public const float TraitMax = 100f; + public const float TraitEvolutionCarryover = 0.30f; // 30% shift toward neutral on evolution + public const float TraitDecayRatePerDay = 0.02f; // disabled in MVP + public const int FrequencyDampenAfter = 5; // dampening kicks in after N identical events/session + + // ── Awakening ──────────────────────────────────────────────────────── + public const int MaxCharacterSlots = 2; + public const float SupremeWeight = 0.001f; // 0.1% + public const float VeryRareWeight = 0.009f; // 0.9% + public const float RareWeight = 0.060f; // 6.0% + // Common fills remainder ~93% + + // ── Combat ─────────────────────────────────────────────────────────── + public const float EnergyMax = 100f; + public const float EnergyLowThreshold = 0.25f; // bar colour shifts below 25% + public const float EnergyDecayDelay = 3f; // seconds before out-of-combat decay + public const float EnergyDecayRate = 5f; // per second + public const float CounterWindowSeconds = 0.3f; + public const float PerfectBlockWindow = 0.2f; + public const float DodgeInvincibilitySeconds = 0.2f; + public const float DodgeCooldownSeconds = 0.6f; + public const float HeavyAttackChargeSeconds = 0.5f; + public const float BaseBlockDamageReduction = 0.60f; + + // ── Day / Night ────────────────────────────────────────────────────── + public const float DayNightCycleDurationSeconds = 1200f; // 20 minutes + + // ── XP ─────────────────────────────────────────────────────────────── + public const float XpMultiplierBossKill = 5f; + public const float XpMultiplierSecretArea = 2f; + public const float XpMultiplierQuestComplete = 3f; + public const float XpMultiplierLoreRead = 0.5f; + public const float XpMultiplierRareCreature = 1.5f; + + // ── Death Currency Loss ─────────────────────────────────────────────── + public const float DeathCurrencyLossMin = 0.15f; + public const float DeathCurrencyLossMax = 0.25f; + + // ── Elemental Resistance ───────────────────────────────────────────── + public const float ElementalResistanceMod = -0.25f; // same element + public const float ElementalWeaknessMod = 0.25f; // opposite element + + // ── Save ───────────────────────────────────────────────────────────── + public const string SaveFileName = "save.json"; + public const string KeychainSlotSeedKey = "fenrir_slot_seed_{0}"; // {0} = slot index + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Config/GameConfig.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Config/GameConfig.cs.meta new file mode 100644 index 0000000..c27c836 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Config/GameConfig.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: a4675abdd69b74da9a3cb64a7a59ec4f \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Config/TraitWeightsConfig.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Config/TraitWeightsConfig.cs new file mode 100644 index 0000000..6859e14 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Config/TraitWeightsConfig.cs @@ -0,0 +1,67 @@ +using System; +using System.Collections.Generic; + +namespace Fenrir.Config +{ + /// + /// Deserialized from StreamingAssets/Config/TraitWeights.json. + /// Maps event keys to per-trait float deltas. + /// + [Serializable] + public class TraitWeightsConfig + { + /// Key = BehaviorEvent.EventKey, Value = TraitKey → delta + public Dictionary> Weights = new() + { + // ── Combat ─────────────────────────────────────────────────────── + ["DodgeUsedEvent"] = new() { ["Patience"] = 2.0f, ["Aggression"] = -1.5f }, + ["CounterLandedEvent"] = new() { ["Dominance"] = 3.0f, ["Wisdom"] = 2.0f }, + ["PerfectBlockEvent"] = new() { ["Patience"] = 3.0f, ["Dominance"] = 2.0f }, + ["BlockUsedEvent"] = new() { ["Patience"] = 1.5f, ["Sacrifice"] = 1.0f }, + ["HeavyAttackLandedEvent"] = new() { ["Aggression"] = 1.5f }, + ["LightAttackLandedEvent"] = new() { ["Patience"] = 1.0f, ["Wisdom"] = 0.5f }, + ["AbilityUsedFullEnergyEvent"] = new() { ["Patience"] = 2.5f, ["Wisdom"] = 1.5f }, + ["AbilityUsedLowEnergyEvent"] = new() { ["Recklessness"] = 2.0f }, + ["CombatCompletedNoDodgeEvent"] = new() { ["Aggression"] = 2.0f, ["Recklessness"] = 1.0f }, + ["HitTakenNoDodgeEvent"] = new() { ["Recklessness"] = 1.5f, ["Sacrifice"] = 1.0f }, + + // ── Death ──────────────────────────────────────────────────────── + ["DeathRecklessEvent"] = new() { ["Recklessness"] = 4.0f, ["Patience"] = -2.0f }, + ["DeathSacrificeEvent"] = new() { ["Sacrifice"] = 3.0f, ["Recklessness"] = 1.5f }, + ["DeathOverwhelmedEvent"] = new() { ["Recklessness"] = -1.0f, ["Wisdom"] = -1.0f }, + ["DeathPatternFailEvent"] = new() { ["Wisdom"] = -3.0f }, + // DeathAmbushEvent → no trait shift (handled in TraitAccumulator) + + // ── Creature ───────────────────────────────────────────────────── + ["CreatureSparedEvent"] = new() { ["Mercy"] = 3.0f, ["Curiosity"] = 1.5f }, + ["CreatureHuntedRepeatEvent"] = new() { ["Dominance"] = 2.0f, ["Aggression"] = 1.5f }, + + // ── World ──────────────────────────────────────────────────────── + ["DialogueMercyEvent"] = new() { ["Mercy"] = 3.0f, ["Loyalty"] = 1.5f }, + ["DialoguePunishmentEvent"] = new() { ["Mercy"] = -2.0f, ["Dominance"] = 2.5f }, + ["NpcHelpedEvent"] = new() { ["Loyalty"] = 3.0f, ["Wisdom"] = 1.0f }, + ["NpcIgnoredEvent"] = new() { ["Loyalty"] = -2.0f }, + ["LoreObjectReadEvent"] = new() { ["Wisdom"] = 2.0f, ["Curiosity"] = 1.5f }, + ["SecretAreaDiscoveredEvent"] = new() { ["Exploration"] = 4.0f, ["Curiosity"] = 2.0f }, + ["OriginVillageReturnEvent"] = new() { ["Loyalty"] = 3.5f }, + ["AreaRevisitedEvent"] = new() { ["Loyalty"] = 1.5f, ["Curiosity"] = 1.0f }, + ["QuestCompletedEvent"] = new() { ["Loyalty"] = 2.5f, ["Wisdom"] = 1.0f }, + + // ── Economic ───────────────────────────────────────────────────── + ["OffensiveUpgradePurchasedEvent"] = new() { ["Aggression"] = 2.0f }, + ["DefensiveUpgradePurchasedEvent"] = new() { ["Sacrifice"] = 2.0f, ["Patience"] = 1.5f }, + ["KnowledgeItemPurchasedEvent"] = new() { ["Wisdom"] = 2.5f, ["Curiosity"] = 1.5f }, + ["CurrencyHoardedEvent"] = new() { ["Patience"] = 2.0f, ["Wisdom"] = 1.0f }, + ["CurrencySpentImmediatelyEvent"] = new() { ["Recklessness"] = 1.5f }, + + // ── Exploration ────────────────────────────────────────────────── + ["ExtendedDangerZoneEvent"] = new() { ["Aggression"] = 1.5f, ["Recklessness"] = 1.5f }, + ["ExtendedSafeZoneEvent"] = new() { ["Loyalty"] = 1.5f, ["Patience"] = 1.5f }, + ["AllSecretsFoundEvent"] = new() { ["Exploration"] = 4.0f, ["Wisdom"] = 2.0f }, + ["NightExplorationEvent"] = new() { ["Curiosity"] = 1.5f }, + + // ── Boss ───────────────────────────────────────────────────────── + ["BossKilledEvent"] = new() { ["Dominance"] = 3.0f, ["Wisdom"] = 2.0f }, + }; + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Config/TraitWeightsConfig.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Config/TraitWeightsConfig.cs.meta new file mode 100644 index 0000000..8316d0f --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Config/TraitWeightsConfig.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: de177b0d81a4b4eeb9f8a69e0c238616 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Core.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Core.meta new file mode 100644 index 0000000..c07dabe --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Core.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fff337cd75d534d7c9fced88e29d91ac +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Core/Bootstrap.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Core/Bootstrap.cs new file mode 100644 index 0000000..403840d --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Core/Bootstrap.cs @@ -0,0 +1,132 @@ +using System.Threading.Tasks; +using Fenrir.Analytics; +using Fenrir.Awakening; +using Fenrir.Config; +using Fenrir.Core; +using Fenrir.Evolution; +using Fenrir.Save; +using Fenrir.Traits; +using UnityEngine; +using UnityEngine.SceneManagement; + +namespace Fenrir.Core +{ + /// + /// Scene index 0. Bootstraps all services and routes to the correct first scene. + /// Marked DontDestroyOnLoad — never unloaded during a session. + /// + public class Bootstrap : MonoBehaviour + { + [SerializeField] private string _mainMenuScene = "MainMenu"; + [SerializeField] private string _awakeningScene = "Awakening"; + [SerializeField] private string _gameScene = "EmberForest"; + + private async void Start() + { + DontDestroyOnLoad(gameObject); + RegisterServices(); + await LoadSaveData(); + RouteToInitialScene(); + } + + private void RegisterServices() + { + // Save + var saveManager = new SaveManager(); + ServiceLocator.Register(saveManager); + + // Awakening + ServiceLocator.Register(new ElementSeedService()); + + // Load configs from StreamingAssets at runtime + // (Full implementation in Phase 2 — stubs for now) + var evolutionConfig = new EvolutionSignaturesConfig(); + var traitWeights = new TraitWeightsConfig(); + + // Evolution + var evolutionChecker = new EvolutionChecker(evolutionConfig); + ServiceLocator.Register(evolutionChecker); + + // Traits — profile comes from save; accumulator wired after load + ServiceLocator.Register(traitWeights); + + // Analytics + var logger = new EventLogger(verbose: Debug.isDebugBuild); + ServiceLocator.Register(logger); + + Debug.Log("[Bootstrap] Services registered."); + } + + private async Task LoadSaveData() + { + ISaveManager save = ServiceLocator.Get(); + bool loaded = await save.LoadAsync(); + + if (loaded) + { + // Wire TraitAccumulator to the loaded profile + var accumulator = new TraitAccumulator( + save.Current.Character.Traits, + ServiceLocator.Get(), + ServiceLocator.Get() + ); + ServiceLocator.Register(accumulator); + + // Subscribe accumulator to each concrete event type. + // (Bus is keyed by concrete type — base-type subscription doesn't propagate.) + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + } + + Debug.Log($"[Bootstrap] Save loaded: {loaded}"); + } + + private void RouteToInitialScene() + { + ISaveManager save = ServiceLocator.Get(); + + if (!save.Current.Character.HasAwakened) + { + SceneManager.LoadScene(_awakeningScene); + return; + } + + // Resume at last known game state + SceneManager.LoadScene(_gameScene); + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Core/Bootstrap.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Core/Bootstrap.cs.meta new file mode 100644 index 0000000..456602d --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Core/Bootstrap.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 0370b35fac4624423839f6d8bf9ef882 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Core/ServiceLocator.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Core/ServiceLocator.cs new file mode 100644 index 0000000..04c750c --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Core/ServiceLocator.cs @@ -0,0 +1,47 @@ +using System; +using System.Collections.Generic; +using UnityEngine; + +namespace Fenrir.Core +{ + /// + /// Lightweight service locator. Register services at Bootstrap, resolve anywhere. + /// Never use FindObjectOfType or static singletons in production code. + /// + public static class ServiceLocator + { + private static readonly Dictionary _services = new(); + + public static void Register(T service) where T : class + { + Type type = typeof(T); + if (_services.ContainsKey(type)) + Debug.LogWarning($"[ServiceLocator] Overwriting existing registration for {type.Name}"); + _services[type] = service; + } + + public static T Get() where T : class + { + if (_services.TryGetValue(typeof(T), out object service)) + return (T)service; + + throw new InvalidOperationException( + $"[ServiceLocator] No service registered for {typeof(T).Name}. " + + "Ensure Bootstrap has completed before accessing services."); + } + + public static bool TryGet(out T service) where T : class + { + if (_services.TryGetValue(typeof(T), out object obj)) + { + service = (T)obj; + return true; + } + service = null; + return false; + } + + /// Call in tests or on full app reset. + public static void Clear() => _services.Clear(); + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Core/ServiceLocator.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Core/ServiceLocator.cs.meta new file mode 100644 index 0000000..baff918 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Core/ServiceLocator.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 009378f72967c4cabaf9168bb041eef7 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Core/TaskExtensions.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Core/TaskExtensions.cs new file mode 100644 index 0000000..7a30549 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Core/TaskExtensions.cs @@ -0,0 +1,15 @@ +using System.Collections; +using System.Threading.Tasks; + +namespace Fenrir.Core +{ + /// Bridges async Tasks into Unity coroutines. + public static class TaskExtensions + { + public static IEnumerator AsCoroutine(this Task task) + { + while (!task.IsCompleted) yield return null; + if (task.IsFaulted) throw task.Exception; + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Core/TaskExtensions.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Core/TaskExtensions.cs.meta new file mode 100644 index 0000000..9a7288e --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Core/TaskExtensions.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 79c02a14155594fd1826c5cd1a94bd3c \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Entities.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Entities.meta new file mode 100644 index 0000000..9becb57 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Entities.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ac8eee76e1ed74b7a90a4d6937f1fa61 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Creatures.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Creatures.meta new file mode 100644 index 0000000..b7decec --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Creatures.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5bc6e6c789d204b0bb6fc3e44984b852 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies.meta new file mode 100644 index 0000000..5a9348a --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 343dfd5f7aad14f47b93e6f661ac7a17 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyAI.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyAI.cs new file mode 100644 index 0000000..b4ff59c --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyAI.cs @@ -0,0 +1,145 @@ +using UnityEngine; +using UnityEngine.AI; + +namespace Fenrir.Entities.Enemies +{ + /// + /// Simple state-driven AI using Unity NavMesh. + /// States: Idle → Chase → Attack → Stagger → Dead. + /// + [RequireComponent(typeof(EnemyBase), typeof(EnemyHealth), typeof(NavMeshAgent))] + public class EnemyAI : MonoBehaviour + { + private enum AIState { Idle, Chase, Attack, Stagger, Dead } + + // ── Tunables ────────────────────────────────────────────────────────── + [SerializeField] private float _detectionRange = 10f; + [SerializeField] private float _attackRange = 2f; + [SerializeField] private float _attackInterval = 1.5f; + [SerializeField] private float _staggerDuration = 0.5f; + + // ── Components ──────────────────────────────────────────────────────── + private EnemyBase _base; + private EnemyHealth _health; + private NavMeshAgent _agent; + + // ── State ───────────────────────────────────────────────────────────── + private AIState _state = AIState.Idle; + private Transform _target; + private float _attackCooldown; + private float _staggerTimer; + + private void Awake() + { + _base = GetComponent(); + _health = GetComponent(); + _agent = GetComponent(); + + _health.OnDied += HandleDeath; + } + + private void Update() + { + switch (_state) + { + case AIState.Idle: TickIdle(); break; + case AIState.Chase: TickChase(); break; + case AIState.Attack: TickAttack(); break; + case AIState.Stagger: TickStagger(); break; + } + } + + // ── State ticks ─────────────────────────────────────────────────────── + + private void TickIdle() + { + _target = FindPlayer(); + if (_target == null) return; + + float dist = Vector3.Distance(transform.position, _target.position); + if (dist <= _detectionRange) TransitionTo(AIState.Chase); + } + + private void TickChase() + { + if (_target == null) { TransitionTo(AIState.Idle); return; } + + float dist = Vector3.Distance(transform.position, _target.position); + + if (dist > _detectionRange * 1.5f) + { + TransitionTo(AIState.Idle); + return; + } + + if (dist <= _attackRange) + { + TransitionTo(AIState.Attack); + return; + } + + _agent.SetDestination(_target.position); + } + + private void TickAttack() + { + if (_target == null) { TransitionTo(AIState.Idle); return; } + + float dist = Vector3.Distance(transform.position, _target.position); + + if (dist > _attackRange) + { + TransitionTo(AIState.Chase); + return; + } + + _agent.ResetPath(); + _attackCooldown -= Time.deltaTime; + if (_attackCooldown <= 0f) + { + _attackCooldown = _attackInterval; + PerformAttack(); + } + } + + private void TickStagger() + { + _staggerTimer -= Time.deltaTime; + if (_staggerTimer <= 0f) + TransitionTo(_target != null ? AIState.Chase : AIState.Idle); + } + + // ── Helpers ─────────────────────────────────────────────────────────── + + private void PerformAttack() + { + // Delegate to EnemyCombat on the same GameObject + GetComponent()?.Attack(_target.gameObject); + } + + private static Transform FindPlayer() + { + var go = GameObject.FindWithTag("Player"); + return go != null ? go.transform : null; + } + + private void TransitionTo(AIState next) + { + _state = next; + if (next == AIState.Idle || next == AIState.Dead) + _agent.ResetPath(); + } + + private void HandleDeath() + { + TransitionTo(AIState.Dead); + _agent.enabled = false; + } + + public void Stagger() + { + _staggerTimer = _staggerDuration; + TransitionTo(AIState.Stagger); + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyAI.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyAI.cs.meta new file mode 100644 index 0000000..385bfa3 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyAI.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 633231331547d44c8a9a22492b0e7313 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyBase.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyBase.cs new file mode 100644 index 0000000..339a6cc --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyBase.cs @@ -0,0 +1,30 @@ +using Fenrir.Config; +using UnityEngine; + +namespace Fenrir.Entities.Enemies +{ + public enum EnemyArchetype + { + Aggressive, // high damage, low HP + Defensive, // shields, blocks + Ranged, // projectile attacks + Pack, // weak alone, dangerous in numbers + Elite // mini-boss tier, telegraphed heavy attacks + } + + /// + /// Base component shared by all enemy types. + /// Holds shared data (ID, archetype, element). + /// Specific AI behaviour lives in EnemyAI. + /// + public class EnemyBase : MonoBehaviour + { + [SerializeField] private string _enemyId = "enemy_unknown"; + [SerializeField] private EnemyArchetype _archetype = EnemyArchetype.Aggressive; + [SerializeField] private Element _element = Element.Fire; + + public string EnemyId => _enemyId; + public EnemyArchetype Archetype => _archetype; + public Element Element => _element; + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyBase.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyBase.cs.meta new file mode 100644 index 0000000..9e1f46d --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyBase.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 793ea022963524b928dccf5a05b9ac25 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyCombat.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyCombat.cs new file mode 100644 index 0000000..0dc8188 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyCombat.cs @@ -0,0 +1,34 @@ +using Fenrir.Combat; +using Fenrir.Entities.Player; +using UnityEngine; + +namespace Fenrir.Entities.Enemies +{ + /// + /// Produces and delivers attacks from the enemy to the player. + /// + [RequireComponent(typeof(EnemyBase))] + public class EnemyCombat : MonoBehaviour + { + [SerializeField] private float _attackDamage = 12f; + + private EnemyBase _base; + + private void Awake() => _base = GetComponent(); + + public void Attack(GameObject target) + { + if (target == null) return; + + var attack = new AttackData( + AttackType.Light, + _attackDamage, + _base.Element + ); + + var playerElement = _base.Element; // defender element fetched from player save in PlayerHealth + target.GetComponent() + ?.TakeHit(attack, playerElement); + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyCombat.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyCombat.cs.meta new file mode 100644 index 0000000..9ad4444 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyCombat.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 721b197037aaf4938ae650553430c96f \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyHealth.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyHealth.cs new file mode 100644 index 0000000..64626b9 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyHealth.cs @@ -0,0 +1,51 @@ +using System; +using Fenrir.Combat; +using Fenrir.Config; +using UnityEngine; + +namespace Fenrir.Entities.Enemies +{ + /// + /// HP management for an enemy. Applies incoming player attacks. + /// + public class EnemyHealth : MonoBehaviour + { + [SerializeField] private float _maxHp = 60f; + [SerializeField] private Element _element = Element.Fire; + + public float MaxHp => _maxHp; + public float Current { get; private set; } + public float CurrentNormalized => Current / _maxHp; + public bool IsDead { get; private set; } + public Element Element => _element; + + public event Action OnDied; + public event Action OnDamaged; + + private void Awake() => Current = _maxHp; + + public void TakeHit(AttackData attack, Element attackerElement) + { + if (IsDead) return; + + float damage = AttackResolver.Resolve(attack, _element); + Current = Mathf.Max(0f, Current - damage); + OnDamaged?.Invoke(CurrentNormalized); + + if (Current <= 0f) Die(); + } + + private void Die() + { + if (IsDead) return; + IsDead = true; + OnDied?.Invoke(); + } + + public void ResetHealth() + { + IsDead = false; + Current = _maxHp; + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyHealth.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyHealth.cs.meta new file mode 100644 index 0000000..ddcecc9 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyHealth.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 5232ef393e3d440e6856ea69b387ad99 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyTraitEmitter.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyTraitEmitter.cs new file mode 100644 index 0000000..7f5d1d1 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyTraitEmitter.cs @@ -0,0 +1,28 @@ +using Fenrir.Traits; +using UnityEngine; + +namespace Fenrir.Entities.Enemies +{ + /// + /// Emits trait events related to enemy outcomes (kills, boss defeats, creature sparing). + /// Called by game systems (CombatSystem, world scripting) — not by EnemyAI directly. + /// + [RequireComponent(typeof(EnemyBase))] + public class EnemyTraitEmitter : MonoBehaviour + { + private EnemyBase _base; + + private void Awake() => _base = GetComponent(); + + /// Player killed this enemy — emit boss signal if applicable. + public void OnKilledByPlayer(bool isBoss, string bossId = null) + { + if (isBoss) + BehaviorEventBus.Emit(new BossKilledEvent { BossId = bossId ?? _base.EnemyId }); + } + + /// Called when the player has killed this creature type 3+ times in sequence. + public void OnHuntedRepeat() + => BehaviorEventBus.Emit(new CreatureHuntedRepeatEvent()); + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyTraitEmitter.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyTraitEmitter.cs.meta new file mode 100644 index 0000000..c57cdb9 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyTraitEmitter.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 730e32cc82a774cc5b6368b9fc0abeae \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player.meta new file mode 100644 index 0000000..2fa08d3 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c9807b3f58aaa41f99166359c9b3d221 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerCombat.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerCombat.cs new file mode 100644 index 0000000..2dce189 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerCombat.cs @@ -0,0 +1,135 @@ +using Fenrir.Combat; +using Fenrir.Config; +using Fenrir.Core; +using Fenrir.Save; +using Fenrir.Traits; +using UnityEngine; + +namespace Fenrir.Entities.Player +{ + /// + /// Owns the player's attack/block/dodge decision logic. + /// Produces AttackData structs for AttackResolver. + /// Tracks consecutive deaths vs. the same enemy ID for pattern-failure detection. + /// + [RequireComponent(typeof(PlayerHealth))] + [RequireComponent(typeof(PlayerEnergy))] + [RequireComponent(typeof(PlayerTraitEmitter))] + [RequireComponent(typeof(HitStateManager))] + public class PlayerCombat : MonoBehaviour + { + // ── Tunables ────────────────────────────────────────────────────────── + [SerializeField] private float _lightAttackDamage = 15f; + [SerializeField] private float _heavyAttackDamage = 35f; + [SerializeField] private float _abilityDamage = 50f; + [SerializeField] private float _abilityEnergyCost = 40f; + + // ── Components ──────────────────────────────────────────────────────── + private PlayerHealth _health; + private PlayerEnergy _energy; + private PlayerTraitEmitter _emitter; + private HitStateManager _hitState; + + // ── Combat state ────────────────────────────────────────────────────── + private bool _usedDodgeThisCombat; + private string _currentEnemyId; + private int _consecutiveDeathsVsSameEnemy; + + private Element PlayerElement => ServiceLocator.TryGet(out var save) + ? save.Current.Character.CurrentElement + : Element.Fire; + + private void Awake() + { + _health = GetComponent(); + _energy = GetComponent(); + _emitter = GetComponent(); + _hitState = GetComponent(); + + _health.OnDied += HandleDeath; + } + + // ── Input forwarding (called by InputHandler/TouchMapper) ───────────── + + public void DoLightAttack(GameObject target) + { + var attack = new AttackData(AttackType.Light, _lightAttackDamage, PlayerElement); + _emitter.OnLightAttackLanded(); // optimistic — real hit detection in AttackResolver + TryHitTarget(target, attack); + } + + public void DoHeavyAttack(GameObject target) + { + var attack = new AttackData(AttackType.Heavy, _heavyAttackDamage, PlayerElement); + _emitter.OnHeavyAttackLanded(); + TryHitTarget(target, attack); + } + + public void DoAbility(GameObject target) + { + if (!_energy.TrySpend(_abilityEnergyCost)) return; + var attack = new AttackData(AttackType.Ability, _abilityDamage, PlayerElement, isAbility: true); + _emitter.OnAbilityUsed(); + TryHitTarget(target, attack); + } + + public void DoBlock() => _hitState.BeginBlock(); + public void EndBlock() => _hitState.EndBlock(); + + public void DoDodge() + { + _hitState.BeginDodge(); + _usedDodgeThisCombat = true; + _emitter.OnDodgeUsed(); + } + + // ── Combat lifecycle ────────────────────────────────────────────────── + + public void EnterCombat(string enemyId) + { + _currentEnemyId = enemyId; + _usedDodgeThisCombat = false; + _health.BeginCombat(); + } + + public void ExitCombat(bool playerWon) + { + _health.EndCombat(); + + if (playerWon) + { + _consecutiveDeathsVsSameEnemy = 0; + + if (!_usedDodgeThisCombat) + _emitter.OnCombatCompletedNoDodge(); + } + } + + // ── Internal ────────────────────────────────────────────────────────── + + private void TryHitTarget(GameObject target, AttackData attack) + { + if (target == null) return; + var enemyHealth = target.GetComponent(); + if (enemyHealth != null) + enemyHealth.TakeHit(attack, PlayerElement); + } + + private void HandleDeath() + { + if (_currentEnemyId != null) + _consecutiveDeathsVsSameEnemy++; + + _health.SetConsecutiveDeaths(_consecutiveDeathsVsSameEnemy); + + // Apply currency loss + if (ServiceLocator.TryGet(out var save)) + { + float loss = Random.Range(GameConfig.DeathCurrencyLossMin, GameConfig.DeathCurrencyLossMax); + int toRemove = Mathf.FloorToInt(save.Current.Character.Currency * loss); + save.Current.Character.Currency = Mathf.Max(0, save.Current.Character.Currency - toRemove); + save.MarkDirty(); + } + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerCombat.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerCombat.cs.meta new file mode 100644 index 0000000..fb59de6 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerCombat.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 81e51eab9310d4a30ab9ffc5a3fed505 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerController.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerController.cs new file mode 100644 index 0000000..408c1ee --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerController.cs @@ -0,0 +1,113 @@ +using Fenrir.StateMachine; +using UnityEngine; + +namespace Fenrir.Entities.Player +{ + /// + /// Owns movement and state machine for the player entity. + /// Receives movement vectors from InputHandler (via TouchMapper). + /// Camera is handled separately by a CinemachineFreeLook. + /// + [RequireComponent(typeof(CharacterController))] + public class PlayerController : MonoBehaviour + { + // ── Tunables ────────────────────────────────────────────────────────── + [SerializeField] private float _moveSpeed = 5f; + [SerializeField] private float _dodgeSpeed = 12f; + [SerializeField] private float _rotateSpeed = 720f; // degrees / second + [SerializeField] private float _gravity = -20f; + + // ── State ───────────────────────────────────────────────────────────── + public PlayerState State { get; private set; } = PlayerState.Idle; + + private CharacterController _cc; + private Vector3 _moveInput; + private Vector3 _velocity; + private bool _dodgeRequested; + + private void Awake() => _cc = GetComponent(); + + // ── Input injection (called by TouchMapper) ─────────────────────────── + + public void SetMoveInput(Vector2 input) + => _moveInput = new Vector3(input.x, 0f, input.y); + + public void RequestDodge() => _dodgeRequested = true; + + // ── Lifecycle ───────────────────────────────────────────────────────── + + private void Update() + { + if (State == PlayerState.Dead) return; + + ApplyGravity(); + HandleMovement(); + } + + private void ApplyGravity() + { + if (_cc.isGrounded && _velocity.y < 0f) + _velocity.y = -2f; // stick to ground + + _velocity.y += _gravity * Time.deltaTime; + } + + private void HandleMovement() + { + Vector3 worldMove = TransformMoveInput(_moveInput); + float speed = _moveSpeed; + + if (_dodgeRequested) + { + _dodgeRequested = false; + worldMove = worldMove == Vector3.zero ? transform.forward : worldMove.normalized; + speed = _dodgeSpeed; + TransitionTo(PlayerState.Dodging); + } + else if (worldMove.sqrMagnitude > 0.01f) + { + RotateToward(worldMove); + if (State == PlayerState.Idle) TransitionTo(PlayerState.Moving); + } + else + { + if (State == PlayerState.Moving) TransitionTo(PlayerState.Idle); + } + + _cc.Move((worldMove * speed + _velocity) * Time.deltaTime); + } + + /// Rotates move input relative to the main camera's horizontal orientation. + private Vector3 TransformMoveInput(Vector3 input) + { + if (input.sqrMagnitude < 0.01f) return Vector3.zero; + + Transform cam = Camera.main != null ? Camera.main.transform : null; + if (cam == null) return input.normalized; + + Vector3 camForward = Vector3.ProjectOnPlane(cam.forward, Vector3.up).normalized; + Vector3 camRight = Vector3.ProjectOnPlane(cam.right, Vector3.up).normalized; + + return (camForward * input.z + camRight * input.x).normalized; + } + + private void RotateToward(Vector3 direction) + { + if (direction == Vector3.zero) return; + Quaternion target = Quaternion.LookRotation(direction); + transform.rotation = Quaternion.RotateTowards(transform.rotation, target, + _rotateSpeed * Time.deltaTime); + } + + // ── State machine ───────────────────────────────────────────────────── + + public void TransitionTo(PlayerState next) + { + if (State == next) return; + State = next; + } + + public void SetDead() => TransitionTo(PlayerState.Dead); + public void SetIdle() => TransitionTo(PlayerState.Idle); + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerController.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerController.cs.meta new file mode 100644 index 0000000..014a3b6 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerController.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 9a8a6577dcfef4a6aaebdce573ac235c \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerEnergy.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerEnergy.cs new file mode 100644 index 0000000..dd4afb9 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerEnergy.cs @@ -0,0 +1,48 @@ +using Fenrir.Config; +using System; +using UnityEngine; + +namespace Fenrir.Entities.Player +{ + /// + /// Manages the player energy bar. Energy recharges over time. + /// UI reads CurrentNormalized (0–1) and ColorThreshold to colour the bar. + /// + public class PlayerEnergy : MonoBehaviour + { + // ── Tunables ────────────────────────────────────────────────────────── + [SerializeField] private float _rechargePerSecond = 8f; // tuned per design doc + + // ── State ───────────────────────────────────────────────────────────── + public float Current { get; private set; } = GameConfig.EnergyMax; + public float Max => GameConfig.EnergyMax; + public float CurrentNormalized => Current / Max; + + /// Raised whenever energy changes (e.g. to drive UI colour). + public event Action OnEnergyChanged; + + // ── Public API ──────────────────────────────────────────────────────── + + /// True if enough energy was available and was consumed. + public bool TrySpend(float amount) + { + if (Current < amount) return false; + Current = Mathf.Max(0f, Current - amount); + OnEnergyChanged?.Invoke(Current); + return true; + } + + public bool HasEnergy(float amount) => Current >= amount; + + public bool IsLow => CurrentNormalized <= GameConfig.EnergyLowThreshold; + + // ── Lifecycle ───────────────────────────────────────────────────────── + + private void Update() + { + if (Current >= Max) return; + Current = Mathf.Min(Max, Current + _rechargePerSecond * Time.deltaTime); + OnEnergyChanged?.Invoke(Current); + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerEnergy.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerEnergy.cs.meta new file mode 100644 index 0000000..82d320c --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerEnergy.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 91c00435c520149858958f23569959f8 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs new file mode 100644 index 0000000..5945df4 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs @@ -0,0 +1,137 @@ +using System; +using Fenrir.Combat; +using Fenrir.Config; +using Fenrir.Traits; +using UnityEngine; + +namespace Fenrir.Entities.Player +{ + /// + /// Manages player HP, applies incoming attacks via HitStateManager, emits trait events on death. + /// + [RequireComponent(typeof(HitStateManager))] + public class PlayerHealth : MonoBehaviour + { + [SerializeField] private float _maxHp = 100f; + + public float MaxHp => _maxHp; + public float Current { get; private set; } + public float CurrentNormalized => Current / _maxHp; + public bool IsDead { get; private set; } + + public event Action OnDied; + public event Action OnDamaged; // passes normalised HP after hit + + private HitStateManager _hitState; + + // Combat context for death classification + private int _hitsTakenThisCombat; + private float _combatStartTime; + private bool _inCombat; + private int _consecutiveDeathsVsSameEnemy; // tracked by PlayerCombat, injected here + + public void SetConsecutiveDeaths(int v) => _consecutiveDeathsVsSameEnemy = v; + + private void Awake() + { + Current = _maxHp; + _hitState = GetComponent(); + } + + public void BeginCombat() + { + _inCombat = true; + _combatStartTime = Time.time; + _hitsTakenThisCombat = 0; + } + + public void EndCombat() => _inCombat = false; + + /// Returns whether the hit landed (false if dodging). + public bool TakeHit(AttackData attack, Element defenderElement) + { + if (IsDead) return false; + if (_hitState.IsInvincible) return false; + + float damage = attack.BaseDamage; + + if (_hitState.IsPerfectBlockWindow) + { + // Perfect block absorbs all damage + BehaviorEventBus.Emit(new PerfectBlockEvent()); + return true; + } + + if (_hitState.IsBlocking) + { + damage *= (1f - GameConfig.BaseBlockDamageReduction); + BehaviorEventBus.Emit(new BlockUsedEvent()); + } + else + { + _hitsTakenThisCombat++; + BehaviorEventBus.Emit(new HitTakenNoDodgeEvent()); + } + + damage = AttackResolver.Resolve(new AttackData( + attack.Type, damage, attack.AttackerElement, attack.IsCounter, attack.IsAbility + ), defenderElement); + + Current = Mathf.Max(0f, Current - damage); + OnDamaged?.Invoke(CurrentNormalized); + + if (Current <= 0f) Die(); + return true; + } + + public void Heal(float amount) + { + Current = Mathf.Min(_maxHp, Current + amount); + } + + // ── Death ───────────────────────────────────────────────────────────── + + private void Die() + { + if (IsDead) return; + IsDead = true; + + EmitDeathEvent(); + OnDied?.Invoke(); + } + + private void EmitDeathEvent() + { + // Ambush: died within 5s of entering combat + if (_inCombat && (Time.time - _combatStartTime) < 5f) + { + // DeathAmbushEvent → no trait shift per design + BehaviorEventBus.Emit(new DeathAmbushEvent()); + return; + } + + // Pattern failure: 3rd+ death vs same enemy type + if (_consecutiveDeathsVsSameEnemy >= 2) + { + BehaviorEventBus.Emit(new DeathPatternFailEvent()); + return; + } + + // Reckless: took 3+ unhpblocked hits with no dodge or block used + if (_hitsTakenThisCombat >= 3) + { + BehaviorEventBus.Emit(new DeathRecklessEvent()); + return; + } + + // Overwhelmed: classified externally (set before death) — fallback + BehaviorEventBus.Emit(new DeathOverwhelmedEvent()); + } + + public void Revive(float hpFraction = 1f) + { + IsDead = false; + Current = _maxHp * Mathf.Clamp01(hpFraction); + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs.meta new file mode 100644 index 0000000..893c4b7 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: d280ba2a8c164415cb48f7b41a9ade11 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerTraitEmitter.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerTraitEmitter.cs new file mode 100644 index 0000000..20f34c6 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerTraitEmitter.cs @@ -0,0 +1,107 @@ +using Fenrir.Config; +using Fenrir.Traits; +using UnityEngine; + +namespace Fenrir.Entities.Player +{ + /// + /// Listens to player-driven events and emits BehaviorEvents to the bus. + /// Called by PlayerCombat and PlayerController at the right moments. + /// + public class PlayerTraitEmitter : MonoBehaviour + { + private PlayerEnergy _energy; + + private void Awake() => _energy = GetComponent(); + + // ── Combat signals ──────────────────────────────────────────────────── + + public void OnDodgeUsed() + => BehaviorEventBus.Emit(new DodgeUsedEvent()); + + public void OnCounterLanded() + => BehaviorEventBus.Emit(new CounterLandedEvent()); + + public void OnHeavyAttackLanded() + => BehaviorEventBus.Emit(new HeavyAttackLandedEvent()); + + public void OnLightAttackLanded() + => BehaviorEventBus.Emit(new LightAttackLandedEvent()); + + public void OnAbilityUsed() + { + if (_energy != null && _energy.IsLow) + BehaviorEventBus.Emit(new AbilityUsedLowEnergyEvent()); + else + BehaviorEventBus.Emit(new AbilityUsedFullEnergyEvent()); + } + + public void OnCombatCompletedNoDodge() + => BehaviorEventBus.Emit(new CombatCompletedNoDodgeEvent()); + + // ── World signals ───────────────────────────────────────────────────── + + public void OnCreatureSpared() + => BehaviorEventBus.Emit(new CreatureSparedEvent()); + + public void OnCreatureHuntedRepeat() + => BehaviorEventBus.Emit(new CreatureHuntedRepeatEvent()); + + public void OnLoreObjectRead() + => BehaviorEventBus.Emit(new LoreObjectReadEvent()); + + public void OnSecretAreaDiscovered() + => BehaviorEventBus.Emit(new SecretAreaDiscoveredEvent()); + + public void OnNpcHelped() + => BehaviorEventBus.Emit(new NpcHelpedEvent()); + + public void OnNpcIgnored() + => BehaviorEventBus.Emit(new NpcIgnoredEvent()); + + public void OnOriginVillageReturn() + => BehaviorEventBus.Emit(new OriginVillageReturnEvent()); + + public void OnAreaRevisited() + => BehaviorEventBus.Emit(new AreaRevisitedEvent()); + + public void OnQuestCompleted() + => BehaviorEventBus.Emit(new QuestCompletedEvent()); + + // ── Dialogue signals ────────────────────────────────────────────────── + + public void OnDialogueMercy() + => BehaviorEventBus.Emit(new DialogueMercyEvent()); + + public void OnDialoguePunishment() + => BehaviorEventBus.Emit(new DialoguePunishmentEvent()); + + // ── Economic signals ────────────────────────────────────────────────── + + public void OnOffensiveUpgradePurchased() + => BehaviorEventBus.Emit(new OffensiveUpgradePurchasedEvent()); + + public void OnDefensiveUpgradePurchased() + => BehaviorEventBus.Emit(new DefensiveUpgradePurchasedEvent()); + + public void OnKnowledgeItemPurchased() + => BehaviorEventBus.Emit(new KnowledgeItemPurchasedEvent()); + + public void OnCurrencyHoarded() + => BehaviorEventBus.Emit(new CurrencyHoardedEvent()); + + public void OnCurrencySpentImmediately() + => BehaviorEventBus.Emit(new CurrencySpentImmediatelyEvent()); + + // ── Zone signals ────────────────────────────────────────────────────── + + public void OnExtendedDangerZone() + => BehaviorEventBus.Emit(new ExtendedDangerZoneEvent()); + + public void OnExtendedSafeZone() + => BehaviorEventBus.Emit(new ExtendedSafeZoneEvent()); + + public void OnAllSecretsFound() + => BehaviorEventBus.Emit(new AllSecretsFoundEvent()); + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerTraitEmitter.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerTraitEmitter.cs.meta new file mode 100644 index 0000000..97c6373 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerTraitEmitter.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 81cdd3ccd9f07487c909e0c7b7efe385 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Evolution.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Evolution.meta new file mode 100644 index 0000000..7f0dc79 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Evolution.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: edb127c8162f8400bbcb4a24412bcf80 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/EvolutionCandidate.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/EvolutionCandidate.cs new file mode 100644 index 0000000..f3d048b --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/EvolutionCandidate.cs @@ -0,0 +1,16 @@ +namespace Fenrir.Evolution +{ + public class EvolutionCandidate + { + public string EvolutionId { get; } + public float FitScore { get; } // higher = better match + public Config.Element RequiredElement { get; } + + public EvolutionCandidate(string id, float fitScore, Config.Element element) + { + EvolutionId = id; + FitScore = fitScore; + RequiredElement = element; + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/EvolutionCandidate.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/EvolutionCandidate.cs.meta new file mode 100644 index 0000000..8a518ec --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/EvolutionCandidate.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 244371585ad7142da90c59be79294006 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/EvolutionChecker.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/EvolutionChecker.cs new file mode 100644 index 0000000..634d3a5 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/EvolutionChecker.cs @@ -0,0 +1,57 @@ +using System; +using System.Collections.Generic; +using Fenrir.Traits; +using UnityEngine; + +namespace Fenrir.Evolution +{ + public class EvolutionChecker : IEvolutionChecker + { + private readonly EvolutionSignaturesConfig _config; + + public EvolutionChecker(EvolutionSignaturesConfig config) + { + _config = config; + } + + public EvolutionCandidate[] Check(TraitProfile profile, Config.Element element) + { + string elementName = element.ToString().ToLower(); + var candidates = new List(); + + foreach (KeyValuePair pair in _config.Signatures) + { + string id = pair.Key; + EvolutionSignature sig = pair.Value; + + if (!sig.Element.Equals(elementName, StringComparison.OrdinalIgnoreCase)) + continue; + + float fitScore = 0f; + bool allMet = true; + + foreach (KeyValuePair threshold in sig.Thresholds) + { + if (!Enum.TryParse(threshold.Key, true, out TraitKey traitKey)) + { + Debug.LogWarning($"[EvolutionChecker] Unknown trait key '{threshold.Key}' in signature '{id}'"); + continue; + } + + float value = profile.Get(traitKey); + if (!threshold.Value.IsMet(value)) + { + allMet = false; + break; + } + fitScore += threshold.Value.FitScore(value); + } + + if (allMet) + candidates.Add(new EvolutionCandidate(id, fitScore, element)); + } + + return candidates.ToArray(); + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/EvolutionChecker.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/EvolutionChecker.cs.meta new file mode 100644 index 0000000..581876f --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/EvolutionChecker.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 3c7e18770eab746019be516e4ddc35dc \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/EvolutionSequencer.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/EvolutionSequencer.cs new file mode 100644 index 0000000..e64d6e3 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/EvolutionSequencer.cs @@ -0,0 +1,98 @@ +using System.Collections; +using Fenrir.Core; +using Fenrir.Save; +using Fenrir.Traits; +using UnityEngine; + +namespace Fenrir.Evolution +{ + /// + /// Orchestrates the full evolution sequence: + /// 1. Freeze world input + /// 2. Play shrine VFX / camera cut + /// 3. Apply TraitProfile carryover + /// 4. Write new evolution to save + /// 5. Emit EvolutionCompleteEvent + /// 6. Resume world + /// + /// Attach to the same GameObject as ShrineController. + /// + public class EvolutionSequencer : MonoBehaviour + { + [Header("Timing")] + [SerializeField] private float _buildupDuration = 2.5f; + [SerializeField] private float _flashDuration = 0.4f; + [SerializeField] private float _holdDuration = 1.5f; + + [Header("VFX")] + [SerializeField] private ParticleSystem _evolutionBurstFX; + [SerializeField] private GameObject _screenFlashOverlay; + + private bool _isRunning; + + /// Called by ShrineController when player interacts. + public void Begin() + { + if (_isRunning) return; + StartCoroutine(RunSequence()); + } + + private IEnumerator RunSequence() + { + _isRunning = true; + + // 1. Resolve best candidate + if (!ServiceLocator.TryGet(out var accumulator) || + !ServiceLocator.TryGet(out var save)) + { + _isRunning = false; + yield break; + } + + var character = save.Current.Character; + var candidates = accumulator.CheckEligibility(character.CurrentElement); + + if (candidates == null || candidates.Length == 0) + { + _isRunning = false; + yield break; + } + + var best = candidates[0]; // EvolutionChecker returns sorted by fit score + + // 2. Freeze player input + SetInputEnabled(false); + + // 3. Buildup FX + _evolutionBurstFX?.Play(); + yield return new WaitForSeconds(_buildupDuration); + + // 4. Screen flash + if (_screenFlashOverlay != null) _screenFlashOverlay.SetActive(true); + yield return new WaitForSeconds(_flashDuration); + if (_screenFlashOverlay != null) _screenFlashOverlay.SetActive(false); + + // 5. Apply evolution + accumulator.Profile.ApplyEvolutionCarryover(); + character.CurrentEvolution = best.EvolutionId; + save.MarkDirty(); + _ = save.SaveAsync(); + + // 6. Emit event + BehaviorEventBus.Emit(new EvolutionCompleteEvent { EvolutionId = best.EvolutionId }); + + // 7. Hold, then resume + yield return new WaitForSeconds(_holdDuration); + SetInputEnabled(true); + + _isRunning = false; + } + + private static void SetInputEnabled(bool enabled) + { + // Disable/enable via TouchMapper found in scene + var mapper = FindAnyObjectByType(); + if (mapper != null) mapper.enabled = enabled; + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/EvolutionSequencer.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/EvolutionSequencer.cs.meta new file mode 100644 index 0000000..ab6e86b --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/EvolutionSequencer.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: ffacec9c3d3ae4144a2e85a9e23dad4d \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/EvolutionSignatureConfig.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/EvolutionSignatureConfig.cs new file mode 100644 index 0000000..445c079 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/EvolutionSignatureConfig.cs @@ -0,0 +1,42 @@ +using System; +using System.Collections.Generic; +using Fenrir.Traits; + +namespace Fenrir.Evolution +{ + [Serializable] + public class TraitThreshold + { + public float? Min; + public float? Max; + + public bool IsMet(float value) + { + if (Min.HasValue && value < Min.Value) return false; + if (Max.HasValue && value > Max.Value) return false; + return true; + } + + /// How far this value exceeds (or undercuts) the threshold — used for fit scoring. + public float FitScore(float value) + { + if (Min.HasValue) return value - Min.Value; + if (Max.HasValue) return Max.Value - value; + return 0f; + } + } + + [Serializable] + public class EvolutionSignature + { + public string Element; + public Dictionary Thresholds = new(); + } + + [Serializable] + public class EvolutionSignaturesConfig + { + /// Key = evolutionId (e.g. "inferno") + public Dictionary Signatures = new(); + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/EvolutionSignatureConfig.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/EvolutionSignatureConfig.cs.meta new file mode 100644 index 0000000..338a743 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/EvolutionSignatureConfig.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 06fba69bdb79b4e1e93f44267bf49ab3 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/IEvolutionChecker.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/IEvolutionChecker.cs new file mode 100644 index 0000000..18c1f71 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/IEvolutionChecker.cs @@ -0,0 +1,9 @@ +using Fenrir.Traits; + +namespace Fenrir.Evolution +{ + public interface IEvolutionChecker + { + EvolutionCandidate[] Check(TraitProfile profile, Config.Element element); + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/IEvolutionChecker.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/IEvolutionChecker.cs.meta new file mode 100644 index 0000000..9332465 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/IEvolutionChecker.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 7db5b00bf53574d3c8f18d6ef481855c \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/ShrineController.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/ShrineController.cs new file mode 100644 index 0000000..2606268 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/ShrineController.cs @@ -0,0 +1,104 @@ +using System; +using Fenrir.Config; +using Fenrir.Core; +using Fenrir.Evolution; +using Fenrir.Save; +using Fenrir.Traits; +using UnityEngine; + +namespace Fenrir.Evolution +{ + public enum ShrineState { Dormant, Stirring, Active } + + /// + /// World object representing an evolution shrine. + /// Transitions through Dormant → Stirring → Active as trait thresholds are approached. + /// When Active, interacting triggers EvolutionSequencer. + /// + public class ShrineController : MonoBehaviour + { + [SerializeField] private string _shrineId = "shrine_default"; + [SerializeField] private ParticleSystem _dormantFX; + [SerializeField] private ParticleSystem _stirringFX; + [SerializeField] private ParticleSystem _activeFX; + [SerializeField] private EvolutionSequencer _sequencer; + + // Stirring threshold: player has ≥1 eligible evolution candidate + // Active threshold: player has a clear best candidate (fit > 0.5) + + public ShrineState State { get; private set; } = ShrineState.Dormant; + + public event Action OnStateChanged; + + private ITraitAccumulator _accumulator; + private bool _playerInRange; + + private void Start() + { + ServiceLocator.TryGet(out _accumulator); + RefreshState(); + } + + // Called by save system on load + public void InitFromSave(bool activated) + { + if (activated) ForceActivate(); + } + + private void Update() + { + // Re-evaluate shrine state each second (performance: coarse tick) + if (Time.frameCount % 60 == 0) RefreshState(); + } + + private void RefreshState() + { + if (_accumulator == null) return; + if (!ServiceLocator.TryGet(out var save)) return; + + Element playerElement = save.Current.Character.CurrentElement; + var candidates = _accumulator.CheckEligibility(playerElement); + + ShrineState next; + if (candidates.Length == 0) + next = ShrineState.Dormant; + else if (candidates[0].FitScore < 0.5f) + next = ShrineState.Stirring; + else + next = ShrineState.Active; + + if (next != State) SetState(next); + } + + private void SetState(ShrineState next) + { + State = next; + OnStateChanged?.Invoke(next); + + _dormantFX?.gameObject.SetActive(next == ShrineState.Dormant); + _stirringFX?.gameObject.SetActive(next == ShrineState.Stirring); + _activeFX?.gameObject.SetActive(next == ShrineState.Active); + } + + public void ForceActivate() => SetState(ShrineState.Active); + + // ── Interaction ─────────────────────────────────────────────────────── + + private void OnTriggerEnter(Collider other) + { + if (other.CompareTag("Player")) _playerInRange = true; + } + + private void OnTriggerExit(Collider other) + { + if (other.CompareTag("Player")) _playerInRange = false; + } + + /// Called by interaction system when player presses interact. + public void TryInteract() + { + if (!_playerInRange || State != ShrineState.Active) return; + _sequencer?.Begin(); + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/ShrineController.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/ShrineController.cs.meta new file mode 100644 index 0000000..fdb8162 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/ShrineController.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 42d7044aebd9844ed9633d71c85798ff \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Fenrir.Runtime.asmdef b/src/ProjectFenrir/Assets/_Project/Scripts/Fenrir.Runtime.asmdef new file mode 100644 index 0000000..49c93f8 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Fenrir.Runtime.asmdef @@ -0,0 +1,19 @@ +{ + "name": "Fenrir.Runtime", + "rootNamespace": "Fenrir", + "references": [ + "Unity.InputSystem", + "Unity.TextMeshPro", + "Unity.AI.Navigation", + "Unity.Cinemachine" + ], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Fenrir.Runtime.asmdef.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Fenrir.Runtime.asmdef.meta new file mode 100644 index 0000000..7e6d775 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Fenrir.Runtime.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6252fd47c226e4542bf5ab049b536774 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Input.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Input.meta new file mode 100644 index 0000000..eebbd9b --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Input.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 196217984566543c7811140cd404f085 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Input/GestureRecognizer.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Input/GestureRecognizer.cs new file mode 100644 index 0000000..e243f1e --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Input/GestureRecognizer.cs @@ -0,0 +1,138 @@ +using UnityEngine; +using UnityEngine.InputSystem.EnhancedTouch; +using Touch = UnityEngine.InputSystem.EnhancedTouch.Touch; + +namespace Fenrir.Input +{ + /// + /// Splits the screen into left (movement joystick) and right (swipe actions) halves. + /// Classifies right-side swipes into attack/dodge/block intents and delegates to TouchMapper. + /// + public class GestureRecognizer : MonoBehaviour + { + [SerializeField] private TouchMapper _mapper; + + // ── Swipe thresholds ────────────────────────────────────────────────── + [SerializeField] private float _swipeDistanceThreshold = 60f; // pixels + [SerializeField] private float _holdThreshold = 0.3f; // seconds → block + + private Vector2 _leftAnchor; + private bool _leftActive; + private int _leftFingerId = -1; + + private Vector2 _rightStartPos; + private float _rightStartTime; + private int _rightFingerId = -1; + private bool _rightActive; + + private void OnEnable() => EnhancedTouchSupport.Enable(); + private void OnDisable() => EnhancedTouchSupport.Disable(); + + public void Tick() + { + foreach (var touch in Touch.activeTouches) + { + float screenHalf = Screen.width * 0.5f; + bool isLeft = touch.startScreenPosition.x < screenHalf; + + switch (touch.phase) + { + case UnityEngine.InputSystem.TouchPhase.Began: + if (isLeft && _leftFingerId < 0) BeginLeft(touch); + if (!isLeft && _rightFingerId < 0) BeginRight(touch); + break; + + case UnityEngine.InputSystem.TouchPhase.Moved: + case UnityEngine.InputSystem.TouchPhase.Stationary: + if (touch.touchId == _leftFingerId) UpdateLeft(touch); + if (touch.touchId == _rightFingerId) UpdateRight(touch); + break; + + case UnityEngine.InputSystem.TouchPhase.Ended: + case UnityEngine.InputSystem.TouchPhase.Canceled: + if (touch.touchId == _leftFingerId) EndLeft(touch); + if (touch.touchId == _rightFingerId) EndRight(touch); + break; + } + } + } + + // ── Left (movement joystick) ────────────────────────────────────────── + + private void BeginLeft(Touch t) + { + _leftFingerId = t.touchId; + _leftAnchor = t.startScreenPosition; + _leftActive = true; + } + + private void UpdateLeft(Touch t) + { + if (!_leftActive) return; + Vector2 delta = t.screenPosition - _leftAnchor; + // Normalise by half-screen height for consistent feel across devices + Vector2 norm = delta / (Screen.height * 0.3f); + norm = Vector2.ClampMagnitude(norm, 1f); + _mapper.OnMoveInput(norm); + } + + private void EndLeft(Touch t) + { + _leftFingerId = -1; + _leftActive = false; + _mapper.OnMoveInput(Vector2.zero); + } + + // ── Right (swipe actions) ───────────────────────────────────────────── + + private void BeginRight(Touch t) + { + _rightFingerId = t.touchId; + _rightStartPos = t.startScreenPosition; + _rightStartTime = Time.time; + _rightActive = true; + } + + private void UpdateRight(Touch t) + { + if (!_rightActive) return; + + // Block: finger held without moving + float heldDuration = Time.time - _rightStartTime; + float moved = Vector2.Distance(t.screenPosition, _rightStartPos); + + if (moved < 20f && heldDuration > _holdThreshold) + _mapper.OnBlockHeld(); + } + + private void EndRight(Touch t) + { + _rightFingerId = -1; + _rightActive = false; + _mapper.OnBlockReleased(); + + float heldDuration = Time.time - _rightStartTime; + float moved = Vector2.Distance(t.screenPosition, _rightStartPos); + + if (moved < 20f && heldDuration < _holdThreshold) + { + // Tap → light attack + _mapper.OnLightAttack(); + return; + } + + if (moved < _swipeDistanceThreshold) return; + + Vector2 dir = (t.screenPosition - _rightStartPos).normalized; + float angle = Vector2.SignedAngle(Vector2.right, dir); + + if (angle > 45f && angle < 135f) + _mapper.OnDodge(); // swipe up → dodge + else if (Mathf.Abs(angle) < 45f) + _mapper.OnHeavyAttack(); // swipe right → heavy + else if (Mathf.Abs(angle) > 135f) + _mapper.OnAbility(); // swipe left → ability + // swipe down → no action (reserved) + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Input/GestureRecognizer.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Input/GestureRecognizer.cs.meta new file mode 100644 index 0000000..6af7ce8 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Input/GestureRecognizer.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 31bdd25d7a4ff4f949384f15a49fb15b \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Input/InputHandler.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Input/InputHandler.cs new file mode 100644 index 0000000..c7dc450 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Input/InputHandler.cs @@ -0,0 +1,54 @@ +using UnityEngine; +using UnityEngine.InputSystem; + +namespace Fenrir.Input +{ + /// + /// Raw input layer. Reads Unity's new Input System touch/gamepad events + /// and forwards normalised values to GestureRecognizer and TouchMapper. + /// This class knows nothing about game entities. + /// + public class InputHandler : MonoBehaviour + { + [SerializeField] private GestureRecognizer _gesture; + [SerializeField] private TouchMapper _mapper; + + private void Update() + { +#if UNITY_IOS || UNITY_ANDROID + ProcessTouches(); +#else + ProcessKeyboard(); // Editor / Mac fallback +#endif + } + + // ── Mobile ──────────────────────────────────────────────────────────── + + private void ProcessTouches() + { + // Unity's new input system touch processing is deferred to + // GestureRecognizer, which owns the left/right split logic. + _gesture.Tick(); + } + + // ── Editor / Keyboard ───────────────────────────────────────────────── + + private void ProcessKeyboard() + { + float h = 0f, v = 0f; + if (Keyboard.current.dKey.isPressed || Keyboard.current.rightArrowKey.isPressed) h = 1f; + if (Keyboard.current.aKey.isPressed || Keyboard.current.leftArrowKey.isPressed) h = -1f; + if (Keyboard.current.wKey.isPressed || Keyboard.current.upArrowKey.isPressed) v = 1f; + if (Keyboard.current.sKey.isPressed || Keyboard.current.downArrowKey.isPressed) v = -1f; + + _mapper.OnMoveInput(new Vector2(h, v)); + + if (Keyboard.current.spaceKey.wasPressedThisFrame) _mapper.OnDodge(); + if (Keyboard.current.jKey.wasPressedThisFrame) _mapper.OnLightAttack(); + if (Keyboard.current.kKey.wasPressedThisFrame) _mapper.OnHeavyAttack(); + if (Keyboard.current.lKey.wasPressedThisFrame) _mapper.OnAbility(); + if (Keyboard.current.bKey.isPressed) _mapper.OnBlockHeld(); + else _mapper.OnBlockReleased(); + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Input/InputHandler.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Input/InputHandler.cs.meta new file mode 100644 index 0000000..cbe0ef4 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Input/InputHandler.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 6c8e1210723ff41398d93eab911c9ada \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Input/TouchMapper.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Input/TouchMapper.cs new file mode 100644 index 0000000..2539140 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Input/TouchMapper.cs @@ -0,0 +1,35 @@ +using Fenrir.Entities.Player; +using UnityEngine; + +namespace Fenrir.Input +{ + /// + /// Bridges gesture intents to the player entity. + /// GestureRecognizer calls this; it forwards commands to PlayerController / PlayerCombat. + /// + public class TouchMapper : MonoBehaviour + { + [SerializeField] private PlayerController _controller; + [SerializeField] private PlayerCombat _combat; + + // Optional: closest enemy lock-on target (set by combat system) + public GameObject CurrentTarget { get; set; } + + // ── Movement ────────────────────────────────────────────────────────── + + public void OnMoveInput(Vector2 input) => _controller.SetMoveInput(input); + + // ── Combat ──────────────────────────────────────────────────────────── + + public void OnLightAttack() => _combat.DoLightAttack(CurrentTarget); + public void OnHeavyAttack() => _combat.DoHeavyAttack(CurrentTarget); + public void OnAbility() => _combat.DoAbility(CurrentTarget); + public void OnDodge() + { + _controller.RequestDodge(); + _combat.DoDodge(); + } + public void OnBlockHeld() => _combat.DoBlock(); + public void OnBlockReleased()=> _combat.EndBlock(); + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Input/TouchMapper.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Input/TouchMapper.cs.meta new file mode 100644 index 0000000..8c14812 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Input/TouchMapper.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 71c06312ce0064a07a7af3acd0e6d7d6 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Save.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Save.meta new file mode 100644 index 0000000..cf0af5c --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Save.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6ef375707e09e4d8193aa9287c86bb69 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Save/ISaveManager.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Save/ISaveManager.cs new file mode 100644 index 0000000..fd27d9b --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Save/ISaveManager.cs @@ -0,0 +1,12 @@ +using System.Threading.Tasks; + +namespace Fenrir.Save +{ + public interface ISaveManager + { + SaveData Current { get; } + Task SaveAsync(); + Task LoadAsync(); + void MarkDirty(); // flags that a save is needed on next checkpoint + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Save/ISaveManager.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Save/ISaveManager.cs.meta new file mode 100644 index 0000000..b960734 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Save/ISaveManager.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 4a4c7ab2dac474c5586e21fa821d2321 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Save/KeychainBridge.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Save/KeychainBridge.cs new file mode 100644 index 0000000..c0b1510 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Save/KeychainBridge.cs @@ -0,0 +1,53 @@ +using System; +using UnityEngine; + +namespace Fenrir.Save +{ + /// + /// Bridges Unity C# to native iOS Keychain for tamper-resistant slot seed storage. + /// In Editor and non-iOS builds, falls back to PlayerPrefs (dev only). + /// + public static class KeychainBridge + { +#if UNITY_IOS && !UNITY_EDITOR + [System.Runtime.InteropServices.DllImport("__Internal")] + private static extern string Keychain_GetSeed(string key); + + [System.Runtime.InteropServices.DllImport("__Internal")] + private static extern bool Keychain_SetSeed(string key, string value); +#endif + + public static Guid GetOrCreateSeed(int slotIndex) + { + string key = string.Format(Config.GameConfig.KeychainSlotSeedKey, slotIndex); + string existing = Read(key); + + if (!string.IsNullOrEmpty(existing) && Guid.TryParse(existing, out Guid parsed)) + return parsed; + + Guid newSeed = Guid.NewGuid(); + Write(key, newSeed.ToString()); + Debug.Log($"[KeychainBridge] Generated new seed for slot {slotIndex}"); + return newSeed; + } + + private static string Read(string key) + { +#if UNITY_IOS && !UNITY_EDITOR + return Keychain_GetSeed(key); +#else + return PlayerPrefs.GetString(key, null); +#endif + } + + private static void Write(string key, string value) + { +#if UNITY_IOS && !UNITY_EDITOR + Keychain_SetSeed(key, value); +#else + PlayerPrefs.SetString(key, value); + PlayerPrefs.Save(); +#endif + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Save/KeychainBridge.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Save/KeychainBridge.cs.meta new file mode 100644 index 0000000..28ff064 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Save/KeychainBridge.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 8e22c5495c79344e99fcd84f54a59eb0 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Save/SaveData.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Save/SaveData.cs new file mode 100644 index 0000000..e81aa92 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Save/SaveData.cs @@ -0,0 +1,48 @@ +using System; +using System.Collections.Generic; +using Fenrir.Config; +using Fenrir.Traits; + +namespace Fenrir.Save +{ + [Serializable] + public class SaveData + { + public const string CurrentVersion = "0.1.0"; + public string Version = CurrentVersion; + public DateTime SavedAt = DateTime.UtcNow; + public CharacterData Character = new(); + public WorldState World = new(); + } + + [Serializable] + public class CharacterData + { + public string Name = ""; + public string Gender = ""; + public int FacePreset = 0; + public int BodyType = 0; + public int SlotIndex = 0; + public Element CurrentElement = Element.None; + public string CurrentEvolution = ""; // "" = base form + public int Level = 1; + public float XP = 0f; + public float Currency = 0f; + public bool RerollUsed = false; + public bool HasAwakened = false; + public TraitProfile Traits = TraitProfile.Neutral(); + public List JournalEntries = new(); + } + + [Serializable] + public class WorldState + { + public float TimeOfDay = 0f; + public string LastCheckpointId = ""; + public List DiscoveredSecrets = new(); + public List CompletedQuests = new(); + public List ActivatedShrines = new(); + public bool DoctrineShrineFound = false; + public bool EmberlordDefeated = false; + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Save/SaveData.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Save/SaveData.cs.meta new file mode 100644 index 0000000..46563b3 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Save/SaveData.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 05c79a3d81226441ca90a026506335fc \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Save/SaveManager.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Save/SaveManager.cs new file mode 100644 index 0000000..1ab7d20 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Save/SaveManager.cs @@ -0,0 +1,63 @@ +using System; +using System.IO; +using System.Threading.Tasks; +using UnityEngine; + +namespace Fenrir.Save +{ + public class SaveManager : ISaveManager + { + public SaveData Current { get; private set; } = new SaveData(); + + private bool _isDirty; + private readonly string _savePath; + + public SaveManager(string overridePath = null) + { + _savePath = overridePath + ?? Path.Combine(Application.persistentDataPath, Config.GameConfig.SaveFileName); + } + + public async Task SaveAsync() + { + try + { + Current.SavedAt = DateTime.UtcNow; + string json = JsonUtility.ToJson(Current, prettyPrint: true); + await File.WriteAllTextAsync(_savePath, json); + _isDirty = false; + Debug.Log($"[SaveManager] Saved to {_savePath}"); + } + catch (Exception ex) + { + Debug.LogError($"[SaveManager] Save failed: {ex}"); + } + } + + public async Task LoadAsync() + { + if (!File.Exists(_savePath)) + { + Debug.Log("[SaveManager] No save file found — starting fresh."); + return false; + } + + try + { + string json = await File.ReadAllTextAsync(_savePath); + Current = JsonUtility.FromJson(json); + Debug.Log($"[SaveManager] Loaded save v{Current.Version}"); + return true; + } + catch (Exception ex) + { + Debug.LogError($"[SaveManager] Load failed: {ex}"); + return false; + } + } + + public void MarkDirty() => _isDirty = true; + + public bool IsDirty => _isDirty; + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Save/SaveManager.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Save/SaveManager.cs.meta new file mode 100644 index 0000000..2761500 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Save/SaveManager.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 681a9270e52534230b053e6cdb6e3be7 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/StateMachine.meta b/src/ProjectFenrir/Assets/_Project/Scripts/StateMachine.meta new file mode 100644 index 0000000..4de8a3e --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/StateMachine.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1f6f67b10445a45e29cd200b45be6e44 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/AppState.cs b/src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/AppState.cs new file mode 100644 index 0000000..e61b172 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/AppState.cs @@ -0,0 +1,11 @@ +namespace Fenrir.StateMachine +{ + public enum AppState + { + Booting, + MainMenu, + Loading, + InGame, + Paused + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/AppState.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/AppState.cs.meta new file mode 100644 index 0000000..60f877c --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/AppState.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: c8310e07d58d24505a91be3ac6452823 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/GameState.cs b/src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/GameState.cs new file mode 100644 index 0000000..68e71e1 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/GameState.cs @@ -0,0 +1,12 @@ +namespace Fenrir.StateMachine +{ + public enum GameState + { + Exploration, + Combat, + Awakening, + Evolution, + Cutscene, + Dialogue + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/GameState.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/GameState.cs.meta new file mode 100644 index 0000000..60528f0 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/GameState.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 560466d4df79c4736b949fb666195646 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/PlayerState.cs b/src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/PlayerState.cs new file mode 100644 index 0000000..6477837 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/PlayerState.cs @@ -0,0 +1,16 @@ +namespace Fenrir.StateMachine +{ + public enum PlayerState + { + Idle, + Moving, + Dodging, + Attacking, + Blocking, + Staggered, + Dead, + Interacting, + InDialogue, + InEvolution, + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/PlayerState.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/PlayerState.cs.meta new file mode 100644 index 0000000..42141ac --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/PlayerState.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 9dd1e0071036f4a278be5f7646959cf0 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Traits.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Traits.meta new file mode 100644 index 0000000..9efd500 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Traits.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bc4f8e9f75fcc43cf99702e302ac6779 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Traits/BehaviorEvent.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Traits/BehaviorEvent.cs new file mode 100644 index 0000000..db3f7b4 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Traits/BehaviorEvent.cs @@ -0,0 +1,74 @@ +using UnityEngine; + +namespace Fenrir.Traits +{ + // ── Base ───────────────────────────────────────────────────────────────── + + public abstract class BehaviorEvent + { + public string EventKey => GetType().Name; + } + + // ── Combat ─────────────────────────────────────────────────────────────── + + public class DodgeUsedEvent : BehaviorEvent { } + public class CounterLandedEvent : BehaviorEvent { } + public class PerfectBlockEvent : BehaviorEvent { } + public class BlockUsedEvent : BehaviorEvent { } + public class HeavyAttackLandedEvent : BehaviorEvent { } + public class LightAttackLandedEvent : BehaviorEvent { } + public class AbilityUsedFullEnergyEvent : BehaviorEvent { } + public class AbilityUsedLowEnergyEvent : BehaviorEvent { } // below 30% + public class KillStreakEvent : BehaviorEvent { public int Count; } + public class CombatCompletedNoDodgeEvent : BehaviorEvent { } + public class HitTakenNoDodgeEvent : BehaviorEvent { } + + public class DeathRecklessEvent : BehaviorEvent { } // died without blocking/dodging + public class DeathSacrificeEvent : BehaviorEvent { } // died still attacking at low HP + public class DeathOverwhelmedEvent : BehaviorEvent { } // 3+ enemies + public class DeathPatternFailEvent : BehaviorEvent { } // 3rd+ death to same enemy type + public class DeathAmbushEvent : BehaviorEvent { } // died within 5s of entering area — no shift + + // ── Creature ───────────────────────────────────────────────────────────── + + public class CreatureSparedEvent : BehaviorEvent { } + public class CreatureObservedEvent : BehaviorEvent { public float DurationSeconds; } + public class RareCreatureFoundEvent : BehaviorEvent { } + public class CreatureHuntedRepeatEvent : BehaviorEvent { } // same type hunted repeatedly + + // ── World / NPC ────────────────────────────────────────────────────────── + + public class DialogueMercyEvent : BehaviorEvent { } + public class DialoguePunishmentEvent : BehaviorEvent { } + public class NpcHelpedEvent : BehaviorEvent { } + public class NpcIgnoredEvent : BehaviorEvent { } + public class LoreObjectReadEvent : BehaviorEvent { } + public class SecretAreaDiscoveredEvent: BehaviorEvent { } + public class OriginVillageReturnEvent : BehaviorEvent { } + public class AreaRevisitedEvent : BehaviorEvent { } + public class ShortcutPurchasedEvent : BehaviorEvent { } + public class QuestCompletedEvent : BehaviorEvent { } + + // ── Economic ───────────────────────────────────────────────────────────── + + public class OffensiveUpgradePurchasedEvent : BehaviorEvent { } + public class DefensiveUpgradePurchasedEvent : BehaviorEvent { } + public class KnowledgeItemPurchasedEvent : BehaviorEvent { } + public class CurrencyHoardedEvent : BehaviorEvent { } // large unspent pool detected + public class CurrencySpentImmediatelyEvent : BehaviorEvent { } + + // ── Exploration / Area ─────────────────────────────────────────────────── + + public class RegionFullyExploredEvent : BehaviorEvent { public float PercentRevealed; } + public class DirectPathTakenEvent : BehaviorEvent { } + public class ExtendedDangerZoneEvent : BehaviorEvent { } + public class ExtendedSafeZoneEvent : BehaviorEvent { } + public class AllSecretsFoundEvent : BehaviorEvent { } + public class NightExplorationEvent : BehaviorEvent { } // exploring during Night phase + + // ── Evolution / Shrine ─────────────────────────────────────────────────── + + public class ShrineActivatedEvent : BehaviorEvent { } + public class EvolutionCompleteEvent : BehaviorEvent { public string EvolutionId; } + public class BossKilledEvent : BehaviorEvent { public string BossId; } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Traits/BehaviorEvent.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Traits/BehaviorEvent.cs.meta new file mode 100644 index 0000000..f338556 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Traits/BehaviorEvent.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: b3c29cabc5dea4665be69d212c2e94ac \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Traits/BehaviorEventBus.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Traits/BehaviorEventBus.cs new file mode 100644 index 0000000..70d9b66 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Traits/BehaviorEventBus.cs @@ -0,0 +1,54 @@ +using System; +using System.Collections.Generic; +using UnityEngine; + +namespace Fenrir.Traits +{ + /// + /// Typed event bus for behavioral signals. + /// Supports Subscribe / Unsubscribe / Emit / Clear. + /// Stores wrapper delegates so Unsubscribe can match by original handler identity. + /// + public static class BehaviorEventBus + { + // Outer key: event Type. Inner key: original delegate (boxed). Value: wrapper. + private static readonly Dictionary>> _handlers = new(); + + public static void Subscribe(Action handler) where T : BehaviorEvent + { + Type type = typeof(T); + if (!_handlers.ContainsKey(type)) + _handlers[type] = new Dictionary>(); + + if (_handlers[type].ContainsKey(handler)) return; // already subscribed + + Action wrapper = evt => handler((T)evt); + _handlers[type][handler] = wrapper; + } + + public static void Unsubscribe(Action handler) where T : BehaviorEvent + { + Type type = typeof(T); + if (_handlers.TryGetValue(type, out var map)) + map.Remove(handler); + } + + public static void Emit(T evt) where T : BehaviorEvent + { + Type type = typeof(T); + if (!_handlers.TryGetValue(type, out var map)) return; + + foreach (var wrapper in new List>(map.Values)) + { + try { wrapper(evt); } + catch (Exception ex) + { + Debug.LogError($"[BehaviorEventBus] Handler error for {type.Name}: {ex}"); + } + } + } + + /// Call on scene unload to prevent stale references. + public static void Clear() => _handlers.Clear(); + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Traits/BehaviorEventBus.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Traits/BehaviorEventBus.cs.meta new file mode 100644 index 0000000..90c0c87 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Traits/BehaviorEventBus.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: ee6579b162de84881884f8946ef719fc \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Traits/ITraitAccumulator.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Traits/ITraitAccumulator.cs new file mode 100644 index 0000000..ee6520f --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Traits/ITraitAccumulator.cs @@ -0,0 +1,12 @@ +using Fenrir.Evolution; + +namespace Fenrir.Traits +{ + public interface ITraitAccumulator + { + void Process(BehaviorEvent evt); + void ApplyDecay(float daysSinceLastPlay); + EvolutionCandidate[] CheckEligibility(Config.Element element); + TraitProfile Profile { get; } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Traits/ITraitAccumulator.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Traits/ITraitAccumulator.cs.meta new file mode 100644 index 0000000..c7814d4 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Traits/ITraitAccumulator.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 7873c0d59d7da4593a15ed1cc6edcd5f \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Traits/TraitAccumulator.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Traits/TraitAccumulator.cs new file mode 100644 index 0000000..ed90046 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Traits/TraitAccumulator.cs @@ -0,0 +1,67 @@ +using System; +using System.Collections.Generic; +using Fenrir.Config; +using Fenrir.Evolution; +using UnityEngine; + +namespace Fenrir.Traits +{ + public class TraitAccumulator : ITraitAccumulator + { + public TraitProfile Profile { get; private set; } + + private TraitWeightsConfig _weights; + private IEvolutionChecker _evolutionChecker; + + public TraitAccumulator(TraitProfile profile, TraitWeightsConfig weights, IEvolutionChecker checker) + { + Profile = profile; + _weights = weights; + _evolutionChecker = checker; + } + + public void Process(BehaviorEvent evt) + { + if (!_weights.Weights.TryGetValue(evt.EventKey, out Dictionary deltas)) + return; + + float dampen = ComputeDampeningFactor(evt.EventKey); + Profile.IncrementSessionCount(evt.EventKey); + + foreach (KeyValuePair entry in deltas) + { + if (!Enum.TryParse(entry.Key, true, out TraitKey key)) continue; + Profile.Apply(key, entry.Value * dampen); + } + + Profile.LastUpdated = DateTime.UtcNow; + } + + public void ApplyDecay(float daysSinceLastPlay) + { + // Disabled in MVP — see GameConfig comment + // foreach (TraitKey key in Enum.GetValues(typeof(TraitKey))) + // { + // float current = Profile.Get(key); + // float decayed = current + (GameConfig.TraitNeutral - current) + // * GameConfig.TraitDecayRatePerDay * daysSinceLastPlay; + // Profile.Set(key, decayed); + // } + } + + public EvolutionCandidate[] CheckEligibility(Config.Element element) => + _evolutionChecker.Check(Profile, element); + + // ── Private ────────────────────────────────────────────────────────── + + private float ComputeDampeningFactor(string eventKey) + { + int count = Profile.GetSessionCount(eventKey); + if (count < GameConfig.FrequencyDampenAfter) return 1f; + + // Halves every FrequencyDampenAfter occurrences + int steps = (count - GameConfig.FrequencyDampenAfter) / GameConfig.FrequencyDampenAfter; + return Mathf.Pow(0.5f, steps + 1); + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Traits/TraitAccumulator.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Traits/TraitAccumulator.cs.meta new file mode 100644 index 0000000..2c38e58 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Traits/TraitAccumulator.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 9c0d14c689f204c988ec19194a5da3c5 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Traits/TraitKey.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Traits/TraitKey.cs new file mode 100644 index 0000000..a5392e6 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Traits/TraitKey.cs @@ -0,0 +1,16 @@ +namespace Fenrir.Traits +{ + public enum TraitKey + { + Aggression, + Mercy, + Curiosity, + Sacrifice, + Dominance, + Loyalty, + Wisdom, + Exploration, + Recklessness, + Patience + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Traits/TraitKey.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Traits/TraitKey.cs.meta new file mode 100644 index 0000000..7ea17e6 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Traits/TraitKey.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 06cddd5fe83d247c1b6b9d12edea361b \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Traits/TraitProfile.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Traits/TraitProfile.cs new file mode 100644 index 0000000..8cb1ef2 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Traits/TraitProfile.cs @@ -0,0 +1,54 @@ +using System; +using System.Collections.Generic; +using Fenrir.Config; + +namespace Fenrir.Traits +{ + [Serializable] + public class TraitProfile + { + public Dictionary Traits = new(); + public Dictionary SessionEventCounts = new(); + public DateTime LastUpdated = DateTime.UtcNow; + + public static TraitProfile Neutral() + { + var profile = new TraitProfile(); + foreach (TraitKey key in Enum.GetValues(typeof(TraitKey))) + profile.Traits[key] = GameConfig.TraitNeutral; + return profile; + } + + public float Get(TraitKey key) => + Traits.TryGetValue(key, out float value) ? value : GameConfig.TraitNeutral; + + public void Set(TraitKey key, float value) => + Traits[key] = Math.Clamp(value, GameConfig.TraitMin, GameConfig.TraitMax); + + public void Apply(TraitKey key, float delta) => + Set(key, Get(key) + delta); + + /// + /// Shifts all trait values 30% toward neutral on evolution. + /// + public void ApplyEvolutionCarryover() + { + foreach (TraitKey key in Enum.GetValues(typeof(TraitKey))) + { + float current = Get(key); + float shifted = current + (GameConfig.TraitNeutral - current) * GameConfig.TraitEvolutionCarryover; + Set(key, shifted); + } + SessionEventCounts.Clear(); + } + + public int GetSessionCount(string eventKey) + { + SessionEventCounts.TryGetValue(eventKey, out int count); + return count; + } + + public void IncrementSessionCount(string eventKey) => + SessionEventCounts[eventKey] = GetSessionCount(eventKey) + 1; + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Traits/TraitProfile.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Traits/TraitProfile.cs.meta new file mode 100644 index 0000000..a1c2946 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Traits/TraitProfile.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: c220f93317d364c06bbfa8f64e24d6d2 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/UI.meta b/src/ProjectFenrir/Assets/_Project/Scripts/UI.meta new file mode 100644 index 0000000..10c0eed --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/UI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3abd15ced578344649a03f3a0a845987 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/UI/EnergyBar.cs b/src/ProjectFenrir/Assets/_Project/Scripts/UI/EnergyBar.cs new file mode 100644 index 0000000..1f64e64 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/UI/EnergyBar.cs @@ -0,0 +1,49 @@ +using Fenrir.Config; +using Fenrir.Entities.Player; +using UnityEngine; +using UnityEngine.UI; + +namespace Fenrir.UI +{ + /// + /// Drives the energy bar fill and colour. No numbers shown — colour shift only. + /// Thresholds defined in GameConfig.EnergyLowThreshold. + /// + public class EnergyBar : MonoBehaviour + { + [SerializeField] private Image _fillImage; + [SerializeField] private PlayerEnergy _energy; + + [Header("Colours")] + [SerializeField] private Color _fullColor = new Color(0.95f, 0.75f, 0.20f); // amber + [SerializeField] private Color _midColor = new Color(0.90f, 0.45f, 0.10f); // orange + [SerializeField] private Color _lowColor = new Color(0.85f, 0.15f, 0.10f); // red + + private void Awake() + { + if (_energy == null) + _energy = FindAnyObjectByType(); + + if (_energy != null) + _energy.OnEnergyChanged += Refresh; + } + + private void Start() => Refresh(_energy != null ? _energy.Current : GameConfig.EnergyMax); + + private void Refresh(float current) + { + float t = current / GameConfig.EnergyMax; + if (_fillImage == null) return; + + _fillImage.fillAmount = t; + _fillImage.color = t <= GameConfig.EnergyLowThreshold ? _lowColor + : t <= 0.55f ? _midColor + : _fullColor; + } + + private void OnDestroy() + { + if (_energy != null) _energy.OnEnergyChanged -= Refresh; + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/UI/EnergyBar.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/UI/EnergyBar.cs.meta new file mode 100644 index 0000000..f767409 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/UI/EnergyBar.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 0a47fc82c6c6a4e8d8de0e4803216417 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/UI/HUD.cs b/src/ProjectFenrir/Assets/_Project/Scripts/UI/HUD.cs new file mode 100644 index 0000000..25dacc3 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/UI/HUD.cs @@ -0,0 +1,70 @@ +using Fenrir.Entities.Player; +using UnityEngine; +using UnityEngine.UI; + +namespace Fenrir.UI +{ + /// + /// Root HUD controller. Owns HP bar, energy bar, and phase indicator. + /// All child widgets are self-contained; HUD just toggles visibility. + /// + public class HUD : MonoBehaviour + { + [Header("HP")] + [SerializeField] private Image _hpFill; + [SerializeField] private PlayerHealth _health; + + [Header("Panels")] + [SerializeField] private GameObject _combatPanel; + [SerializeField] private GameObject _journalNotification; + + private void Awake() + { + if (_health == null) + _health = FindAnyObjectByType(); + + if (_health != null) + { + _health.OnDamaged += UpdateHpBar; + _health.OnDied += ShowDeathScreen; + } + } + + private void UpdateHpBar(float normalised) + { + if (_hpFill) _hpFill.fillAmount = normalised; + } + + private void ShowDeathScreen() + { + // Post-MVP: full death screen. For now just hide combat panel. + if (_combatPanel) _combatPanel.SetActive(false); + } + + public void ShowCombatHUD(bool show) + { + if (_combatPanel) _combatPanel.SetActive(show); + } + + /// Flash the journal icon when a new vague entry is added. + public void NotifyJournalEntry() + { + if (_journalNotification) _journalNotification.SetActive(true); + Invoke(nameof(HideJournalNotification), 3f); + } + + private void HideJournalNotification() + { + if (_journalNotification) _journalNotification.SetActive(false); + } + + private void OnDestroy() + { + if (_health != null) + { + _health.OnDamaged -= UpdateHpBar; + _health.OnDied -= ShowDeathScreen; + } + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/UI/HUD.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/UI/HUD.cs.meta new file mode 100644 index 0000000..0076dea --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/UI/HUD.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 6c4c5a06f81044f6180acaea6f2c6e2c \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/UI/JournalController.cs b/src/ProjectFenrir/Assets/_Project/Scripts/UI/JournalController.cs new file mode 100644 index 0000000..1da80c3 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/UI/JournalController.cs @@ -0,0 +1,87 @@ +using Fenrir.Core; +using Fenrir.Save; +using Fenrir.Traits; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; +using TMPro; + +namespace Fenrir.UI +{ + /// + /// Manages the in-game journal panel. + /// Entries are vague, flavour-text observations — never explicit trait values. + /// New entries are appended on evolution and on key world events. + /// + public class JournalController : MonoBehaviour + { + [SerializeField] private GameObject _journalPanel; + [SerializeField] private Transform _entryContainer; + [SerializeField] private GameObject _entryPrefab; // prefab with a TMP_Text component + [SerializeField] private HUD _hud; + + private bool _isOpen; + + // ── Pre-authored vague flavour lines keyed by evolution ID ──────────── + private static readonly Dictionary EvolutionEntries = new() + { + ["inferno_form"] = "The heat no longer frightens you. It feels like a memory.", + ["abyssal_current"] = "You move through water as though it always knew you were coming.", + ["bedrock_stance"] = "Something in your chest has settled. You are harder to move.", + ["galeform"] = "The air parts for you now. Or perhaps it always did.", + }; + + private void Awake() + { + BehaviorEventBus.Subscribe(OnEvolution); + } + + // ── Public API ──────────────────────────────────────────────────────── + + public void Toggle() + { + _isOpen = !_isOpen; + _journalPanel?.SetActive(_isOpen); + if (_isOpen) RebuildEntries(); + } + + public void AddEntry(string text) + { + if (!ServiceLocator.TryGet(out var save)) return; + save.Current.Character.JournalEntries.Add(text); + save.MarkDirty(); + _hud?.NotifyJournalEntry(); + } + + // ── Internal ────────────────────────────────────────────────────────── + + private void OnEvolution(EvolutionCompleteEvent evt) + { + if (EvolutionEntries.TryGetValue(evt.EvolutionId, out string line)) + AddEntry(line); + } + + private void RebuildEntries() + { + if (_entryContainer == null || _entryPrefab == null) return; + + // Clear existing + foreach (Transform child in _entryContainer) + Destroy(child.gameObject); + + if (!ServiceLocator.TryGet(out var save)) return; + + foreach (string entry in save.Current.Character.JournalEntries) + { + var go = Instantiate(_entryPrefab, _entryContainer); + var text = go.GetComponentInChildren(); + if (text) text.text = entry; + } + } + + private void OnDestroy() + { + BehaviorEventBus.Unsubscribe(OnEvolution); + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/UI/JournalController.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/UI/JournalController.cs.meta new file mode 100644 index 0000000..c592b7c --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/UI/JournalController.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 454ab1424baba49b18377cbfa226ee06 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/World.meta b/src/ProjectFenrir/Assets/_Project/Scripts/World.meta new file mode 100644 index 0000000..0072832 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/World.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 85f760f426efb41769b42dae151ab395 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/World/DayNightCycle.cs b/src/ProjectFenrir/Assets/_Project/Scripts/World/DayNightCycle.cs new file mode 100644 index 0000000..7a22d77 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/World/DayNightCycle.cs @@ -0,0 +1,76 @@ +using System; +using Fenrir.Config; +using Fenrir.Traits; +using UnityEngine; + +namespace Fenrir.World +{ + public class DayNightCycle : MonoBehaviour + { + [Header("Lighting")] + [SerializeField] private Light _directionalLight; + [SerializeField] private Gradient _lightColorGradient; + [SerializeField] private AnimationCurve _lightIntensityCurve; + + public float CycleDurationSeconds { get; private set; } = GameConfig.DayNightCycleDurationSeconds; + public DayPhase CurrentPhase { get; private set; } = DayPhase.Dawn; + public float NormalizedTime { get; private set; } // 0–1 over full cycle + + public event Action OnPhaseChanged; + + private DayPhase _lastPhase; + + public void InitializeFromSave(float savedNormalizedTime) + { + NormalizedTime = savedNormalizedTime; + _lastPhase = ComputePhase(NormalizedTime); + CurrentPhase = _lastPhase; + ApplyLighting(); + } + + public void AdvanceToNextDawn() + { + // Called when player rests at a waystone + float dawnStart = 0f; + NormalizedTime = dawnStart; + } + + private void Update() + { + NormalizedTime = (NormalizedTime + Time.deltaTime / CycleDurationSeconds) % 1f; + ApplyLighting(); + CheckPhaseTransition(); + } + + private void ApplyLighting() + { + if (_directionalLight == null) return; + _directionalLight.color = _lightColorGradient.Evaluate(NormalizedTime); + _directionalLight.intensity = _lightIntensityCurve.Evaluate(NormalizedTime); + // Rotate sun: full 360° over one cycle + _directionalLight.transform.rotation = Quaternion.Euler(NormalizedTime * 360f - 90f, 170f, 0f); + } + + private void CheckPhaseTransition() + { + DayPhase newPhase = ComputePhase(NormalizedTime); + if (newPhase == _lastPhase) return; + + _lastPhase = newPhase; + CurrentPhase = newPhase; + OnPhaseChanged?.Invoke(newPhase); + + // Emit night exploration trait signal when Night begins + if (newPhase == DayPhase.Night) + BehaviorEventBus.Emit(new NightExplorationEvent()); + } + + private static DayPhase ComputePhase(float t) => t switch + { + < 0.15f => DayPhase.Dawn, + < 0.50f => DayPhase.Day, + < 0.70f => DayPhase.Dusk, + _ => DayPhase.Night + }; + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/World/DayNightCycle.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/World/DayNightCycle.cs.meta new file mode 100644 index 0000000..47563ff --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/World/DayNightCycle.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: ce1eeee18935247f2b706257b08182f6 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/World/DayPhase.cs b/src/ProjectFenrir/Assets/_Project/Scripts/World/DayPhase.cs new file mode 100644 index 0000000..375e3e6 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/World/DayPhase.cs @@ -0,0 +1,10 @@ +namespace Fenrir.World +{ + public enum DayPhase + { + Dawn, // ash-grey, low creature activity + Day, // standard, all creatures active + Dusk, // ember-lit, aggression increases + Night // dark, Inferno Wisps spawn, stealth viable + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/World/DayPhase.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/World/DayPhase.cs.meta new file mode 100644 index 0000000..c4eacca --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/World/DayPhase.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 9e7d468036c25499fbf8ba9d88bda8ea \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/World/RegionLoader.cs b/src/ProjectFenrir/Assets/_Project/Scripts/World/RegionLoader.cs new file mode 100644 index 0000000..e81a8d4 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/World/RegionLoader.cs @@ -0,0 +1,59 @@ +using System.Collections; +using UnityEngine; +using UnityEngine.SceneManagement; + +namespace Fenrir.World +{ + /// + /// Additive scene loading for Ember Forest sub-zones. + /// Each sub-zone is a separate Unity scene loaded/unloaded as the player + /// crosses region boundaries. Uses trigger volumes for seamless transitions. + /// + /// Sub-zones (Phase 1 MVP): + /// EmberForest_Core, EmberForest_Ashfields, EmberForest_Canopy, + /// EmberForest_Ruins, EmberForest_Shrine, EmberForest_DeepBurrow + /// + public class RegionLoader : MonoBehaviour + { + [SerializeField] private string _targetRegionScene; + [SerializeField] private string _unloadOnEnter; // scene to unload when this region loads + + private bool _loaded; + + // ── Trigger ─────────────────────────────────────────────────────────── + + private void OnTriggerEnter(Collider other) + { + if (!other.CompareTag("Player")) return; + if (_loaded) return; + StartCoroutine(TransitionRegion()); + } + + private IEnumerator TransitionRegion() + { + _loaded = true; + + // Load new region additively + if (!string.IsNullOrEmpty(_targetRegionScene) && + !SceneManager.GetSceneByName(_targetRegionScene).isLoaded) + { + var loadOp = SceneManager.LoadSceneAsync(_targetRegionScene, LoadSceneMode.Additive); + loadOp.allowSceneActivation = true; + yield return loadOp; + } + + // Unload previous region after new one is ready + if (!string.IsNullOrEmpty(_unloadOnEnter) && + SceneManager.GetSceneByName(_unloadOnEnter).isLoaded) + { + yield return SceneManager.UnloadSceneAsync(_unloadOnEnter); + } + } + + private void OnTriggerExit(Collider other) + { + // Allow re-trigger if player leaves and re-enters + if (other.CompareTag("Player")) _loaded = false; + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/World/RegionLoader.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/World/RegionLoader.cs.meta new file mode 100644 index 0000000..c2b66c8 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/World/RegionLoader.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: b558c1251aff44e7da68a62915cd362d \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/World/WorldManager.cs b/src/ProjectFenrir/Assets/_Project/Scripts/World/WorldManager.cs new file mode 100644 index 0000000..a0a10cb --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/World/WorldManager.cs @@ -0,0 +1,89 @@ +using Fenrir.Core; +using Fenrir.Save; +using Fenrir.Traits; +using UnityEngine; + +namespace Fenrir.World +{ + /// + /// Scene-level singleton for the game world. + /// Owns day/night cycle reference, manages shrine/secret tracking, + /// and writes world-state changes to save. + /// + public class WorldManager : MonoBehaviour + { + [SerializeField] private DayNightCycle _dayNight; + + public static WorldManager Instance { get; private set; } + + private void Awake() + { + if (Instance != null && Instance != this) { Destroy(gameObject); return; } + Instance = this; + } + + private void Start() + { + if (!ServiceLocator.TryGet(out var save)) return; + + // Restore world time from save + _dayNight?.InitializeFromSave(save.Current.World.TimeOfDay); + + // Subscribe to phase changes to persist time-of-day + if (_dayNight != null) + _dayNight.OnPhaseChanged += _ => PersistTimeOfDay(); + } + + // ── Public API (called by world scripting) ──────────────────────────── + + public void MarkSecretDiscovered(string secretId) + { + if (!ServiceLocator.TryGet(out var save)) return; + var secrets = save.Current.World.DiscoveredSecrets; + if (!secrets.Contains(secretId)) + { + secrets.Add(secretId); + save.MarkDirty(); + BehaviorEventBus.Emit(new SecretAreaDiscoveredEvent()); + } + } + + public void MarkQuestCompleted(string questId) + { + if (!ServiceLocator.TryGet(out var save)) return; + var quests = save.Current.World.CompletedQuests; + if (!quests.Contains(questId)) + { + quests.Add(questId); + save.MarkDirty(); + BehaviorEventBus.Emit(new QuestCompletedEvent()); + } + } + + public void MarkShrineActivated(string shrineId) + { + if (!ServiceLocator.TryGet(out var save)) return; + var shrines = save.Current.World.ActivatedShrines; + if (!shrines.Contains(shrineId)) + { + shrines.Add(shrineId); + save.MarkDirty(); + } + } + + public void OnPlayerRested() + { + _dayNight?.AdvanceToNextDawn(); + PersistTimeOfDay(); + } + + // ── Internal ────────────────────────────────────────────────────────── + + private void PersistTimeOfDay() + { + if (!ServiceLocator.TryGet(out var save)) return; + save.Current.World.TimeOfDay = _dayNight != null ? _dayNight.NormalizedTime : 0f; + save.MarkDirty(); + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/World/WorldManager.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/World/WorldManager.cs.meta new file mode 100644 index 0000000..c8ad364 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/World/WorldManager.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: e4d7c2b710cf6428986fa6c537f9e4a4 \ No newline at end of file diff --git a/src/ProjectFenrir/Packages/manifest.json b/src/ProjectFenrir/Packages/manifest.json new file mode 100644 index 0000000..9cf7280 --- /dev/null +++ b/src/ProjectFenrir/Packages/manifest.json @@ -0,0 +1,52 @@ +{ + "dependencies": { + "com.unity.ai.navigation": "2.0.12", + "com.unity.burst": "1.8.18", + "com.unity.cinemachine": "3.1.4", + "com.unity.textmeshpro": "3.2.0-pre.10", + "com.unity.collab-proxy": "2.12.4", + "com.unity.ide.rider": "3.0.40", + "com.unity.ide.visualstudio": "2.0.27", + "com.unity.inputsystem": "1.19.0", + "com.unity.multiplayer.center": "1.0.1", + "com.unity.render-pipelines.universal": "17.4.0", + "com.unity.test-framework": "1.6.0", + "com.unity.timeline": "1.8.12", + "com.unity.ugui": "2.0.0", + "com.unity.visualscripting": "1.9.11", + "com.unity.modules.accessibility": "1.0.0", + "com.unity.modules.adaptiveperformance": "1.0.0", + "com.unity.modules.ai": "1.0.0", + "com.unity.modules.androidjni": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.cloth": "1.0.0", + "com.unity.modules.director": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.physics2d": "1.0.0", + "com.unity.modules.screencapture": "1.0.0", + "com.unity.modules.terrain": "1.0.0", + "com.unity.modules.terrainphysics": "1.0.0", + "com.unity.modules.tilemap": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.uielements": "1.0.0", + "com.unity.modules.umbra": "1.0.0", + "com.unity.modules.unityanalytics": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.unitywebrequesttexture": "1.0.0", + "com.unity.modules.unitywebrequestwww": "1.0.0", + "com.unity.modules.vectorgraphics": "1.0.0", + "com.unity.modules.vehicles": "1.0.0", + "com.unity.modules.video": "1.0.0", + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.wind": "1.0.0", + "com.unity.modules.xr": "1.0.0" + } +} diff --git a/src/ProjectFenrir/Packages/packages-lock.json b/src/ProjectFenrir/Packages/packages-lock.json new file mode 100644 index 0000000..4a2a769 --- /dev/null +++ b/src/ProjectFenrir/Packages/packages-lock.json @@ -0,0 +1,506 @@ +{ + "dependencies": { + "com.unity.ai.navigation": { + "version": "2.0.12", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.ai": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.burst": { + "version": "1.8.29", + "depth": 2, + "source": "registry", + "dependencies": { + "com.unity.mathematics": "1.2.1", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.cinemachine": { + "version": "3.1.4", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.splines": "2.0.0", + "com.unity.modules.imgui": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.collab-proxy": { + "version": "2.12.4", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.collections": { + "version": "6.4.0", + "depth": 2, + "source": "builtin", + "dependencies": { + "com.unity.burst": "1.8.23", + "com.unity.mathematics": "1.3.2", + "com.unity.nuget.mono-cecil": "1.11.5", + "com.unity.test-framework": "1.4.6", + "com.unity.test-framework.performance": "3.0.3" + } + }, + "com.unity.ext.nunit": { + "version": "2.0.5", + "depth": 1, + "source": "builtin", + "dependencies": {} + }, + "com.unity.ide.rider": { + "version": "3.0.40", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ext.nunit": "1.0.6" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ide.visualstudio": { + "version": "2.0.27", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.33" + }, + "url": "https://packages.unity.com" + }, + "com.unity.inputsystem": { + "version": "1.19.0", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.uielements": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.mathematics": { + "version": "1.3.3", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.multiplayer.center": { + "version": "1.0.1", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.uielements": "1.0.0" + } + }, + "com.unity.nuget.mono-cecil": { + "version": "1.11.6", + "depth": 3, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.render-pipelines.core": { + "version": "17.4.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.burst": "1.8.14", + "com.unity.mathematics": "1.3.2", + "com.unity.ugui": "2.0.0", + "com.unity.collections": "2.4.3", + "com.unity.modules.terrain": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.render-pipelines.universal": { + "version": "17.4.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.render-pipelines.core": "17.4.0", + "com.unity.shadergraph": "17.4.0", + "com.unity.render-pipelines.universal-config": "17.4.0" + } + }, + "com.unity.render-pipelines.universal-config": { + "version": "17.4.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.render-pipelines.core": "17.4.0" + } + }, + "com.unity.searcher": { + "version": "4.9.4", + "depth": 2, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.settings-manager": { + "version": "2.1.1", + "depth": 2, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.shadergraph": { + "version": "17.4.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.render-pipelines.core": "17.4.0", + "com.unity.searcher": "4.9.3" + } + }, + "com.unity.splines": { + "version": "2.8.4", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.mathematics": "1.2.1", + "com.unity.modules.imgui": "1.0.0", + "com.unity.settings-manager": "1.0.3" + }, + "url": "https://packages.unity.com" + }, + "com.unity.test-framework": { + "version": "1.6.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.ext.nunit": "2.0.3", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.test-framework.performance": { + "version": "3.4.0", + "depth": 3, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.33", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.textmeshpro": { + "version": "5.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.ugui": "2.0.0" + } + }, + "com.unity.timeline": { + "version": "1.8.12", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.director": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ugui": { + "version": "2.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0" + } + }, + "com.unity.visualscripting": { + "version": "1.9.11", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.modules.accessibility": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.adaptiveperformance": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.subsystems": "1.0.0" + } + }, + "com.unity.modules.ai": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.androidjni": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.animation": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.assetbundle": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.audio": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.cloth": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0" + } + }, + "com.unity.modules.director": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.animation": "1.0.0" + } + }, + "com.unity.modules.hierarchycore": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.imageconversion": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.imgui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.jsonserialize": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.particlesystem": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.physics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.physics2d": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.screencapture": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.subsystems": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.terrain": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.terrainphysics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.terrain": "1.0.0" + } + }, + "com.unity.modules.tilemap": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics2d": "1.0.0" + } + }, + "com.unity.modules.ui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.uielements": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.hierarchycore": "1.0.0", + "com.unity.modules.physics": "1.0.0" + } + }, + "com.unity.modules.umbra": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.unityanalytics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.unitywebrequest": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.unitywebrequestassetbundle": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" + } + }, + "com.unity.modules.unitywebrequestaudio": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.audio": "1.0.0" + } + }, + "com.unity.modules.unitywebrequesttexture": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.unitywebrequestwww": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.vectorgraphics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.uielements": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0", + "com.unity.modules.imgui": "1.0.0" + } + }, + "com.unity.modules.vehicles": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0" + } + }, + "com.unity.modules.video": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" + } + }, + "com.unity.modules.vr": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.xr": "1.0.0" + } + }, + "com.unity.modules.wind": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.xr": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.subsystems": "1.0.0" + } + } + } +} diff --git a/src/ProjectFenrir/ProjectSettings/AudioManager.asset b/src/ProjectFenrir/ProjectSettings/AudioManager.asset new file mode 100644 index 0000000..27287fe --- /dev/null +++ b/src/ProjectFenrir/ProjectSettings/AudioManager.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!11 &1 +AudioManager: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Volume: 1 + Rolloff Scale: 1 + Doppler Factor: 1 + Default Speaker Mode: 2 + m_SampleRate: 0 + m_DSPBufferSize: 1024 + m_VirtualVoiceCount: 512 + m_RealVoiceCount: 32 + m_SpatializerPlugin: + m_AmbisonicDecoderPlugin: + m_DisableAudio: 0 + m_VirtualizeEffects: 1 + m_RequestedDSPBufferSize: 0 diff --git a/src/ProjectFenrir/ProjectSettings/ClusterInputManager.asset b/src/ProjectFenrir/ProjectSettings/ClusterInputManager.asset new file mode 100644 index 0000000..e7886b2 --- /dev/null +++ b/src/ProjectFenrir/ProjectSettings/ClusterInputManager.asset @@ -0,0 +1,6 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!236 &1 +ClusterInputManager: + m_ObjectHideFlags: 0 + m_Inputs: [] diff --git a/src/ProjectFenrir/ProjectSettings/DynamicsManager.asset b/src/ProjectFenrir/ProjectSettings/DynamicsManager.asset new file mode 100644 index 0000000..fc90ab9 --- /dev/null +++ b/src/ProjectFenrir/ProjectSettings/DynamicsManager.asset @@ -0,0 +1,36 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!55 &1 +PhysicsManager: + m_ObjectHideFlags: 0 + serializedVersion: 13 + m_Gravity: {x: 0, y: -9.81, z: 0} + m_DefaultMaterial: {fileID: 0} + m_BounceThreshold: 2 + m_SleepThreshold: 0.005 + m_DefaultContactOffset: 0.01 + m_DefaultSolverIterations: 6 + m_DefaultSolverVelocityIterations: 1 + m_QueriesHitBackfaces: 0 + m_QueriesHitTriggers: 1 + m_EnableAdaptiveForce: 0 + m_ClothInterCollisionDistance: 0.1 + m_ClothInterCollisionStiffness: 0.2 + m_ContactsGeneration: 1 + m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff + m_AutoSimulation: 1 + m_AutoSyncTransforms: 0 + m_ReuseCollisionCallbacks: 1 + m_ClothInterCollisionSettingsToggle: 0 + m_ClothGravity: {x: 0, y: -9.81, z: 0} + m_ContactPairsMode: 0 + m_BroadphaseType: 0 + m_WorldBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 250, y: 250, z: 250} + m_WorldSubdivisions: 8 + m_FrictionType: 0 + m_EnableEnhancedDeterminism: 0 + m_EnableUnifiedHeightmaps: 1 + m_SolverType: 0 + m_DefaultMaxAngularSpeed: 50 diff --git a/src/ProjectFenrir/ProjectSettings/EditorBuildSettings.asset b/src/ProjectFenrir/ProjectSettings/EditorBuildSettings.asset new file mode 100644 index 0000000..513e6f1 --- /dev/null +++ b/src/ProjectFenrir/ProjectSettings/EditorBuildSettings.asset @@ -0,0 +1,12 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1045 &1 +EditorBuildSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Scenes: + - enabled: 1 + path: Assets/Scenes/SampleScene.unity + guid: 99c9720ab356a0642a771bea13969a05 + m_configObjects: + com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3} diff --git a/src/ProjectFenrir/ProjectSettings/EditorSettings.asset b/src/ProjectFenrir/ProjectSettings/EditorSettings.asset new file mode 100644 index 0000000..226f2d0 --- /dev/null +++ b/src/ProjectFenrir/ProjectSettings/EditorSettings.asset @@ -0,0 +1,52 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!159 &1 +EditorSettings: + m_ObjectHideFlags: 0 + serializedVersion: 15 + m_SerializationMode: 2 + m_LineEndingsForNewScripts: 0 + m_DefaultBehaviorMode: 0 + m_PrefabRegularEnvironment: {fileID: 0} + m_PrefabUIEnvironment: {fileID: 0} + m_SpritePackerMode: 0 + m_SpritePackerCacheSize: 10 + m_SpritePackerPaddingPower: 1 + m_Bc7TextureCompressor: 0 + m_EtcTextureCompressorBehavior: 1 + m_EtcTextureFastCompressor: 1 + m_EtcTextureNormalCompressor: 2 + m_EtcTextureBestCompressor: 4 + m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef;rsp;asmref + m_ProjectGenerationRootNamespace: + m_EnableTextureStreamingInEditMode: 1 + m_EnableTextureStreamingInPlayMode: 1 + m_EnableEditorAsyncCPUTextureLoading: 0 + m_AsyncShaderCompilation: 1 + m_BlockShaders: 0 + m_UnlockBlockShaders: 0 + m_PrefabModeAllowAutoSave: 1 + m_EnterPlayModeOptionsEnabled: 1 + m_EnterPlayModeOptions: 0 + m_GameObjectNamingDigits: 1 + m_GameObjectNamingScheme: 0 + m_AssetNamingUsesSpace: 1 + m_InspectorUseIMGUIDefaultInspector: 0 + m_UseLegacyProbeSampleCount: 0 + m_SerializeInlineMappingsOnOneLine: 1 + m_DisableCookiesInLightmapper: 0 + m_ShadowmaskStitching: 0 + m_AssetPipelineMode: 1 + m_RefreshImportMode: 0 + m_CacheServerMode: 0 + m_CacheServerEndpoint: + m_CacheServerNamespacePrefix: default + m_CacheServerEnableDownload: 1 + m_CacheServerEnableUpload: 1 + m_CacheServerEnableTls: 0 + m_CacheServerValidationMode: 2 + m_CacheServerDownloadBatchSize: 128 + m_EnableEnlightenBakedGI: 0 + m_ReferencedClipsExactNaming: 1 + m_ForceAssetUnloadAndGCOnSceneLoad: 1 + m_HideBuildProfileClassicPlatforms: 0 diff --git a/src/ProjectFenrir/ProjectSettings/GraphicsSettings.asset b/src/ProjectFenrir/ProjectSettings/GraphicsSettings.asset new file mode 100644 index 0000000..84b2182 --- /dev/null +++ b/src/ProjectFenrir/ProjectSettings/GraphicsSettings.asset @@ -0,0 +1,69 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!30 &1 +GraphicsSettings: + m_ObjectHideFlags: 0 + serializedVersion: 16 + m_Deferred: + m_Mode: 1 + m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} + m_DeferredReflections: + m_Mode: 1 + m_Shader: {fileID: 74, guid: 0000000000000000f000000000000000, type: 0} + m_ScreenSpaceShadows: + m_Mode: 1 + m_Shader: {fileID: 64, guid: 0000000000000000f000000000000000, type: 0} + m_DepthNormals: + m_Mode: 1 + m_Shader: {fileID: 62, guid: 0000000000000000f000000000000000, type: 0} + m_MotionVectors: + m_Mode: 1 + m_Shader: {fileID: 75, guid: 0000000000000000f000000000000000, type: 0} + m_LightHalo: + m_Mode: 1 + m_Shader: {fileID: 105, guid: 0000000000000000f000000000000000, type: 0} + m_LensFlare: + m_Mode: 1 + m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0} + m_VideoShadersIncludeMode: 2 + m_AlwaysIncludedShaders: + - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 15105, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0} + m_PreloadedShaders: [] + m_PreloadShadersBatchTimeLimit: -1 + m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_CustomRenderPipeline: {fileID: 11400000, guid: 4b83569d67af61e458304325a23e5dfd, type: 2} + m_TransparencySortMode: 0 + m_TransparencySortAxis: {x: 0, y: 0, z: 1} + m_DefaultRenderingPath: 1 + m_DefaultMobileRenderingPath: 1 + m_TierSettings: [] + m_LightmapStripping: 0 + m_FogStripping: 0 + m_InstancingStripping: 0 + m_BrgStripping: 0 + m_LightmapKeepPlain: 1 + m_LightmapKeepDirCombined: 1 + m_LightmapKeepDynamicPlain: 1 + m_LightmapKeepDynamicDirCombined: 1 + m_LightmapKeepShadowMask: 1 + m_LightmapKeepSubtractive: 1 + m_FogKeepLinear: 1 + m_FogKeepExp: 1 + m_FogKeepExp2: 1 + m_AlbedoSwatchInfos: [] + m_RenderPipelineGlobalSettingsMap: + UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: 18dc0cd2c080841dea60987a38ce93fa, type: 2} + m_ShaderBuildSettings: + keywordDeclarationOverrides: [] + m_LightsUseLinearIntensity: 1 + m_LightsUseColorTemperature: 1 + m_LogWhenShaderIsCompiled: 0 + m_LightProbeOutsideHullStrategy: 0 + m_CameraRelativeLightCulling: 0 + m_CameraRelativeShadowCulling: 0 diff --git a/src/ProjectFenrir/ProjectSettings/InputManager.asset b/src/ProjectFenrir/ProjectSettings/InputManager.asset new file mode 100644 index 0000000..b16147e --- /dev/null +++ b/src/ProjectFenrir/ProjectSettings/InputManager.asset @@ -0,0 +1,487 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!13 &1 +InputManager: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Axes: + - serializedVersion: 3 + m_Name: Horizontal + descriptiveName: + descriptiveNegativeName: + negativeButton: left + positiveButton: right + altNegativeButton: a + altPositiveButton: d + gravity: 3 + dead: 0.001 + sensitivity: 3 + snap: 1 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Vertical + descriptiveName: + descriptiveNegativeName: + negativeButton: down + positiveButton: up + altNegativeButton: s + altPositiveButton: w + gravity: 3 + dead: 0.001 + sensitivity: 3 + snap: 1 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Fire1 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: left ctrl + altNegativeButton: + altPositiveButton: mouse 0 + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Fire2 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: left alt + altNegativeButton: + altPositiveButton: mouse 1 + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Fire3 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: left shift + altNegativeButton: + altPositiveButton: mouse 2 + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Jump + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: space + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Mouse X + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0 + sensitivity: 0.1 + snap: 0 + invert: 0 + type: 1 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Mouse Y + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0 + sensitivity: 0.1 + snap: 0 + invert: 0 + type: 1 + axis: 1 + joyNum: 0 + - serializedVersion: 3 + m_Name: Mouse ScrollWheel + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0 + sensitivity: 0.1 + snap: 0 + invert: 0 + type: 1 + axis: 2 + joyNum: 0 + - serializedVersion: 3 + m_Name: Horizontal + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0.19 + sensitivity: 1 + snap: 0 + invert: 0 + type: 2 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Vertical + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0.19 + sensitivity: 1 + snap: 0 + invert: 1 + type: 2 + axis: 1 + joyNum: 0 + - serializedVersion: 3 + m_Name: Fire1 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 0 + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Fire2 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 1 + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Fire3 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 2 + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Jump + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 3 + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Submit + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: return + altNegativeButton: + altPositiveButton: joystick button 0 + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Submit + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: enter + altNegativeButton: + altPositiveButton: space + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Cancel + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: escape + altNegativeButton: + altPositiveButton: joystick button 1 + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Enable Debug Button 1 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: left ctrl + altNegativeButton: + altPositiveButton: joystick button 8 + gravity: 0 + dead: 0 + sensitivity: 0 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Enable Debug Button 2 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: backspace + altNegativeButton: + altPositiveButton: joystick button 9 + gravity: 0 + dead: 0 + sensitivity: 0 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Reset + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: left alt + altNegativeButton: + altPositiveButton: joystick button 1 + gravity: 0 + dead: 0 + sensitivity: 0 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Next + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: page down + altNegativeButton: + altPositiveButton: joystick button 5 + gravity: 0 + dead: 0 + sensitivity: 0 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Previous + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: page up + altNegativeButton: + altPositiveButton: joystick button 4 + gravity: 0 + dead: 0 + sensitivity: 0 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Validate + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: return + altNegativeButton: + altPositiveButton: joystick button 0 + gravity: 0 + dead: 0 + sensitivity: 0 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Persistent + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: right shift + altNegativeButton: + altPositiveButton: joystick button 2 + gravity: 0 + dead: 0 + sensitivity: 0 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Multiplier + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: left shift + altNegativeButton: + altPositiveButton: joystick button 3 + gravity: 0 + dead: 0 + sensitivity: 0 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Horizontal + descriptiveName: + descriptiveNegativeName: + negativeButton: left + positiveButton: right + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Vertical + descriptiveName: + descriptiveNegativeName: + negativeButton: down + positiveButton: up + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Vertical + descriptiveName: + descriptiveNegativeName: + negativeButton: down + positiveButton: up + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 2 + axis: 6 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Horizontal + descriptiveName: + descriptiveNegativeName: + negativeButton: left + positiveButton: right + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 2 + axis: 5 + joyNum: 0 diff --git a/src/ProjectFenrir/ProjectSettings/MemorySettings.asset b/src/ProjectFenrir/ProjectSettings/MemorySettings.asset new file mode 100644 index 0000000..5b5face --- /dev/null +++ b/src/ProjectFenrir/ProjectSettings/MemorySettings.asset @@ -0,0 +1,35 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!387306366 &1 +MemorySettings: + m_ObjectHideFlags: 0 + m_EditorMemorySettings: + m_MainAllocatorBlockSize: -1 + m_ThreadAllocatorBlockSize: -1 + m_MainGfxBlockSize: -1 + m_ThreadGfxBlockSize: -1 + m_CacheBlockSize: -1 + m_TypetreeBlockSize: -1 + m_ProfilerBlockSize: -1 + m_ProfilerEditorBlockSize: -1 + m_BucketAllocatorGranularity: -1 + m_BucketAllocatorBucketsCount: -1 + m_BucketAllocatorBlockSize: -1 + m_BucketAllocatorBlockCount: -1 + m_ProfilerBucketAllocatorGranularity: -1 + m_ProfilerBucketAllocatorBucketsCount: -1 + m_ProfilerBucketAllocatorBlockSize: -1 + m_ProfilerBucketAllocatorBlockCount: -1 + m_TempAllocatorSizeMain: -1 + m_JobTempAllocatorBlockSize: -1 + m_BackgroundJobTempAllocatorBlockSize: -1 + m_JobTempAllocatorReducedBlockSize: -1 + m_TempAllocatorSizeGIBakingWorker: -1 + m_TempAllocatorSizeNavMeshWorker: -1 + m_TempAllocatorSizeAudioWorker: -1 + m_TempAllocatorSizeCloudWorker: -1 + m_TempAllocatorSizeGfx: -1 + m_TempAllocatorSizeJobWorker: -1 + m_TempAllocatorSizeBackgroundWorker: -1 + m_TempAllocatorSizePreloadManager: -1 + m_PlatformMemorySettings: {} diff --git a/src/ProjectFenrir/ProjectSettings/MultiplayerManager.asset b/src/ProjectFenrir/ProjectSettings/MultiplayerManager.asset new file mode 100644 index 0000000..2a93664 --- /dev/null +++ b/src/ProjectFenrir/ProjectSettings/MultiplayerManager.asset @@ -0,0 +1,7 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!655991488 &1 +MultiplayerManager: + m_ObjectHideFlags: 0 + m_EnableMultiplayerRoles: 0 + m_StrippingTypes: {} diff --git a/src/ProjectFenrir/ProjectSettings/NavMeshAreas.asset b/src/ProjectFenrir/ProjectSettings/NavMeshAreas.asset new file mode 100644 index 0000000..3b0b7c3 --- /dev/null +++ b/src/ProjectFenrir/ProjectSettings/NavMeshAreas.asset @@ -0,0 +1,91 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!126 &1 +NavMeshProjectSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + areas: + - name: Walkable + cost: 1 + - name: Not Walkable + cost: 1 + - name: Jump + cost: 2 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + m_LastAgentTypeID: -887442657 + m_Settings: + - serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.75 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 + m_SettingNames: + - Humanoid diff --git a/src/ProjectFenrir/ProjectSettings/PackageManagerSettings.asset b/src/ProjectFenrir/ProjectSettings/PackageManagerSettings.asset new file mode 100644 index 0000000..be4a797 --- /dev/null +++ b/src/ProjectFenrir/ProjectSettings/PackageManagerSettings.asset @@ -0,0 +1,43 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_EnablePreviewPackages: 0 + m_EnablePackageDependencies: 0 + m_AdvancedSettingsExpanded: 1 + m_ScopedRegistriesSettingsExpanded: 1 + oneTimeWarningShown: 0 + m_Registries: + - m_Id: main + m_Name: + m_Url: https://packages.unity.com + m_Scopes: [] + m_IsDefault: 1 + m_Capabilities: 7 + m_UserSelectedRegistryName: + m_UserAddingNewScopedRegistry: 0 + m_RegistryInfoDraft: + m_ErrorMessage: + m_Original: + m_Id: + m_Name: + m_Url: + m_Scopes: [] + m_IsDefault: 0 + m_Capabilities: 0 + m_Modified: 0 + m_Name: + m_Url: + m_Scopes: + - + m_SelectedScopeIndex: 0 diff --git a/src/ProjectFenrir/ProjectSettings/Physics2DSettings.asset b/src/ProjectFenrir/ProjectSettings/Physics2DSettings.asset new file mode 100644 index 0000000..6c5cf8a --- /dev/null +++ b/src/ProjectFenrir/ProjectSettings/Physics2DSettings.asset @@ -0,0 +1,56 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!19 &1 +Physics2DSettings: + m_ObjectHideFlags: 0 + serializedVersion: 4 + m_Gravity: {x: 0, y: -9.81} + m_DefaultMaterial: {fileID: 0} + m_VelocityIterations: 8 + m_PositionIterations: 3 + m_VelocityThreshold: 1 + m_MaxLinearCorrection: 0.2 + m_MaxAngularCorrection: 8 + m_MaxTranslationSpeed: 100 + m_MaxRotationSpeed: 360 + m_BaumgarteScale: 0.2 + m_BaumgarteTimeOfImpactScale: 0.75 + m_TimeToSleep: 0.5 + m_LinearSleepTolerance: 0.01 + m_AngularSleepTolerance: 2 + m_DefaultContactOffset: 0.01 + m_JobOptions: + serializedVersion: 2 + useMultithreading: 0 + useConsistencySorting: 0 + m_InterpolationPosesPerJob: 100 + m_NewContactsPerJob: 30 + m_CollideContactsPerJob: 100 + m_ClearFlagsPerJob: 200 + m_ClearBodyForcesPerJob: 200 + m_SyncDiscreteFixturesPerJob: 50 + m_SyncContinuousFixturesPerJob: 50 + m_FindNearestContactsPerJob: 100 + m_UpdateTriggerContactsPerJob: 100 + m_IslandSolverCostThreshold: 100 + m_IslandSolverBodyCostScale: 1 + m_IslandSolverContactCostScale: 10 + m_IslandSolverJointCostScale: 10 + m_IslandSolverBodiesPerJob: 50 + m_IslandSolverContactsPerJob: 50 + m_AutoSimulation: 1 + m_QueriesHitTriggers: 1 + m_QueriesStartInColliders: 1 + m_CallbacksOnDisable: 1 + m_ReuseCollisionCallbacks: 0 + m_AutoSyncTransforms: 0 + m_AlwaysShowColliders: 0 + m_ShowColliderSleep: 1 + m_ShowColliderContacts: 0 + m_ShowColliderAABB: 0 + m_ContactArrowScale: 0.2 + m_ColliderAwakeColor: {r: 0.5686275, g: 0.95686275, b: 0.54509807, a: 0.7529412} + m_ColliderAsleepColor: {r: 0.5686275, g: 0.95686275, b: 0.54509807, a: 0.36078432} + m_ColliderContactColor: {r: 1, g: 0, b: 1, a: 0.6862745} + m_ColliderAABBColor: {r: 1, g: 1, b: 0, a: 0.2509804} + m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff diff --git a/src/ProjectFenrir/ProjectSettings/PresetManager.asset b/src/ProjectFenrir/ProjectSettings/PresetManager.asset new file mode 100644 index 0000000..67a94da --- /dev/null +++ b/src/ProjectFenrir/ProjectSettings/PresetManager.asset @@ -0,0 +1,7 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1386491679 &1 +PresetManager: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_DefaultPresets: {} diff --git a/src/ProjectFenrir/ProjectSettings/ProjectSettings.asset b/src/ProjectFenrir/ProjectSettings/ProjectSettings.asset new file mode 100644 index 0000000..752f57d --- /dev/null +++ b/src/ProjectFenrir/ProjectSettings/ProjectSettings.asset @@ -0,0 +1,941 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!129 &1 +PlayerSettings: + m_ObjectHideFlags: 0 + serializedVersion: 28 + productGUID: 0ff0cee8657d2492c928eaea8027eedf + AndroidProfiler: 0 + AndroidFilterTouchesWhenObscured: 0 + AndroidEnableSustainedPerformanceMode: 0 + defaultScreenOrientation: 4 + targetDevice: 2 + useOnDemandResources: 0 + accelerometerFrequency: 60 + companyName: DefaultCompany + productName: ProjectFenrir + defaultCursor: {fileID: 0} + cursorHotspot: {x: 0, y: 0} + m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} + m_ShowUnitySplashScreen: 1 + m_ShowUnitySplashLogo: 1 + m_SplashScreenOverlayOpacity: 1 + m_SplashScreenAnimation: 1 + m_SplashScreenLogoStyle: 1 + m_SplashScreenDrawMode: 0 + m_SplashScreenBackgroundAnimationZoom: 1 + m_SplashScreenLogoAnimationZoom: 1 + m_SplashScreenBackgroundLandscapeAspect: 1 + m_SplashScreenBackgroundPortraitAspect: 1 + m_SplashScreenBackgroundLandscapeUvs: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + m_SplashScreenBackgroundPortraitUvs: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + m_SplashScreenLogos: [] + m_VirtualRealitySplashScreen: {fileID: 0} + defaultScreenWidth: 1024 + defaultScreenHeight: 768 + defaultScreenWidthWeb: 960 + defaultScreenHeightWeb: 600 + m_StereoRenderingPath: 0 + m_ActiveColorSpace: 1 + unsupportedMSAAFallback: 0 + m_SpriteBatchMaxVertexCount: 65535 + m_SpriteBatchVertexThreshold: 300 + m_MTRendering: 1 + mipStripping: 0 + numberOfMipsStripped: 0 + numberOfMipsStrippedPerMipmapLimitGroup: {} + m_StackTraceTypes: 010000000100000001000000010000000100000001000000 + iosShowActivityIndicatorOnLoading: -1 + androidShowActivityIndicatorOnLoading: -1 + iosUseCustomAppBackgroundBehavior: 0 + allowedAutorotateToPortrait: 1 + allowedAutorotateToPortraitUpsideDown: 1 + allowedAutorotateToLandscapeRight: 1 + allowedAutorotateToLandscapeLeft: 1 + useOSAutorotation: 1 + use32BitDisplayBuffer: 1 + preserveFramebufferAlpha: 0 + disableDepthAndStencilBuffers: 0 + androidStartInFullscreen: 1 + androidRenderOutsideSafeArea: 1 + androidUseSwappy: 0 + androidDisplayOptions: 1 + androidBlitType: 0 + androidResizeableActivity: 1 + androidDefaultWindowWidth: 1920 + androidDefaultWindowHeight: 1080 + androidMinimumWindowWidth: 400 + androidMinimumWindowHeight: 300 + androidFullscreenMode: 1 + androidAutoRotationBehavior: 1 + androidPredictiveBackSupport: 1 + androidApplicationEntry: 2 + defaultIsNativeResolution: 1 + macRetinaSupport: 1 + runInBackground: 0 + muteOtherAudioSources: 0 + Prepare IOS For Recording: 0 + Force IOS Speakers When Recording: 0 + audioSpatialExperience: 0 + deferSystemGesturesMode: 0 + hideHomeButton: 0 + submitAnalytics: 1 + usePlayerLog: 1 + dedicatedServerOptimizations: 1 + bakeCollisionMeshes: 0 + forceSingleInstance: 0 + useFlipModelSwapchain: 1 + resizableWindow: 0 + useMacAppStoreValidation: 0 + macAppStoreCategory: public.app-category.games + gpuSkinning: 1 + meshDeformation: 2 + xboxPIXTextureCapture: 0 + xboxEnableAvatar: 0 + xboxEnableKinect: 0 + xboxEnableKinectAutoTracking: 0 + xboxEnableFitness: 0 + visibleInBackground: 1 + allowFullscreenSwitch: 1 + fullscreenMode: 1 + xboxSpeechDB: 0 + xboxEnableHeadOrientation: 0 + xboxEnableGuest: 0 + xboxEnablePIXSampling: 0 + metalFramebufferOnly: 0 + metalUseMetalDisplayLink: 0 + xboxOneResolution: 0 + xboxOneSResolution: 0 + xboxOneXResolution: 3 + xboxOneMonoLoggingLevel: 0 + xboxOneLoggingLevel: 1 + xboxOneDisableEsram: 0 + xboxOneEnableTypeOptimization: 0 + xboxOnePresentImmediateThreshold: 0 + switchQueueCommandMemory: 1048576 + switchQueueControlMemory: 16384 + switchQueueComputeMemory: 262144 + switchNVNShaderPoolsGranularity: 33554432 + switchNVNDefaultPoolsGranularity: 16777216 + switchNVNOtherPoolsGranularity: 16777216 + switchGpuScratchPoolGranularity: 2097152 + switchAllowGpuScratchShrinking: 0 + switchNVNMaxPublicTextureIDCount: 0 + switchNVNMaxPublicSamplerIDCount: 0 + switchMaxWorkerMultiple: 8 + switchNVNGraphicsFirmwareMemory: 32 + switchGraphicsJobsSyncAfterKick: 1 + vulkanNumSwapchainBuffers: 3 + vulkanEnableSetSRGBWrite: 0 + vulkanEnablePreTransform: 1 + vulkanEnableLateAcquireNextImage: 0 + vulkanEnableCommandBufferRecycling: 1 + loadStoreDebugModeEnabled: 0 + visionOSBundleVersion: 1.0 + tvOSBundleVersion: 1.0 + bundleVersion: 0.1.0 + preloadedAssets: [] + metroInputSource: 0 + wsaTransparentSwapchain: 0 + xboxOneDisableKinectGpuReservation: 1 + xboxOneEnable7thCore: 1 + vrSettings: + enable360StereoCapture: 0 + enableFrameTimingStats: 0 + enableOpenGLProfilerGPURecorders: 1 + allowHDRDisplaySupport: 0 + useHDRDisplay: 0 + hdrBitDepth: 0 + m_ColorGamuts: 00000000 + targetPixelDensity: 30 + resolutionScalingMode: 0 + resetResolutionOnWindowResize: 0 + androidSupportedAspectRatio: 1 + androidMaxAspectRatio: 2.4 + androidMinAspectRatio: 1 + applicationIdentifier: + Android: com.UnityTechnologies.com.unity.template.urpblank + Standalone: com.Unity-Technologies.com.unity.template.urp-blank + iPhone: com.Unity-Technologies.com.unity.template.urp-blank + buildNumber: + Standalone: 0 + VisionOS: 0 + iPhone: 0 + tvOS: 0 + overrideDefaultApplicationIdentifier: 1 + AndroidBundleVersionCode: 1 + AndroidMinSdkVersion: 25 + AndroidTargetSdkVersion: 0 + AndroidPreferredInstallLocation: 1 + AndroidPreferredDataLocation: 1 + aotOptions: + stripEngineCode: 1 + iPhoneStrippingLevel: 0 + iPhoneScriptCallOptimization: 0 + ForceInternetPermission: 0 + ForceSDCardPermission: 0 + CreateWallpaper: 0 + androidSplitApplicationBinary: 0 + keepLoadedShadersAlive: 0 + StripUnusedMeshComponents: 0 + strictShaderVariantMatching: 0 + VertexChannelCompressionMask: 4054 + iPhoneSdkVersion: 988 + iOSSimulatorArchitecture: 0 + iOSTargetOSVersionString: 15.0 + tvOSSdkVersion: 0 + tvOSSimulatorArchitecture: 0 + tvOSRequireExtendedGameController: 0 + tvOSTargetOSVersionString: 15.0 + VisionOSSdkVersion: 0 + VisionOSTargetOSVersionString: 1.0 + uIPrerenderedIcon: 0 + uIRequiresPersistentWiFi: 0 + uIRequiresFullScreen: 1 + uIStatusBarHidden: 1 + uIExitOnSuspend: 0 + uIStatusBarStyle: 0 + appleTVSplashScreen: {fileID: 0} + appleTVSplashScreen2x: {fileID: 0} + tvOSSmallIconLayers: [] + tvOSSmallIconLayers2x: [] + tvOSLargeIconLayers: [] + tvOSLargeIconLayers2x: [] + tvOSTopShelfImageLayers: [] + tvOSTopShelfImageLayers2x: [] + tvOSTopShelfImageWideLayers: [] + tvOSTopShelfImageWideLayers2x: [] + iOSLaunchScreenType: 0 + iOSLaunchScreenPortrait: {fileID: 0} + iOSLaunchScreenLandscape: {fileID: 0} + iOSLaunchScreenBackgroundColor: + serializedVersion: 2 + rgba: 0 + iOSLaunchScreenFillPct: 100 + iOSLaunchScreenSize: 100 + iOSLaunchScreeniPadType: 0 + iOSLaunchScreeniPadImage: {fileID: 0} + iOSLaunchScreeniPadBackgroundColor: + serializedVersion: 2 + rgba: 0 + iOSLaunchScreeniPadFillPct: 100 + iOSLaunchScreeniPadSize: 100 + iOSLaunchScreenCustomStoryboardPath: + iOSLaunchScreeniPadCustomStoryboardPath: + iOSDeviceRequirements: [] + iOSURLSchemes: [] + macOSURLSchemes: [] + iOSBackgroundModes: 0 + iOSMetalForceHardShadows: 0 + metalEditorSupport: 1 + metalAPIValidation: 1 + metalCompileShaderBinary: 0 + iOSRenderExtraFrameOnPause: 0 + iosCopyPluginsCodeInsteadOfSymlink: 0 + appleDeveloperTeamID: + iOSManualSigningProvisioningProfileID: + tvOSManualSigningProvisioningProfileID: + VisionOSManualSigningProvisioningProfileID: + iOSManualSigningProvisioningProfileType: 0 + tvOSManualSigningProvisioningProfileType: 0 + VisionOSManualSigningProvisioningProfileType: 0 + appleEnableAutomaticSigning: 0 + iOSRequireARKit: 0 + iOSAutomaticallyDetectAndAddCapabilities: 1 + appleEnableProMotion: 0 + shaderPrecisionModel: 0 + clonedFromGUID: 3c72c65a16f0acb438eed22b8b16c24a + templatePackageId: com.unity.template.urp-blank@17.0.14 + templateDefaultScene: Assets/Scenes/SampleScene.unity + useCustomMainManifest: 0 + useCustomLauncherManifest: 0 + useCustomMainGradleTemplate: 0 + useCustomLauncherGradleManifest: 0 + useCustomBaseGradleTemplate: 0 + useCustomGradlePropertiesTemplate: 0 + useCustomGradleSettingsTemplate: 0 + useCustomProguardFile: 0 + AndroidTargetArchitectures: 2 + AndroidAllowedArchitectures: -13 + AndroidSplashScreenScale: 0 + androidSplashScreen: {fileID: 0} + AndroidKeystoreName: + AndroidKeyaliasName: + AndroidEnableArmv9SecurityFeatures: 0 + AndroidEnableArm64MTE: 0 + AndroidBuildApkPerCpuArchitecture: 0 + AndroidTVCompatibility: 0 + AndroidIsGame: 1 + androidAppCategory: 3 + useAndroidAppCategory: 1 + androidAppCategoryOther: + AndroidEnableTango: 0 + androidEnableBanner: 1 + androidUseLowAccuracyLocation: 0 + androidUseCustomKeystore: 0 + m_AndroidBanners: + - width: 320 + height: 180 + banner: {fileID: 0} + androidGamepadSupportLevel: 0 + AndroidMinifyRelease: 0 + AndroidMinifyDebug: 0 + AndroidValidateAppBundleSize: 1 + AndroidAppBundleSizeToValidate: 150 + AndroidReportGooglePlayAppDependencies: 1 + androidSymbolsSizeThreshold: 800 + m_BuildTargetIcons: [] + m_BuildTargetPlatformIcons: + - m_BuildTarget: iPhone + m_Icons: + - m_Textures: [] + m_Width: 180 + m_Height: 180 + m_Kind: 0 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 120 + m_Height: 120 + m_Kind: 0 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 167 + m_Height: 167 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: [] + m_Width: 152 + m_Height: 152 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: [] + m_Width: 76 + m_Height: 76 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: [] + m_Width: 120 + m_Height: 120 + m_Kind: 3 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 80 + m_Height: 80 + m_Kind: 3 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 80 + m_Height: 80 + m_Kind: 3 + m_SubKind: iPad + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 3 + m_SubKind: iPad + - m_Textures: [] + m_Width: 87 + m_Height: 87 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 58 + m_Height: 58 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 29 + m_Height: 29 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 58 + m_Height: 58 + m_Kind: 1 + m_SubKind: iPad + - m_Textures: [] + m_Width: 29 + m_Height: 29 + m_Kind: 1 + m_SubKind: iPad + - m_Textures: [] + m_Width: 60 + m_Height: 60 + m_Kind: 2 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 2 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 2 + m_SubKind: iPad + - m_Textures: [] + m_Width: 20 + m_Height: 20 + m_Kind: 2 + m_SubKind: iPad + - m_Textures: [] + m_Width: 1024 + m_Height: 1024 + m_Kind: 4 + m_SubKind: App Store + - m_BuildTarget: Android + m_Icons: + - m_Textures: [] + m_Width: 432 + m_Height: 432 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 324 + m_Height: 324 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 216 + m_Height: 216 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 162 + m_Height: 162 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 108 + m_Height: 108 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 81 + m_Height: 81 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 192 + m_Height: 192 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 144 + m_Height: 144 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 96 + m_Height: 96 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 72 + m_Height: 72 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 48 + m_Height: 48 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 36 + m_Height: 36 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 192 + m_Height: 192 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 144 + m_Height: 144 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 96 + m_Height: 96 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 72 + m_Height: 72 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 48 + m_Height: 48 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 36 + m_Height: 36 + m_Kind: 0 + m_SubKind: + - m_BuildTarget: tvOS + m_Icons: + - m_Textures: [] + m_Width: 1280 + m_Height: 768 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 800 + m_Height: 480 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 400 + m_Height: 240 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 4640 + m_Height: 1440 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 2320 + m_Height: 720 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 3840 + m_Height: 1440 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 1920 + m_Height: 720 + m_Kind: 1 + m_SubKind: + m_BuildTargetBatching: [] + m_BuildTargetShaderSettings: [] + m_BuildTargetGraphicsJobs: [] + m_BuildTargetGraphicsJobMode: [] + m_BuildTargetGraphicsAPIs: + - m_BuildTarget: iOSSupport + m_APIs: 10000000 + m_Automatic: 1 + - m_BuildTarget: AndroidPlayer + m_APIs: 150000000b000000 + m_Automatic: 0 + m_BuildTargetVRSettings: [] + m_DefaultShaderChunkSizeInMB: 16 + m_DefaultShaderChunkCount: 0 + openGLRequireES31: 0 + openGLRequireES31AEP: 0 + openGLRequireES32: 0 + m_TemplateCustomTags: {} + mobileMTRendering: + Android: 1 + iPhone: 1 + tvOS: 1 + m_BuildTargetGroupLightmapEncodingQuality: + - serializedVersion: 2 + m_BuildTarget: Android + m_EncodingQuality: 1 + m_BuildTargetGroupHDRCubemapEncodingQuality: [] + m_BuildTargetGroupLightmapSettings: [] + m_BuildTargetGroupLoadStoreDebugModeSettings: [] + m_BuildTargetNormalMapEncoding: + - m_BuildTarget: Android + m_Encoding: 1 + m_BuildTargetDefaultTextureCompressionFormat: + - serializedVersion: 3 + m_BuildTarget: Android + m_Formats: 03000000 + playModeTestRunnerEnabled: 0 + runPlayModeTestAsEditModeTest: 0 + actionOnDotNetUnhandledException: 1 + editorGfxJobOverride: 1 + enableInternalProfiler: 0 + logObjCUncaughtExceptions: 1 + enableCrashReportAPI: 0 + cameraUsageDescription: + locationUsageDescription: + microphoneUsageDescription: + bluetoothUsageDescription: + macOSTargetOSVersion: 12.0 + switchNMETAOverride: + switchNetLibKey: + switchSocketMemoryPoolSize: 6144 + switchSocketAllocatorPoolSize: 128 + switchSocketConcurrencyLimit: 14 + switchScreenResolutionBehavior: 2 + switchUseCPUProfiler: 0 + switchEnableFileSystemTrace: 0 + switchLTOSetting: 0 + switchApplicationID: 0x01004b9000490000 + switchNSODependencies: + switchCompilerFlags: + switchTitleNames_0: + switchTitleNames_1: + switchTitleNames_2: + switchTitleNames_3: + switchTitleNames_4: + switchTitleNames_5: + switchTitleNames_6: + switchTitleNames_7: + switchTitleNames_8: + switchTitleNames_9: + switchTitleNames_10: + switchTitleNames_11: + switchTitleNames_12: + switchTitleNames_13: + switchTitleNames_14: + switchTitleNames_15: + switchPublisherNames_0: + switchPublisherNames_1: + switchPublisherNames_2: + switchPublisherNames_3: + switchPublisherNames_4: + switchPublisherNames_5: + switchPublisherNames_6: + switchPublisherNames_7: + switchPublisherNames_8: + switchPublisherNames_9: + switchPublisherNames_10: + switchPublisherNames_11: + switchPublisherNames_12: + switchPublisherNames_13: + switchPublisherNames_14: + switchPublisherNames_15: + switchIcons_0: {fileID: 0} + switchIcons_1: {fileID: 0} + switchIcons_2: {fileID: 0} + switchIcons_3: {fileID: 0} + switchIcons_4: {fileID: 0} + switchIcons_5: {fileID: 0} + switchIcons_6: {fileID: 0} + switchIcons_7: {fileID: 0} + switchIcons_8: {fileID: 0} + switchIcons_9: {fileID: 0} + switchIcons_10: {fileID: 0} + switchIcons_11: {fileID: 0} + switchIcons_12: {fileID: 0} + switchIcons_13: {fileID: 0} + switchIcons_14: {fileID: 0} + switchIcons_15: {fileID: 0} + switchSmallIcons_0: {fileID: 0} + switchSmallIcons_1: {fileID: 0} + switchSmallIcons_2: {fileID: 0} + switchSmallIcons_3: {fileID: 0} + switchSmallIcons_4: {fileID: 0} + switchSmallIcons_5: {fileID: 0} + switchSmallIcons_6: {fileID: 0} + switchSmallIcons_7: {fileID: 0} + switchSmallIcons_8: {fileID: 0} + switchSmallIcons_9: {fileID: 0} + switchSmallIcons_10: {fileID: 0} + switchSmallIcons_11: {fileID: 0} + switchSmallIcons_12: {fileID: 0} + switchSmallIcons_13: {fileID: 0} + switchSmallIcons_14: {fileID: 0} + switchSmallIcons_15: {fileID: 0} + switchManualHTML: + switchAccessibleURLs: + switchLegalInformation: + switchMainThreadStackSize: 1048576 + switchPresenceGroupId: + switchLogoHandling: 0 + switchReleaseVersion: 0 + switchDisplayVersion: 1.0.0 + switchStartupUserAccount: 0 + switchSupportedLanguagesMask: 0 + switchLogoType: 0 + switchApplicationErrorCodeCategory: + switchUserAccountSaveDataSize: 0 + switchUserAccountSaveDataJournalSize: 0 + switchApplicationAttribute: 0 + switchCardSpecSize: -1 + switchCardSpecClock: -1 + switchRatingsMask: 0 + switchRatingsInt_0: 0 + switchRatingsInt_1: 0 + switchRatingsInt_2: 0 + switchRatingsInt_3: 0 + switchRatingsInt_4: 0 + switchRatingsInt_5: 0 + switchRatingsInt_6: 0 + switchRatingsInt_7: 0 + switchRatingsInt_8: 0 + switchRatingsInt_9: 0 + switchRatingsInt_10: 0 + switchRatingsInt_11: 0 + switchRatingsInt_12: 0 + switchLocalCommunicationIds_0: + switchLocalCommunicationIds_1: + switchLocalCommunicationIds_2: + switchLocalCommunicationIds_3: + switchLocalCommunicationIds_4: + switchLocalCommunicationIds_5: + switchLocalCommunicationIds_6: + switchLocalCommunicationIds_7: + switchParentalControl: 0 + switchAllowsScreenshot: 1 + switchAllowsVideoCapturing: 1 + switchAllowsRuntimeAddOnContentInstall: 0 + switchDataLossConfirmation: 0 + switchUserAccountLockEnabled: 0 + switchSystemResourceMemory: 16777216 + switchSupportedNpadStyles: 22 + switchNativeFsCacheSize: 32 + switchIsHoldTypeHorizontal: 0 + switchSupportedNpadCount: 8 + switchEnableTouchScreen: 1 + switchSocketConfigEnabled: 0 + switchTcpInitialSendBufferSize: 32 + switchTcpInitialReceiveBufferSize: 64 + switchTcpAutoSendBufferSizeMax: 256 + switchTcpAutoReceiveBufferSizeMax: 256 + switchUdpSendBufferSize: 9 + switchUdpReceiveBufferSize: 42 + switchSocketBufferEfficiency: 4 + switchSocketInitializeEnabled: 1 + switchNetworkInterfaceManagerInitializeEnabled: 1 + switchDisableHTCSPlayerConnection: 0 + switchUseNewStyleFilepaths: 0 + switchUseLegacyFmodPriorities: 0 + switchUseMicroSleepForYield: 1 + switchEnableRamDiskSupport: 0 + switchMicroSleepForYieldTime: 25 + switchRamDiskSpaceSize: 12 + switchUpgradedPlayerSettingsToNMETA: 0 + ps4NPAgeRating: 12 + ps4NPTitleSecret: + ps4NPTrophyPackPath: + ps4ParentalLevel: 11 + ps4ContentID: ED1633-NPXX51362_00-0000000000000000 + ps4Category: 0 + ps4MasterVersion: 01.00 + ps4AppVersion: 01.00 + ps4AppType: 0 + ps4ParamSfxPath: + ps4VideoOutPixelFormat: 0 + ps4VideoOutInitialWidth: 1920 + ps4VideoOutBaseModeInitialWidth: 1920 + ps4VideoOutReprojectionRate: 60 + ps4PronunciationXMLPath: + ps4PronunciationSIGPath: + ps4BackgroundImagePath: + ps4StartupImagePath: + ps4StartupImagesFolder: + ps4IconImagesFolder: + ps4SaveDataImagePath: + ps4SdkOverride: + ps4BGMPath: + ps4ShareFilePath: + ps4ShareOverlayImagePath: + ps4PrivacyGuardImagePath: + ps4ExtraSceSysFile: + ps4NPtitleDatPath: + ps4RemotePlayKeyAssignment: -1 + ps4RemotePlayKeyMappingDir: + ps4PlayTogetherPlayerCount: 0 + ps4EnterButtonAssignment: 2 + ps4ApplicationParam1: 0 + ps4ApplicationParam2: 0 + ps4ApplicationParam3: 0 + ps4ApplicationParam4: 0 + ps4DownloadDataSize: 0 + ps4GarlicHeapSize: 2048 + ps4ProGarlicHeapSize: 2560 + playerPrefsMaxSize: 32768 + ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ + ps4pnSessions: 1 + ps4pnPresence: 1 + ps4pnFriends: 1 + ps4pnGameCustomData: 1 + playerPrefsSupport: 0 + enableApplicationExit: 0 + resetTempFolder: 1 + restrictedAudioUsageRights: 0 + ps4UseResolutionFallback: 0 + ps4ReprojectionSupport: 0 + ps4UseAudio3dBackend: 0 + ps4UseLowGarlicFragmentationMode: 1 + ps4SocialScreenEnabled: 0 + ps4ScriptOptimizationLevel: 2 + ps4Audio3dVirtualSpeakerCount: 14 + ps4attribCpuUsage: 0 + ps4PatchPkgPath: + ps4PatchLatestPkgPath: + ps4PatchChangeinfoPath: + ps4PatchDayOne: 0 + ps4attribUserManagement: 0 + ps4attribMoveSupport: 0 + ps4attrib3DSupport: 0 + ps4attribShareSupport: 0 + ps4attribExclusiveVR: 0 + ps4disableAutoHideSplash: 0 + ps4videoRecordingFeaturesUsed: 0 + ps4contentSearchFeaturesUsed: 0 + ps4CompatibilityPS5: 0 + ps4AllowPS5Detection: 0 + ps4GPU800MHz: 1 + ps4attribEyeToEyeDistanceSettingVR: 0 + ps4IncludedModules: [] + ps4attribVROutputEnabled: 0 + monoEnv: + splashScreenBackgroundSourceLandscape: {fileID: 0} + splashScreenBackgroundSourcePortrait: {fileID: 0} + blurSplashScreenBackground: 1 + spritePackerPolicy: + webGLMemorySize: 32 + webGLExceptionSupport: 1 + webGLNameFilesAsHashes: 0 + webGLShowDiagnostics: 0 + webGLDataCaching: 1 + webGLDebugSymbols: 0 + webGLEmscriptenArgs: + webGLModulesDirectory: + webGLTemplate: APPLICATION:Default + webGLAnalyzeBuildSize: 0 + webGLUseEmbeddedResources: 0 + webGLCompressionFormat: 0 + webGLWasmArithmeticExceptions: 0 + webGLLinkerTarget: 1 + webGLThreadsSupport: 0 + webGLDecompressionFallback: 0 + webGLInitialMemorySize: 32 + webGLMaximumMemorySize: 2048 + webGLMemoryGrowthMode: 2 + webGLMemoryLinearGrowthStep: 16 + webGLMemoryGeometricGrowthStep: 0.2 + webGLMemoryGeometricGrowthCap: 96 + webGLPowerPreference: 2 + webGLWebAssemblyTable: 0 + webGLWebAssemblyBigInt: 0 + webGLCloseOnQuit: 0 + webWasm2023: 0 + webEnableSubmoduleStrippingCompatibility: 0 + scriptingDefineSymbols: {} + additionalCompilerArguments: {} + platformArchitecture: {} + scriptingBackend: + Android: 1 + il2cppCompilerConfiguration: {} + il2cppCodeGeneration: {} + il2cppStacktraceInformation: {} + managedStrippingLevel: {} + incrementalIl2cppBuild: {} + suppressCommonWarnings: 1 + allowUnsafeCode: 0 + useDeterministicCompilation: 1 + additionalIl2CppArgs: + scriptingRuntimeVersion: 1 + gcIncremental: 1 + gcWBarrierValidation: 0 + apiCompatibilityLevelPerPlatform: {} + editorAssembliesCompatibilityLevel: 1 + m_RenderingPath: 1 + m_MobileRenderingPath: 1 + metroPackageName: ProjectFenrir + metroPackageVersion: + metroCertificatePath: + metroCertificatePassword: + metroCertificateSubject: + metroCertificateIssuer: + metroCertificateNotAfter: 0000000000000000 + metroApplicationDescription: ProjectFenrir + wsaImages: {} + metroTileShortName: + metroTileShowName: 0 + metroMediumTileShowName: 0 + metroLargeTileShowName: 0 + metroWideTileShowName: 0 + metroSupportStreamingInstall: 0 + metroLastRequiredScene: 0 + metroDefaultTileSize: 1 + metroTileForegroundText: 2 + metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0} + metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1} + metroSplashScreenUseBackgroundColor: 0 + syncCapabilities: 0 + platformCapabilities: {} + metroTargetDeviceFamilies: {} + metroFTAName: + metroFTAFileTypes: [] + metroProtocolName: + vcxProjDefaultLanguage: + XboxOneProductId: + XboxOneUpdateKey: + XboxOneSandboxId: + XboxOneContentId: + XboxOneTitleId: + XboxOneSCId: + XboxOneGameOsOverridePath: + XboxOnePackagingOverridePath: + XboxOneAppManifestOverridePath: + XboxOneVersion: 1.0.0.0 + XboxOnePackageEncryption: 0 + XboxOnePackageUpdateGranularity: 2 + XboxOneDescription: + XboxOneLanguage: + - enus + XboxOneCapability: [] + XboxOneGameRating: {} + XboxOneIsContentPackage: 0 + XboxOneEnhancedXboxCompatibilityMode: 0 + XboxOneEnableGPUVariability: 1 + XboxOneSockets: {} + XboxOneSplashScreen: {fileID: 0} + XboxOneAllowedProductIds: [] + XboxOnePersistentLocalStorageSize: 0 + XboxOneXTitleMemory: 8 + XboxOneOverrideIdentityName: + XboxOneOverrideIdentityPublisher: + vrEditorSettings: {} + cloudServicesEnabled: {} + luminIcon: + m_Name: + m_ModelFolderPath: + m_PortalFolderPath: + luminCert: + m_CertPath: + m_SignPackage: 1 + luminIsChannelApp: 0 + luminVersion: + m_VersionCode: 1 + m_VersionName: + hmiPlayerDataPath: + hmiForceSRGBBlit: 1 + embeddedLinuxEnableGamepadInput: 0 + hmiCpuConfiguration: + hmiLogStartupTiming: 0 + qnxGraphicConfPath: + apiCompatibilityLevel: 6 + captureStartupLogs: {} + activeInputHandler: 1 + windowsGamepadBackendHint: 0 + enableDirectStorage: 0 + cloudProjectId: + framebufferDepthMemorylessMode: 0 + qualitySettingsNames: [] + projectName: + organizationId: + cloudEnabled: 0 + legacyClampBlendShapeWeights: 0 + hmiLoadingImage: {fileID: 0} + platformRequiresReadableAssets: 0 + virtualTexturingSupportEnabled: 0 + insecureHttpOption: 0 + androidVulkanDenyFilterList: [] + androidVulkanAllowFilterList: [] + androidVulkanDeviceFilterListAsset: {fileID: 0} + d3d12DeviceFilterListAsset: {fileID: 0} + allowedHttpConnections: 3 diff --git a/src/ProjectFenrir/ProjectSettings/ProjectVersion.txt b/src/ProjectFenrir/ProjectSettings/ProjectVersion.txt new file mode 100644 index 0000000..74f4bbf --- /dev/null +++ b/src/ProjectFenrir/ProjectSettings/ProjectVersion.txt @@ -0,0 +1,2 @@ +m_EditorVersion: 6000.4.9f1 +m_EditorVersionWithRevision: 6000.4.9f1 (f7258d6eebbe) diff --git a/src/ProjectFenrir/ProjectSettings/QualitySettings.asset b/src/ProjectFenrir/ProjectSettings/QualitySettings.asset new file mode 100644 index 0000000..f55198a --- /dev/null +++ b/src/ProjectFenrir/ProjectSettings/QualitySettings.asset @@ -0,0 +1,134 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!47 &1 +QualitySettings: + m_ObjectHideFlags: 0 + serializedVersion: 5 + m_CurrentQuality: 1 + m_QualitySettings: + - serializedVersion: 4 + name: Mobile + pixelLightCount: 2 + shadows: 2 + shadowResolution: 1 + shadowProjection: 1 + shadowCascades: 2 + shadowDistance: 40 + shadowNearPlaneOffset: 3 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} + shadowmaskMode: 0 + skinWeights: 2 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] + anisotropicTextures: 1 + antiAliasing: 0 + softParticles: 0 + softVegetation: 1 + realtimeReflectionProbes: 0 + billboardsFaceCameraPosition: 1 + useLegacyDetailDistribution: 1 + adaptiveVsync: 0 + vSyncCount: 0 + realtimeGICPUUsage: 100 + adaptiveVsyncExtraA: 0 + adaptiveVsyncExtraB: 0 + lodBias: 1 + maximumLODLevel: 0 + enableLODCrossFade: 1 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 + particleRaycastBudget: 256 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 + resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 11400000, guid: 5e6cbd92db86f4b18aec3ed561671858, + type: 2} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 + excludedTargetPlatforms: + - Standalone + - serializedVersion: 4 + name: PC + pixelLightCount: 2 + shadows: 2 + shadowResolution: 1 + shadowProjection: 1 + shadowCascades: 2 + shadowDistance: 40 + shadowNearPlaneOffset: 3 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} + shadowmaskMode: 1 + skinWeights: 4 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] + anisotropicTextures: 2 + antiAliasing: 0 + softParticles: 0 + softVegetation: 1 + realtimeReflectionProbes: 0 + billboardsFaceCameraPosition: 1 + useLegacyDetailDistribution: 1 + adaptiveVsync: 0 + vSyncCount: 0 + realtimeGICPUUsage: 100 + adaptiveVsyncExtraA: 0 + adaptiveVsyncExtraB: 0 + lodBias: 2 + maximumLODLevel: 0 + enableLODCrossFade: 1 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 + particleRaycastBudget: 256 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 + resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 11400000, guid: 4b83569d67af61e458304325a23e5dfd, + type: 2} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 + excludedTargetPlatforms: + - Android + - iPhone + m_TextureMipmapLimitGroupNames: [] + m_PerPlatformDefaultQuality: + Android: 0 + GameCoreScarlett: 1 + GameCoreXboxOne: 1 + Lumin: 0 + Nintendo Switch: 1 + PS4: 1 + PS5: 1 + Server: 0 + Stadia: 0 + Standalone: 1 + WebGL: 0 + Windows Store Apps: 0 + XboxOne: 0 + iPhone: 0 + tvOS: 0 diff --git a/src/ProjectFenrir/ProjectSettings/SceneTemplateSettings.json b/src/ProjectFenrir/ProjectSettings/SceneTemplateSettings.json new file mode 100644 index 0000000..ede5887 --- /dev/null +++ b/src/ProjectFenrir/ProjectSettings/SceneTemplateSettings.json @@ -0,0 +1,121 @@ +{ + "templatePinStates": [], + "dependencyTypeInfos": [ + { + "userAdded": false, + "type": "UnityEngine.AnimationClip", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.Animations.AnimatorController", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.AnimatorOverrideController", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.Audio.AudioMixerController", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.ComputeShader", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.Cubemap", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.GameObject", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.LightingDataAsset", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.LightingSettings", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Material", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.MonoScript", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicsMaterial", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicsMaterial2D", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessProfile", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessResources", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.VolumeProfile", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.SceneAsset", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.Shader", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.ShaderVariantCollection", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.Texture", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Texture2D", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Timeline.TimelineAsset", + "defaultInstantiationMode": 0 + } + ], + "defaultDependencyTypeInfo": { + "userAdded": false, + "type": "", + "defaultInstantiationMode": 1 + }, + "newSceneOverride": 0 +} \ No newline at end of file diff --git a/src/ProjectFenrir/ProjectSettings/ShaderGraphSettings.asset b/src/ProjectFenrir/ProjectSettings/ShaderGraphSettings.asset new file mode 100644 index 0000000..ce8c243 --- /dev/null +++ b/src/ProjectFenrir/ProjectSettings/ShaderGraphSettings.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: de02f9e1d18f588468e474319d09a723, type: 3} + m_Name: + m_EditorClassIdentifier: + shaderVariantLimit: 128 + overrideShaderVariantLimit: 0 + customInterpolatorErrorThreshold: 32 + customInterpolatorWarningThreshold: 16 + customHeatmapValues: {fileID: 0} diff --git a/src/ProjectFenrir/ProjectSettings/TagManager.asset b/src/ProjectFenrir/ProjectSettings/TagManager.asset new file mode 100644 index 0000000..6413d11 --- /dev/null +++ b/src/ProjectFenrir/ProjectSettings/TagManager.asset @@ -0,0 +1,76 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!78 &1 +TagManager: + serializedVersion: 2 + tags: [] + layers: + - Default + - TransparentFX + - Ignore Raycast + - + - Water + - UI + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + m_SortingLayers: + - name: Default + uniqueID: 0 + locked: 0 + m_RenderingLayers: + - Default + - Light Layer 1 + - Light Layer 2 + - Light Layer 3 + - Light Layer 4 + - Light Layer 5 + - Light Layer 6 + - Light Layer 7 + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - diff --git a/src/ProjectFenrir/ProjectSettings/TimeManager.asset b/src/ProjectFenrir/ProjectSettings/TimeManager.asset new file mode 100644 index 0000000..558a017 --- /dev/null +++ b/src/ProjectFenrir/ProjectSettings/TimeManager.asset @@ -0,0 +1,9 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!5 &1 +TimeManager: + m_ObjectHideFlags: 0 + Fixed Timestep: 0.02 + Maximum Allowed Timestep: 0.33333334 + m_TimeScale: 1 + Maximum Particle Timestep: 0.03 diff --git a/src/ProjectFenrir/ProjectSettings/URPProjectSettings.asset b/src/ProjectFenrir/ProjectSettings/URPProjectSettings.asset new file mode 100644 index 0000000..6ad5631 --- /dev/null +++ b/src/ProjectFenrir/ProjectSettings/URPProjectSettings.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3} + m_Name: + m_EditorClassIdentifier: + m_LastMaterialVersion: 10 + m_ProjectSettingFolderPath: URPDefaultResources diff --git a/src/ProjectFenrir/ProjectSettings/UnityConnectSettings.asset b/src/ProjectFenrir/ProjectSettings/UnityConnectSettings.asset new file mode 100644 index 0000000..029ad8b --- /dev/null +++ b/src/ProjectFenrir/ProjectSettings/UnityConnectSettings.asset @@ -0,0 +1,40 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!310 &1 +UnityConnectSettings: + m_ObjectHideFlags: 0 + serializedVersion: 1 + m_Enabled: 0 + m_TestMode: 0 + m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events + m_EventUrl: https://cdp.cloud.unity3d.com/v1/events + m_ConfigUrl: https://config.uca.cloud.unity3d.com + m_DashboardUrl: https://dashboard.unity3d.com + m_TestInitMode: 0 + InsightsSettings: + m_EngineDiagnosticsEnabled: 1 + m_Enabled: 0 + CrashReportingSettings: + serializedVersion: 2 + m_EventUrl: https://perf-events.cloud.unity3d.com + m_EnableCloudDiagnosticsReporting: 0 + m_LogBufferSize: 10 + m_CaptureEditorExceptions: 1 + UnityPurchasingSettings: + m_Enabled: 0 + m_TestMode: 0 + UnityAnalyticsSettings: + m_Enabled: 0 + m_TestMode: 0 + m_InitializeOnStartup: 1 + m_PackageRequiringCoreStatsPresent: 0 + UnityAdsSettings: + m_Enabled: 0 + m_InitializeOnStartup: 1 + m_TestMode: 0 + m_IosGameId: + m_AndroidGameId: + m_GameIds: {} + m_GameId: + PerformanceReportingSettings: + m_Enabled: 0 diff --git a/src/ProjectFenrir/ProjectSettings/VFXManager.asset b/src/ProjectFenrir/ProjectSettings/VFXManager.asset new file mode 100644 index 0000000..3a95c98 --- /dev/null +++ b/src/ProjectFenrir/ProjectSettings/VFXManager.asset @@ -0,0 +1,12 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!937362698 &1 +VFXManager: + m_ObjectHideFlags: 0 + m_IndirectShader: {fileID: 0} + m_CopyBufferShader: {fileID: 0} + m_SortShader: {fileID: 0} + m_StripUpdateShader: {fileID: 0} + m_RenderPipeSettingsPath: + m_FixedTimeStep: 0.016666668 + m_MaxDeltaTime: 0.05 diff --git a/src/ProjectFenrir/ProjectSettings/VersionControlSettings.asset b/src/ProjectFenrir/ProjectSettings/VersionControlSettings.asset new file mode 100644 index 0000000..dca2881 --- /dev/null +++ b/src/ProjectFenrir/ProjectSettings/VersionControlSettings.asset @@ -0,0 +1,8 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!890905787 &1 +VersionControlSettings: + m_ObjectHideFlags: 0 + m_Mode: Visible Meta Files + m_CollabEditorSettings: + inProgressEnabled: 1 diff --git a/src/ProjectFenrir/ProjectSettings/XRSettings.asset b/src/ProjectFenrir/ProjectSettings/XRSettings.asset new file mode 100644 index 0000000..482590c --- /dev/null +++ b/src/ProjectFenrir/ProjectSettings/XRSettings.asset @@ -0,0 +1,10 @@ +{ + "m_SettingKeys": [ + "VR Device Disabled", + "VR Device User Alert" + ], + "m_SettingValues": [ + "False", + "False" + ] +} \ No newline at end of file diff --git a/src/ProjectFenrir/Tests/EditMode/ElementDistributionTests.cs b/src/ProjectFenrir/Tests/EditMode/ElementDistributionTests.cs new file mode 100644 index 0000000..1f22a15 --- /dev/null +++ b/src/ProjectFenrir/Tests/EditMode/ElementDistributionTests.cs @@ -0,0 +1,68 @@ +using System; +using System.Collections.Generic; +using NUnit.Framework; +using Fenrir.Awakening; +using Fenrir.Config; + +namespace Fenrir.Tests.EditMode +{ + public class ElementDistributionTests + { + [Test] + public void SameSeed_AlwaysProducesSameElement() + { + Guid seed = Guid.NewGuid(); + Element first = ElementDistribution.Derive(seed); + Element second = ElementDistribution.Derive(seed); + Assert.AreEqual(first, second); + } + + [Test] + public void DifferentSeeds_ProduceDiverseElements() + { + var seen = new HashSet(); + for (int i = 0; i < 1000; i++) + seen.Add(ElementDistribution.Derive(Guid.NewGuid())); + + // In MVP, only Common elements (Fire/Water/Earth/Air) are active. + // We should see all four given enough samples. + Assert.GreaterOrEqual(seen.Count, 4, + "At least 4 distinct elements expected from 1000 seeds."); + } + + [Test] + public void CommonBand_ContainsAllFourElements() + { + // Force seeds into the Common band by constructing GUIDs + // whose first 8 bytes yield a value below 0.930 * long.MaxValue. + // Simpler: just use enough random seeds — statistically certain at N=5000. + var seen = new HashSet(); + for (int i = 0; i < 5000; i++) + seen.Add(ElementDistribution.Derive(Guid.NewGuid())); + + Assert.IsTrue(seen.Contains(Element.Fire), "Fire missing from distribution"); + Assert.IsTrue(seen.Contains(Element.Water), "Water missing from distribution"); + Assert.IsTrue(seen.Contains(Element.Earth), "Earth missing from distribution"); + Assert.IsTrue(seen.Contains(Element.Air), "Air missing from distribution"); + } + + [Test] + public void GuidEmpty_DoesNotThrow() + { + Assert.DoesNotThrow(() => ElementDistribution.Derive(Guid.Empty)); + } + + [Test] + public void Result_IsDefinedElement() + { + for (int i = 0; i < 100; i++) + { + Element result = ElementDistribution.Derive(Guid.NewGuid()); + Assert.IsTrue(Enum.IsDefined(typeof(Element), result), + $"Got undefined Element value: {result}"); + Assert.AreNotEqual(Element.None, result, + "Distribution must never return Element.None"); + } + } + } +} diff --git a/src/ProjectFenrir/Tests/EditMode/EvolutionCheckerTests.cs b/src/ProjectFenrir/Tests/EditMode/EvolutionCheckerTests.cs new file mode 100644 index 0000000..611b543 --- /dev/null +++ b/src/ProjectFenrir/Tests/EditMode/EvolutionCheckerTests.cs @@ -0,0 +1,104 @@ +using NUnit.Framework; +using Fenrir.Config; +using Fenrir.Evolution; +using Fenrir.Traits; + +namespace Fenrir.Tests.EditMode +{ + public class EvolutionCheckerTests + { + private EvolutionChecker _checker; + + [SetUp] + public void SetUp() + { + // Minimal config with just the Fire → Inferno signature + var config = new EvolutionSignaturesConfig(); + config.Signatures["inferno"] = new EvolutionSignature + { + Element = "Fire", + Thresholds = new System.Collections.Generic.Dictionary + { + ["Aggression"] = new TraitThreshold { Min = 70f }, + ["Dominance"] = new TraitThreshold { Min = 65f }, + ["Mercy"] = new TraitThreshold { Max = 35f }, + ["Recklessness"] = new TraitThreshold { Min = 55f } + } + }; + + _checker = new EvolutionChecker(config); + } + + [Test] + public void EligibleProfile_ReturnsInfernoCandidate() + { + TraitProfile profile = BuildInfernoProfile(); + EvolutionCandidate[] candidates = _checker.Check(profile, Element.Fire); + + Assert.AreEqual(1, candidates.Length); + Assert.AreEqual("inferno", candidates[0].EvolutionId); + } + + [Test] + public void ProfileBelowAggression_ReturnsNoCandidates() + { + TraitProfile profile = BuildInfernoProfile(); + profile.Set(TraitKey.Aggression, 60f); // below required 70 + EvolutionCandidate[] candidates = _checker.Check(profile, Element.Fire); + + Assert.AreEqual(0, candidates.Length); + } + + [Test] + public void ProfileAboveMercyCap_ReturnsNoCandidates() + { + TraitProfile profile = BuildInfernoProfile(); + profile.Set(TraitKey.Mercy, 50f); // above max 35 + EvolutionCandidate[] candidates = _checker.Check(profile, Element.Fire); + + Assert.AreEqual(0, candidates.Length); + } + + [Test] + public void WrongElement_ReturnsNoCandidates() + { + TraitProfile profile = BuildInfernoProfile(); + EvolutionCandidate[] candidates = _checker.Check(profile, Element.Water); + + Assert.AreEqual(0, candidates.Length); + } + + [Test] + public void ExactThresholdValues_AreEligible() + { + TraitProfile profile = TraitProfile.Neutral(); + profile.Set(TraitKey.Aggression, 70f); // exactly at Min + profile.Set(TraitKey.Dominance, 65f); + profile.Set(TraitKey.Mercy, 35f); // exactly at Max + profile.Set(TraitKey.Recklessness, 55f); + + EvolutionCandidate[] candidates = _checker.Check(profile, Element.Fire); + Assert.AreEqual(1, candidates.Length); + } + + [Test] + public void FitScore_IsPositiveForEligibleProfile() + { + TraitProfile profile = BuildInfernoProfile(); + EvolutionCandidate[] candidates = _checker.Check(profile, Element.Fire); + Assert.Greater(candidates[0].FitScore, 0f); + } + + // ── Helpers ────────────────────────────────────────────────────────── + + private static TraitProfile BuildInfernoProfile() + { + TraitProfile profile = TraitProfile.Neutral(); + profile.Set(TraitKey.Aggression, 80f); + profile.Set(TraitKey.Dominance, 75f); + profile.Set(TraitKey.Mercy, 20f); + profile.Set(TraitKey.Recklessness, 70f); + return profile; + } + } +} diff --git a/src/ProjectFenrir/Tests/EditMode/Fenrir.Tests.EditMode.asmdef b/src/ProjectFenrir/Tests/EditMode/Fenrir.Tests.EditMode.asmdef new file mode 100644 index 0000000..dc2aa99 --- /dev/null +++ b/src/ProjectFenrir/Tests/EditMode/Fenrir.Tests.EditMode.asmdef @@ -0,0 +1,24 @@ +{ + "name": "Fenrir.Tests.EditMode", + "rootNamespace": "Fenrir.Tests.EditMode", + "references": [ + "Fenrir.Runtime", + "UnityEngine.TestRunner", + "UnityEditor.TestRunner" + ], + "includePlatforms": [ + "Editor" + ], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": true, + "precompiledReferences": [ + "nunit.framework.dll" + ], + "autoReferenced": false, + "defineConstraints": [ + "UNITY_INCLUDE_TESTS" + ], + "versionDefines": [], + "noEngineReferences": false +} diff --git a/src/ProjectFenrir/Tests/EditMode/SaveManagerTests.cs b/src/ProjectFenrir/Tests/EditMode/SaveManagerTests.cs new file mode 100644 index 0000000..a6125d5 --- /dev/null +++ b/src/ProjectFenrir/Tests/EditMode/SaveManagerTests.cs @@ -0,0 +1,99 @@ +using System.IO; +using System.Threading.Tasks; +using NUnit.Framework; +using Fenrir.Config; +using Fenrir.Save; +using UnityEngine; + +namespace Fenrir.Tests.EditMode +{ + /// + /// Tests SaveManager round-trip: write → read → verify. + /// Uses a temp file so nothing touches the real save path. + /// + public class SaveManagerTests + { + private string _tempPath; + private SaveManager _manager; + + [SetUp] + public void SetUp() + { + _tempPath = Path.Combine(Path.GetTempPath(), $"fenrir_test_{System.Guid.NewGuid()}.json"); + _manager = new SaveManager(overridePath: _tempPath); + } + + [TearDown] + public void TearDown() + { + if (File.Exists(_tempPath)) File.Delete(_tempPath); + } + + [Test] + public async Task SaveAsync_CreatesFile() + { + _manager.MarkDirty(); + await _manager.SaveAsync(); + Assert.IsTrue(File.Exists(_tempPath), "Save file should exist after SaveAsync."); + } + + [Test] + public async Task LoadAsync_ReturnsFalse_WhenNoFile() + { + bool loaded = await _manager.LoadAsync(); + Assert.IsFalse(loaded, "LoadAsync should return false when no file exists."); + } + + [Test] + public async Task RoundTrip_PreservesCharacterName() + { + _manager.Current.Character.Name = "Fenrir"; + _manager.MarkDirty(); + await _manager.SaveAsync(); + + var freshManager = new SaveManager(overridePath: _tempPath); + bool loaded = await freshManager.LoadAsync(); + + Assert.IsTrue(loaded); + Assert.AreEqual("Fenrir", freshManager.Current.Character.Name); + } + + [Test] + public async Task RoundTrip_PreservesTraitValue() + { + _manager.Current.Character.Traits.Set(Traits.TraitKey.Aggression, 72f); + _manager.MarkDirty(); + await _manager.SaveAsync(); + + var freshManager = new SaveManager(overridePath: _tempPath); + await freshManager.LoadAsync(); + + Assert.AreEqual(72f, freshManager.Current.Character.Traits.Get(Traits.TraitKey.Aggression), 0.001f); + } + + [Test] + public async Task RoundTrip_PreservesHasAwakened() + { + _manager.Current.Character.HasAwakened = true; + _manager.MarkDirty(); + await _manager.SaveAsync(); + + var freshManager = new SaveManager(overridePath: _tempPath); + await freshManager.LoadAsync(); + + Assert.IsTrue(freshManager.Current.Character.HasAwakened); + } + + [Test] + public async Task SaveVersion_IsPreserved() + { + _manager.MarkDirty(); + await _manager.SaveAsync(); + + var freshManager = new SaveManager(overridePath: _tempPath); + await freshManager.LoadAsync(); + + Assert.AreEqual(SaveData.CurrentVersion, freshManager.Current.Version); + } + } +} diff --git a/src/ProjectFenrir/Tests/EditMode/TraitAccumulatorTests.cs b/src/ProjectFenrir/Tests/EditMode/TraitAccumulatorTests.cs new file mode 100644 index 0000000..4e87bcf --- /dev/null +++ b/src/ProjectFenrir/Tests/EditMode/TraitAccumulatorTests.cs @@ -0,0 +1,112 @@ +using NUnit.Framework; +using Fenrir.Config; +using Fenrir.Evolution; +using Fenrir.Traits; + +namespace Fenrir.Tests.EditMode +{ + public class TraitAccumulatorTests + { + private TraitProfile _profile; + private TraitWeightsConfig _weights; + private IEvolutionChecker _checker; + private TraitAccumulator _accumulator; + + [SetUp] + public void SetUp() + { + _profile = TraitProfile.Neutral(); + _weights = new TraitWeightsConfig(); + _checker = new StubEvolutionChecker(); + _accumulator = new TraitAccumulator(_profile, _weights, _checker); + } + + [Test] + public void DodgeUsedEvent_IncreasesPatience() + { + float before = _profile.Get(TraitKey.Patience); + _accumulator.Process(new DodgeUsedEvent()); + Assert.Greater(_profile.Get(TraitKey.Patience), before); + } + + [Test] + public void DodgeUsedEvent_DecreasesAggression() + { + float before = _profile.Get(TraitKey.Aggression); + _accumulator.Process(new DodgeUsedEvent()); + Assert.Less(_profile.Get(TraitKey.Aggression), before); + } + + [Test] + public void TraitValues_NeverExceedMax() + { + for (int i = 0; i < 100; i++) + _accumulator.Process(new CounterLandedEvent()); + + Assert.LessOrEqual(_profile.Get(TraitKey.Dominance), GameConfig.TraitMax); + } + + [Test] + public void TraitValues_NeverGoBelowMin() + { + for (int i = 0; i < 100; i++) + _accumulator.Process(new DialoguePunishmentEvent()); + + Assert.GreaterOrEqual(_profile.Get(TraitKey.Mercy), GameConfig.TraitMin); + } + + [Test] + public void FrequencyDampening_ReducesDeltaAfterThreshold() + { + // First N events should accumulate normally + for (int i = 0; i < GameConfig.FrequencyDampenAfter; i++) + _accumulator.Process(new DodgeUsedEvent()); + + float afterNormal = _profile.Get(TraitKey.Patience); + float normalDeltaPerEvent = (afterNormal - GameConfig.TraitNeutral) / GameConfig.FrequencyDampenAfter; + + // Next event should be dampened (contribute less than the average delta) + _accumulator.Process(new DodgeUsedEvent()); + float afterDampened = _profile.Get(TraitKey.Patience); + float dampenedDelta = afterDampened - afterNormal; + + Assert.Less(dampenedDelta, normalDeltaPerEvent, + "Dampened event should contribute less than the un-dampened average."); + } + + [Test] + public void UnknownEventKey_DoesNotThrow() + { + Assert.DoesNotThrow(() => _accumulator.Process(new UnmappedTestEvent())); + } + + [Test] + public void ApplyEvolutionCarryover_ShiftsTraitsTowardNeutral() + { + _profile.Set(TraitKey.Aggression, 90f); + _profile.ApplyEvolutionCarryover(); + float result = _profile.Get(TraitKey.Aggression); + Assert.Less(result, 90f, "Aggression should shift toward neutral after evolution."); + Assert.Greater(result, GameConfig.TraitNeutral, "Aggression should stay above neutral given high starting value."); + } + + [Test] + public void SessionEventCounts_ResetAfterEvolutionCarryover() + { + _accumulator.Process(new DodgeUsedEvent()); + Assert.Greater(_profile.GetSessionCount("DodgeUsedEvent"), 0); + _profile.ApplyEvolutionCarryover(); + Assert.AreEqual(0, _profile.GetSessionCount("DodgeUsedEvent")); + } + + // ── Helpers ────────────────────────────────────────────────────────── + + private class UnmappedTestEvent : BehaviorEvent { } + + private class StubEvolutionChecker : IEvolutionChecker + { + public EvolutionCandidate[] Check(TraitProfile profile, Element element) + => System.Array.Empty(); + } + } +} diff --git a/src/ProjectFenrir/Tests/EditMode/TraitProfileTests.cs b/src/ProjectFenrir/Tests/EditMode/TraitProfileTests.cs new file mode 100644 index 0000000..0122cf1 --- /dev/null +++ b/src/ProjectFenrir/Tests/EditMode/TraitProfileTests.cs @@ -0,0 +1,81 @@ +using NUnit.Framework; +using Fenrir.Config; +using Fenrir.Traits; + +namespace Fenrir.Tests.EditMode +{ + public class TraitProfileTests + { + [Test] + public void Neutral_SetsAllTraitsToFifty() + { + TraitProfile profile = TraitProfile.Neutral(); + foreach (TraitKey key in System.Enum.GetValues(typeof(TraitKey))) + Assert.AreEqual(GameConfig.TraitNeutral, profile.Get(key), 0.001f, + $"Expected neutral value for {key}"); + } + + [Test] + public void Set_ClampsAboveMax() + { + TraitProfile profile = TraitProfile.Neutral(); + profile.Set(TraitKey.Aggression, 200f); + Assert.AreEqual(GameConfig.TraitMax, profile.Get(TraitKey.Aggression), 0.001f); + } + + [Test] + public void Set_ClampsBelowMin() + { + TraitProfile profile = TraitProfile.Neutral(); + profile.Set(TraitKey.Mercy, -50f); + Assert.AreEqual(GameConfig.TraitMin, profile.Get(TraitKey.Mercy), 0.001f); + } + + [Test] + public void Apply_AccumulatesDelta() + { + TraitProfile profile = TraitProfile.Neutral(); + profile.Apply(TraitKey.Curiosity, 10f); + Assert.AreEqual(60f, profile.Get(TraitKey.Curiosity), 0.001f); + } + + [Test] + public void Get_ReturnsNeutralForUnsetKey() + { + TraitProfile profile = new TraitProfile(); + Assert.AreEqual(GameConfig.TraitNeutral, profile.Get(TraitKey.Wisdom), 0.001f, + "Missing key should return neutral, not 0"); + } + + [Test] + public void ApplyEvolutionCarryover_ShiftsAllTraits() + { + TraitProfile profile = TraitProfile.Neutral(); + profile.Set(TraitKey.Aggression, 100f); + profile.Set(TraitKey.Patience, 0f); + profile.ApplyEvolutionCarryover(); + + Assert.Less(profile.Get(TraitKey.Aggression), 100f); + Assert.Greater(profile.Get(TraitKey.Patience), 0f); + } + + [Test] + public void SessionEventCounts_IncrementCorrectly() + { + TraitProfile profile = TraitProfile.Neutral(); + Assert.AreEqual(0, profile.GetSessionCount("testEvent")); + profile.IncrementSessionCount("testEvent"); + profile.IncrementSessionCount("testEvent"); + Assert.AreEqual(2, profile.GetSessionCount("testEvent")); + } + + [Test] + public void SessionEventCounts_ClearAfterCarryover() + { + TraitProfile profile = TraitProfile.Neutral(); + profile.IncrementSessionCount("someEvent"); + profile.ApplyEvolutionCarryover(); + Assert.AreEqual(0, profile.GetSessionCount("someEvent")); + } + } +} From efef1cfb1a16df6c3c4591ff3b4913e3cf7ade7a Mon Sep 17 00:00:00 2001 From: Seni Date: Tue, 2 Jun 2026 18:47:24 -0700 Subject: [PATCH 03/27] =?UTF-8?q?feat(phase1):=20first=20playable=20?= =?UTF-8?q?=E2=80=94=20player=20movement,=20camera,=20scene=20setup=20comp?= =?UTF-8?q?lete?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DEVELOPMENT_DIARY.md | 184 ++++++ .../_Project/Editor/Fenrir.Editor.asmdef | 4 +- .../_Project/Editor/FenrirPlayerSetup.cs | 94 +++ .../_Project/Editor/FenrirPlayerSetup.cs.meta | 2 + .../_Project/Editor/FenrirSceneFinalize.cs | 185 ++++++ .../Editor/FenrirSceneFinalize.cs.meta | 2 + .../_Project/Editor/FenrirSceneSetup.cs | 4 +- .../_Project/Editor/FenrirWireReferences.cs | 141 ++++ .../Editor/FenrirWireReferences.cs.meta | 2 + .../Assets/_Project/Scenes/EmberForest.unity | 601 +++++++++++++++++- .../_Project/Scripts/Audio/AudioManager.cs | 2 + .../_Project/Scripts/Audio/MusicLayer.cs | 1 + .../Assets/_Project/Scripts/Audio/SFXPool.cs | 10 + .../_Project/Scripts/Core/SceneValidator.cs | 66 ++ .../Scripts/Core/SceneValidator.cs.meta | 2 + .../Scripts/Input/GestureRecognizer.cs | 5 + .../_Project/Scripts/Input/InputHandler.cs | 48 +- .../_Project/Scripts/Input/TouchMapper.cs | 32 +- .../_Project/Scripts/World/WorldManager.cs | 1 + .../ProjectSettings/EditorBuildSettings.asset | 10 +- 20 files changed, 1338 insertions(+), 58 deletions(-) create mode 100644 DEVELOPMENT_DIARY.md create mode 100644 src/ProjectFenrir/Assets/_Project/Editor/FenrirPlayerSetup.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Editor/FenrirPlayerSetup.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Editor/FenrirSceneFinalize.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Editor/FenrirSceneFinalize.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Editor/FenrirWireReferences.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Editor/FenrirWireReferences.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Core/SceneValidator.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Core/SceneValidator.cs.meta diff --git a/DEVELOPMENT_DIARY.md b/DEVELOPMENT_DIARY.md new file mode 100644 index 0000000..9d45370 --- /dev/null +++ b/DEVELOPMENT_DIARY.md @@ -0,0 +1,184 @@ +# Project Fenrir — Development Diary + +A running log of what was built, why, and what's next. Written for quick re-orientation after any gap. + +--- + +## Session 1 — Game Definition & Design Layer + +**Date:** 2026-06-01 + +### What we did + +Defined the entire game from scratch. Started with a 5-phase roadmap and worked through every major design question before writing a single line of code. + +**Documents produced:** + +- `GDD.md` — full game design document covering concept, pillars, systems, MVP scope +- `LORE.md` — world history, the Fenrir Principle, locked canon decisions +- `HIDDEN_TRAIT_SYSTEM.md` — 10 traits, signal map, frequency dampening, death taxonomy +- `EVOLUTION_SYSTEM.md` — tier structure, 4 MVP evolutions, fit scoring, UX sequence +- `COMBAT_SYSTEM.md` — input scheme, energy, abilities, enemy archetypes, Emberlord boss +- `WORLD_DESIGN.md` — 6 Ember Forest zones, shrines, NPCs, day/night, trait signals +- `AWAKENING_SYSTEM.md` — character creation, Keychain seed architecture, reroll rules +- `ARCHITECTURE.md` — Unity technical spec, folder structure, module contracts +- `ROADMAP.md` — phased plan with checklists +- `CHANGELOG.md`, `CONTRIBUTING.md`, `README.md` + +**Key design decisions locked:** + +- 10 hidden traits (Aggression, Mercy, Curiosity, Sacrifice, Dominance, Loyalty, Wisdom, Exploration, Recklessness, Patience) — all start at 50, range 0–100, never shown to player +- Trait signals come from behavior (combat style, dialogue choices, exploration, purchases) — not from explicit choices +- Frequency dampening kicks in after 5 identical events per session — prevents grinding +- Evolution Tier 1 is permanent. First evolution locks forever. +- Seeds stored in iOS Keychain — survive app deletion, never sync to iCloud +- One reroll per character slot ever — even survives character deletion +- Delete + recreate = original seed element restored +- Supreme rarity = ~0.1% total (~1 in 1,000), equivalent to pulling R9 in EAFC +- 5 death types each emit different trait signals (Ambush = no shift) +- 20-minute real-time day/night cycle, 4 phases + +**Repo setup:** + +- Private GitHub repo created: `Sen1F/project-fenrir` +- Git commit hook enforcing conventional commits: `type(scope): subject` + +--- + +## Session 2 — Unity C# Scaffold (Phase 1 Foundation) + +**Date:** 2026-06-02 + +### What we built + +Wrote the entire Unity C# source tree from scratch — 56 files across 12 modules. No Unity project open yet, pure code. + +**Modules written:** + +| Module | Key files | +| --- | --- | +| Config | `Element.cs` (16 elements + tiers + opposites), `GameConfig.cs` (all constants), `TraitWeightsConfig.cs` (36 event→trait mappings) | +| Traits | `TraitKey.cs`, `TraitProfile.cs`, `BehaviorEvent.cs` (36 concrete events), `BehaviorEventBus.cs`, `ITraitAccumulator.cs`, `TraitAccumulator.cs` | +| Core | `Bootstrap.cs`, `ServiceLocator.cs`, `TaskExtensions.cs` | +| Evolution | `EvolutionCandidate.cs`, `EvolutionChecker.cs`, `EvolutionSequencer.cs`, `EvolutionSignatureConfig.cs`, `IEvolutionChecker.cs`, `ShrineController.cs` | +| Save | `SaveData.cs`, `ISaveManager.cs`, `SaveManager.cs`, `KeychainBridge.cs` | +| Awakening | `AwakeningSequencer.cs`, `ElementDistribution.cs`, `ElementSeedService.cs` | +| Entities/Player | `PlayerController.cs`, `PlayerHealth.cs`, `PlayerEnergy.cs`, `PlayerCombat.cs`, `PlayerTraitEmitter.cs` | +| Entities/Enemies | `EnemyBase.cs`, `EnemyAI.cs`, `EnemyHealth.cs`, `EnemyCombat.cs`, `EnemyTraitEmitter.cs` | +| Combat | `AttackData.cs`, `AttackResolver.cs`, `CombatSystem.cs`, `HitStateManager.cs` | +| Input | `InputHandler.cs`, `GestureRecognizer.cs`, `TouchMapper.cs` | +| World | `DayNightCycle.cs`, `DayPhase.cs`, `WorldManager.cs`, `RegionLoader.cs` | +| UI | `HUD.cs`, `EnergyBar.cs`, `JournalController.cs` | +| Audio | `AudioManager.cs` (expanded with day/night + combat music wiring) | +| StateMachine | `AppState.cs`, `GameState.cs`, `PlayerState.cs` | +| Analytics | `EventLogger.cs` | + +**Native iOS plugins** (already existed from earlier): + +- `KeychainPlugin.swift` — C-callable shims for Unity DllImport, Keychain read/write +- `iCloudPlugin.swift` — optional iCloud KV store for save sync (player opt-in only) + +**JSON configs** (all complete): + +- `TraitWeights.json` — 36 event→trait delta mappings +- `EvolutionSignatures.json` — 4 MVP evolution signatures with trait thresholds +- `EnemyDefinitions.json` — 5 enemies + Emberlord boss with phases + +**Unit tests written:** + +- `TraitAccumulatorTests.cs` — dampening, clamping, carryover +- `TraitProfileTests.cs` — neutral factory, clamp, session counts +- `EvolutionCheckerTests.cs` — eligibility, element gate, fit score +- `ElementDistributionTests.cs` — determinism, diversity, no Element.None +- `SaveManagerTests.cs` — round-trip, version, overridePath isolation + +**Bugs fixed during scaffold:** + +- `BehaviorEventBus` redesigned — original lambda-wrap approach made `Unsubscribe` impossible; replaced with wrapper map keyed by original handler identity +- `Bootstrap` was subscribing `BehaviorEventBus.Subscribe` (base type, never fires) — fixed to explicitly subscribe all 36 concrete event types +- `FindObjectOfType` deprecated in Unity 6 — replaced all with `FindAnyObjectByType` +- `[RequireComponent]` only takes 1 type per attribute — split multi-type decorators + +**CLAUDE.md written** — context file for Claude Code CLI so future terminal sessions have full project context without re-explaining. + +--- + +## Session 3 — Unity Project Setup + +**Date:** 2026-06-02 + +### What was set up + +Created the actual Unity project and wired everything up. + +**Steps:** + +1. Created Unity 6 LTS (6000.4.9f1) project via Unity Hub — Universal 3D template (URP) + - Location: `/Users/seni/Documents/Claude/Projects/Project Fenrir/src/ProjectFenrir` + - No Unity VCS — using existing Git repo +2. Updated engine target from Unity 2022 LTS → Unity 6 LTS across all docs and code +3. Added packages to `manifest.json`: + - `com.unity.cinemachine` 3.1.4 + - `com.unity.textmeshpro` 3.2.0 + - `com.unity.burst` 1.8.18 (pinned to fix internal Burst editor compilation errors) + - Input System, AI Navigation, Test Framework already included by template +4. Copied scripts, plugins, StreamingAssets, and Tests into Unity project +5. Wrote assembly definitions: + - `Fenrir.Runtime.asmdef` — all game scripts + - `Fenrir.Editor.asmdef` — editor-only scripts + - `Fenrir.Tests.EditMode.asmdef` — EditMode tests +6. Wrote `FenrirSceneSetup.cs` editor script — runs via **Fenrir → Setup Scenes** + - Creates Bootstrap, Awakening, EmberForest scenes + - Adds all GameObjects with correct components + - Adds all 3 scenes to Build Settings +7. Fixed compile errors: + - `SaveData` lists changed from `string[]` to `List` (needed `.Add()` / `.Contains()`) + - Missing `using Fenrir.Config` in Bootstrap + - `[RequireComponent]` multi-type syntax fixed in PlayerCombat +8. **Fenrir → Setup Scenes** run successfully — all 3 scenes created, 0 errors + +**Current scene hierarchy (EmberForest):** + +```text +Player (PlayerController, PlayerHealth, PlayerEnergy, PlayerCombat, PlayerTraitEmitter, HitStateManager, CharacterController) +InputSystem (InputHandler, GestureRecognizer, TouchMapper) +WorldManager (WorldManager) +DayNightCycle (DayNightCycle) +CombatSystem (CombatSystem) +AudioManager (AudioManager, MusicLayer, SFXPool) +HUD (Canvas, HUD, EnergyBar, JournalController) +EventSystem +Directional Light +Main Camera +```text +--- + +## Current Status + +**Phase 1 — Foundation:** ~90% complete + +### Done ✅ + +- Full design layer (all docs, all decisions locked) +- Full C# scaffold (56 files, 12 modules) +- Unity project created, packages installed, scripts compiling clean +- 3 scenes created and added to Build Settings +- Unit test framework wired up + +### In Progress 🔄 + +- Inspector references need wiring (Fenrir → Wire Scene References) + +### Next Steps + +1. Run **Fenrir → Wire Scene References** — assigns all serialized field references in EmberForest +2. Add player mesh / capsule placeholder so character is visible +3. Configure Cinemachine FreeLook camera on Player +4. Bake NavMesh in EmberForest +5. First playtest — player should move with keyboard (WASD), combat with J/K/L keys +6. Switch to iOS build target, test on device +7. Phase 2: load configs from StreamingAssets at runtime (currently using C# defaults) + +--- + +*Updated: 2026-06-02* diff --git a/src/ProjectFenrir/Assets/_Project/Editor/Fenrir.Editor.asmdef b/src/ProjectFenrir/Assets/_Project/Editor/Fenrir.Editor.asmdef index 6139839..636ff88 100644 --- a/src/ProjectFenrir/Assets/_Project/Editor/Fenrir.Editor.asmdef +++ b/src/ProjectFenrir/Assets/_Project/Editor/Fenrir.Editor.asmdef @@ -2,7 +2,9 @@ "name": "Fenrir.Editor", "rootNamespace": "Fenrir.Editor", "references": [ - "Fenrir.Runtime" + "Fenrir.Runtime", + "Unity.Cinemachine", + "Unity.InputSystem" ], "includePlatforms": [ "Editor" diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirPlayerSetup.cs b/src/ProjectFenrir/Assets/_Project/Editor/FenrirPlayerSetup.cs new file mode 100644 index 0000000..7e5e3c1 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Editor/FenrirPlayerSetup.cs @@ -0,0 +1,94 @@ +#if UNITY_EDITOR +// Editor/FenrirPlayerSetup.cs +// Run via: Fenrir → Setup Player & Camera +// Adds a visible capsule mesh to the Player and a follow target for Cinemachine. +// Cinemachine camera is added manually via Component menu after this runs. + +using UnityEditor; +using UnityEditor.SceneManagement; +using UnityEngine; + +namespace Fenrir.Editor +{ + public static class FenrirPlayerSetup + { + [MenuItem("Fenrir/Setup Player & Camera")] + public static void Setup() + { + const string scenePath = "Assets/_Project/Scenes/EmberForest.unity"; + var scene = EditorSceneManager.OpenScene(scenePath, OpenSceneMode.Single); + + SetupPlayerMesh(); + SetupFollowTarget(); + AddGroundPlane(); + + EditorSceneManager.SaveScene(scene); + Debug.Log("[FenrirPlayerSetup] ✓ Player mesh and follow target set up. " + + "Add a CinemachineCamera via Component menu and set Follow/LookAt to CameraFollowTarget."); + } + + // ── Player capsule ──────────────────────────────────────────────────── + + private static void SetupPlayerMesh() + { + var player = GameObject.Find("Player"); + if (player == null) { Debug.LogError("[FenrirPlayerSetup] Player not found."); return; } + + if (player.GetComponentInChildren() != null) + { + Debug.Log("[FenrirPlayerSetup] Player mesh already exists — skipping."); + return; + } + + // Capsule body + var body = GameObject.CreatePrimitive(PrimitiveType.Capsule); + body.name = "Mesh"; + body.transform.SetParent(player.transform); + body.transform.localPosition = new Vector3(0f, 1f, 0f); + body.transform.localScale = Vector3.one; + Object.DestroyImmediate(body.GetComponent()); + + // Forward indicator + var arrow = GameObject.CreatePrimitive(PrimitiveType.Cube); + arrow.name = "ForwardArrow"; + arrow.transform.SetParent(player.transform); + arrow.transform.localPosition = new Vector3(0f, 1f, 0.65f); + arrow.transform.localScale = new Vector3(0.15f, 0.15f, 0.4f); + Object.DestroyImmediate(arrow.GetComponent()); + + player.transform.position = Vector3.zero; + Debug.Log("[FenrirPlayerSetup] ✓ Player capsule mesh added."); + } + + // ── Camera follow target ────────────────────────────────────────────── + + private static void SetupFollowTarget() + { + var player = GameObject.Find("Player"); + if (player == null) return; + + if (player.transform.Find("CameraFollowTarget") != null) return; + + var target = new GameObject("CameraFollowTarget"); + target.transform.SetParent(player.transform); + target.transform.localPosition = new Vector3(0f, 1.6f, 0f); // eye height + + Debug.Log("[FenrirPlayerSetup] ✓ CameraFollowTarget created on Player."); + } + + // ── Ground plane ────────────────────────────────────────────────────── + + private static void AddGroundPlane() + { + if (GameObject.Find("Ground") != null) return; + + var ground = GameObject.CreatePrimitive(PrimitiveType.Plane); + ground.name = "Ground"; + ground.transform.position = Vector3.zero; + ground.transform.localScale = new Vector3(10f, 1f, 10f); + + Debug.Log("[FenrirPlayerSetup] ✓ Ground plane added."); + } + } +} +#endif diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirPlayerSetup.cs.meta b/src/ProjectFenrir/Assets/_Project/Editor/FenrirPlayerSetup.cs.meta new file mode 100644 index 0000000..29265b3 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Editor/FenrirPlayerSetup.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 8738f499cd193442e84e6d49f46b659b \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirSceneFinalize.cs b/src/ProjectFenrir/Assets/_Project/Editor/FenrirSceneFinalize.cs new file mode 100644 index 0000000..c7b0b9e --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Editor/FenrirSceneFinalize.cs @@ -0,0 +1,185 @@ +#if UNITY_EDITOR +// Editor/FenrirSceneFinalize.cs +// Run via: Fenrir → Finalize EmberForest Scene +// Adds ground plane, SceneValidator, fixes EventSystem, positions Player correctly. +// Safe to run multiple times — all ops are idempotent. + +using UnityEditor; +using UnityEditor.SceneManagement; +using UnityEngine; +using UnityEngine.InputSystem.UI; +using Unity.Cinemachine; + +namespace Fenrir.Editor +{ + public static class FenrirSceneFinalize + { + [MenuItem("Fenrir/Finalize EmberForest Scene")] + public static void Finalize() + { + const string path = "Assets/_Project/Scenes/EmberForest.unity"; + var scene = EditorSceneManager.OpenScene(path, OpenSceneMode.Single); + + FixEventSystem(); + EnsureGroundPlane(); + EnsurePlayerMesh(); + PositionPlayer(); + EnsureCinemachineCamera(); + AddSceneValidator(); + EnsurePlayerTag(); + + EditorSceneManager.SaveScene(scene); + Debug.Log("[FenrirSceneFinalize] ✓ EmberForest finalized."); + } + + // ── EventSystem: replace StandaloneInputModule with InputSystemUIInputModule ── + + private static void FixEventSystem() + { + var es = GameObject.Find("EventSystem"); + if (es == null) return; + + var old = es.GetComponent(); + if (old != null) + { + Object.DestroyImmediate(old); + Debug.Log("[FenrirSceneFinalize] ✓ Removed StandaloneInputModule."); + } + + if (es.GetComponent() == null) + { + es.AddComponent(); + Debug.Log("[FenrirSceneFinalize] ✓ Added InputSystemUIInputModule."); + } + } + + // ── Ground plane ────────────────────────────────────────────────────── + + private static void EnsureGroundPlane() + { + if (GameObject.Find("Ground") != null) + { + Debug.Log("[FenrirSceneFinalize] Ground plane already exists."); + return; + } + + var ground = GameObject.CreatePrimitive(PrimitiveType.Plane); + ground.name = "Ground"; + ground.transform.position = Vector3.zero; + ground.transform.localScale = new Vector3(20f, 1f, 20f); + Debug.Log("[FenrirSceneFinalize] ✓ Ground plane added (200x200 units)."); + } + + // ── Player positioning ──────────────────────────────────────────────── + + private static void PositionPlayer() + { + var player = GameObject.Find("Player"); + if (player == null) return; + + // Only reposition if at origin or underground + if (player.transform.position.y < 0f || player.transform.position == Vector3.zero) + { + player.transform.position = new Vector3(0f, 0.1f, 0f); + Debug.Log("[FenrirSceneFinalize] ✓ Player positioned above ground."); + } + } + + // ── SceneValidator ──────────────────────────────────────────────────── + + private static void AddSceneValidator() + { + var wm = GameObject.Find("WorldManager"); + if (wm == null) return; + + if (wm.GetComponent() == null) + { + wm.AddComponent(); + Debug.Log("[FenrirSceneFinalize] ✓ SceneValidator added to WorldManager."); + } + } + + // ── Player capsule mesh ─────────────────────────────────────────────── + + private static void EnsurePlayerMesh() + { + var player = GameObject.Find("Player"); + if (player == null) return; + if (player.GetComponentInChildren() != null) return; + + var body = GameObject.CreatePrimitive(PrimitiveType.Capsule); + body.name = "Mesh"; + body.transform.SetParent(player.transform); + body.transform.localPosition = new Vector3(0f, 1f, 0f); + Object.DestroyImmediate(body.GetComponent()); + + var arrow = GameObject.CreatePrimitive(PrimitiveType.Cube); + arrow.name = "ForwardArrow"; + arrow.transform.SetParent(player.transform); + arrow.transform.localPosition = new Vector3(0f, 1f, 0.65f); + arrow.transform.localScale = new Vector3(0.15f, 0.15f, 0.4f); + Object.DestroyImmediate(arrow.GetComponent()); + + // Camera follow target at eye height + if (player.transform.Find("CameraFollowTarget") == null) + { + var t = new GameObject("CameraFollowTarget"); + t.transform.SetParent(player.transform); + t.transform.localPosition = new Vector3(0f, 1.6f, 0f); + } + + Debug.Log("[FenrirSceneFinalize] ✓ Player mesh added."); + } + + // ── Cinemachine camera ──────────────────────────────────────────────── + + private static void EnsureCinemachineCamera() + { + if (GameObject.Find("CM FreeLook") != null) return; + + var player = GameObject.Find("Player"); + if (player == null) return; + + var followTarget = player.transform.Find("CameraFollowTarget"); + if (followTarget == null) return; + + // Ensure Main Camera has CinemachineBrain + var mainCam = Camera.main; + if (mainCam != null && mainCam.GetComponent() == null) + mainCam.gameObject.AddComponent(); + + // Create Cinemachine camera + var camGo = new GameObject("CM FreeLook"); + camGo.transform.position = new Vector3(0f, 3f, -6f); + + var vcam = camGo.AddComponent(); + vcam.Follow = followTarget; + vcam.LookAt = followTarget; + vcam.Priority = new PrioritySettings { Value = 10 }; + + var follow = camGo.AddComponent(); + follow.OrbitStyle = CinemachineOrbitalFollow.OrbitStyles.Sphere; + follow.Radius = 5f; + follow.VerticalAxis.Value = 15f; + + camGo.AddComponent(); + + Debug.Log("[FenrirSceneFinalize] ✓ CinemachineCamera created."); + } + + // ── Player tag ──────────────────────────────────────────────────────── + + private static void EnsurePlayerTag() + { + var player = GameObject.Find("Player"); + if (player == null) return; + + if (player.tag != "Player") + { + player.tag = "Player"; + Debug.Log("[FenrirSceneFinalize] ✓ Player tag set."); + } + } + } +} +#endif diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirSceneFinalize.cs.meta b/src/ProjectFenrir/Assets/_Project/Editor/FenrirSceneFinalize.cs.meta new file mode 100644 index 0000000..ac1f769 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Editor/FenrirSceneFinalize.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: c968532f3b41747f8a715d81894cc586 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirSceneSetup.cs b/src/ProjectFenrir/Assets/_Project/Editor/FenrirSceneSetup.cs index f622994..f1af19f 100644 --- a/src/ProjectFenrir/Assets/_Project/Editor/FenrirSceneSetup.cs +++ b/src/ProjectFenrir/Assets/_Project/Editor/FenrirSceneSetup.cs @@ -143,7 +143,9 @@ private static void CreateEventSystem() { var es = new GameObject("EventSystem"); es.AddComponent(); - es.AddComponent(); + // Use new Input System module — StandaloneInputModule causes errors when + // Active Input Handling is set to "Input System Package (New)" + es.AddComponent(); } private static GameObject CreateUIPanel(string name, Transform parent) diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirWireReferences.cs b/src/ProjectFenrir/Assets/_Project/Editor/FenrirWireReferences.cs new file mode 100644 index 0000000..bd2ebd2 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Editor/FenrirWireReferences.cs @@ -0,0 +1,141 @@ +#if UNITY_EDITOR +// Editor/FenrirWireReferences.cs +// Run once via: Fenrir → Wire Scene References +// Opens EmberForest, wires all serialized cross-component references, saves. + +using UnityEditor; +using UnityEditor.SceneManagement; +using UnityEngine; +using UnityEngine.Rendering; + +using Fenrir.Audio; +using Fenrir.Combat; +using Fenrir.Entities.Player; +using Fenrir.Input; +using Fenrir.UI; +using Fenrir.World; + +namespace Fenrir.Editor +{ + public static class FenrirWireReferences + { + [MenuItem("Fenrir/Wire Scene References")] + public static void WireAll() + { + WireEmberForest(); + Debug.Log("[FenrirWireReferences] ✓ All references wired."); + } + + private static void WireEmberForest() + { + const string scenePath = "Assets/_Project/Scenes/EmberForest.unity"; + var scene = EditorSceneManager.OpenScene(scenePath, OpenSceneMode.Single); + + // ── Find GameObjects ────────────────────────────────────────────── + var playerGo = GameObject.Find("Player"); + var inputGo = GameObject.Find("InputSystem"); + var worldGo = GameObject.Find("WorldManager"); + var dnGo = GameObject.Find("DayNightCycle"); + var audioGo = GameObject.Find("AudioManager"); + var hudGo = GameObject.Find("HUD"); + var dirLight = GameObject.Find("Directional Light"); + + if (playerGo == null || inputGo == null || dnGo == null) + { + Debug.LogError("[FenrirWireReferences] Could not find required GameObjects. Run Setup Scenes first."); + return; + } + + // ── Get Components ──────────────────────────────────────────────── + var playerController = playerGo.GetComponent(); + var playerCombat = playerGo.GetComponent(); + var playerHealth = playerGo.GetComponent(); + var playerEnergy = playerGo.GetComponent(); + + var touchMapper = inputGo.GetComponent(); + var gestureRecog = inputGo.GetComponent(); + var inputHandler = inputGo.GetComponent(); + + var worldManager = worldGo?.GetComponent(); + var dayNight = dnGo.GetComponent(); + + var audioManager = audioGo?.GetComponent(); + var musicLayer = audioGo?.GetComponent(); + var sfxPool = audioGo?.GetComponent(); + + var hud = hudGo?.GetComponent(); + var energyBar = hudGo?.GetComponent(); + var journal = hudGo?.GetComponent(); + + var light = dirLight?.GetComponent(); + + // ── Wire References ─────────────────────────────────────────────── + + // TouchMapper → Player + if (touchMapper != null) + { + SetField(touchMapper, "_controller", playerController); + SetField(touchMapper, "_combat", playerCombat); + } + + // GestureRecognizer → TouchMapper + if (gestureRecog != null) + SetField(gestureRecog, "_mapper", touchMapper); + + // InputHandler → GestureRecognizer + TouchMapper + if (inputHandler != null) + { + SetField(inputHandler, "_gesture", gestureRecog); + SetField(inputHandler, "_mapper", touchMapper); + } + + // DayNightCycle → Directional Light + if (dayNight != null && light != null) + SetField(dayNight, "_directionalLight", light); + + // WorldManager → DayNightCycle + if (worldManager != null) + SetField(worldManager, "_dayNight", dayNight); + + // AudioManager → MusicLayer + SFXPool + if (audioManager != null) + { + SetField(audioManager, "_musicLayer", musicLayer); + SetField(audioManager, "_sfxPool", sfxPool); + } + + // HUD → PlayerHealth + if (hud != null) + SetField(hud, "_health", playerHealth); + + // EnergyBar → PlayerEnergy + if (energyBar != null) + SetField(energyBar, "_energy", playerEnergy); + + // JournalController → HUD + if (journal != null) + SetField(journal, "_hud", hud); + + EditorSceneManager.SaveScene(scene); + Debug.Log("[FenrirWireReferences] ✓ EmberForest references wired and saved."); + } + + // ── Helper ──────────────────────────────────────────────────────────── + + private static void SetField(Object target, string fieldName, Object value) + { + var so = new SerializedObject(target); + var prop = so.FindProperty(fieldName); + if (prop != null) + { + prop.objectReferenceValue = value; + so.ApplyModifiedPropertiesWithoutUndo(); + } + else + { + Debug.LogWarning($"[FenrirWireReferences] Field '{fieldName}' not found on {target.GetType().Name}"); + } + } + } +} +#endif diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirWireReferences.cs.meta b/src/ProjectFenrir/Assets/_Project/Editor/FenrirWireReferences.cs.meta new file mode 100644 index 0000000..edb6699 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Editor/FenrirWireReferences.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 5c647960f00e44ccf81afb45683bbcc2 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scenes/EmberForest.unity b/src/ProjectFenrir/Assets/_Project/Scenes/EmberForest.unity index 1171687..3d2031e 100644 --- a/src/ProjectFenrir/Assets/_Project/Scenes/EmberForest.unity +++ b/src/ProjectFenrir/Assets/_Project/Scenes/EmberForest.unity @@ -119,6 +119,96 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &107443621 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 107443622} + - component: {fileID: 107443624} + - component: {fileID: 107443623} + m_Layer: 0 + m_Name: ForwardArrow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &107443622 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 107443621} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: 0.65} + m_LocalScale: {x: 0.15, y: 0.15, z: 0.4} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 746947366} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &107443623 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 107443621} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &107443624 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 107443621} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &419592642 GameObject: m_ObjectHideFlags: 0 @@ -129,6 +219,7 @@ GameObject: m_Component: - component: {fileID: 419592644} - component: {fileID: 419592643} + - component: {fileID: 419592645} m_Layer: 0 m_Name: WorldManager m_TagString: Untagged @@ -164,6 +255,18 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &419592645 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 419592642} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2938442e293a04d7191c774f99f61d14, type: 3} + m_Name: + m_EditorClassIdentifier: Fenrir.Runtime::Fenrir.Core.SceneValidator --- !u!1 &537506421 GameObject: m_ObjectHideFlags: 0 @@ -174,7 +277,7 @@ GameObject: m_Component: - component: {fileID: 537506424} - component: {fileID: 537506423} - - component: {fileID: 537506422} + - component: {fileID: 537506425} m_Layer: 0 m_Name: EventSystem m_TagString: Untagged @@ -182,26 +285,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &537506422 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 537506421} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} - m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.EventSystems.StandaloneInputModule - m_SendPointerHoverToParent: 1 - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel - m_InputActionsPerSecond: 10 - m_RepeatDelay: 0.5 - m_ForceModuleActive: 0 --- !u!114 &537506423 MonoBehaviour: m_ObjectHideFlags: 0 @@ -232,6 +315,37 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &537506425 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 537506421} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.InputSystem::UnityEngine.InputSystem.UI.InputSystemUIInputModule + m_SendPointerHoverToParent: 1 + m_MoveRepeatDelay: 0.5 + m_MoveRepeatRate: 0.1 + m_XRTrackingOrigin: {fileID: 0} + m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_DeselectOnBackgroundClick: 1 + m_PointerBehavior: 0 + m_CursorLockBehavior: 0 + m_ScrollDeltaPerTick: 6 --- !u!1 &585957744 GameObject: m_ObjectHideFlags: 0 @@ -243,6 +357,7 @@ GameObject: - component: {fileID: 585957747} - component: {fileID: 585957746} - component: {fileID: 585957745} + - component: {fileID: 585957748} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -324,6 +439,38 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &585957748 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 585957744} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 72ece51f2901e7445ab60da3685d6b5f, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.Cinemachine::Unity.Cinemachine.CinemachineBrain + ShowDebugText: 0 + ShowCameraFrustum: 1 + IgnoreTimeScale: 0 + WorldUpOverride: {fileID: 0} + ChannelMask: -1 + UpdateMethod: 2 + BlendUpdateMethod: 1 + LensModeOverride: + Enabled: 0 + DefaultMode: 2 + DefaultBlend: + Style: 1 + Time: 2 + CustomCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + CustomBlends: {fileID: 0} --- !u!1 &654603743 GameObject: m_ObjectHideFlags: 0 @@ -532,6 +679,119 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &676217379 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 676217383} + - component: {fileID: 676217382} + - component: {fileID: 676217381} + - component: {fileID: 676217380} + m_Layer: 0 + m_Name: Ground + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!23 &676217380 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 676217379} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &676217381 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 676217379} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!33 &676217382 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 676217379} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &676217383 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 676217379} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 10, y: 1, z: 10} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &746947356 GameObject: m_ObjectHideFlags: 0 @@ -703,10 +963,13 @@ Transform: m_GameObject: {fileID: 746947356} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0.1, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1844621651} + - {fileID: 107443622} + - {fileID: 1502757912} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1249111294 @@ -1086,6 +1349,296 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1502757911 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1502757912} + m_Layer: 0 + m_Name: CameraFollowTarget + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1502757912 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1502757911} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1.6, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 746947366} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1542138075 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1542138079} + - component: {fileID: 1542138078} + - component: {fileID: 1542138077} + - component: {fileID: 1542138076} + m_Layer: 0 + m_Name: CM FreeLook + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1542138076 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1542138075} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f38bda98361e1de48a4ca2bd86ea3c17, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.Cinemachine::Unity.Cinemachine.CinemachineRotationComposer + Composition: + ScreenPosition: {x: 0, y: 0} + DeadZone: + Enabled: 0 + Size: {x: 0.2, y: 0.2} + HardLimits: + Enabled: 0 + Size: {x: 0.8, y: 0.8} + Offset: {x: 0, y: 0} + CenterOnActivate: 1 + TargetOffset: {x: 0, y: 0, z: 0} + Damping: {x: 0.5, y: 0.5} + Lookahead: + Enabled: 0 + Time: 0 + Smoothing: 0 + IgnoreY: 0 +--- !u!114 &1542138077 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1542138075} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3b5d7c088409d9a40b7b09aa707777f8, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.Cinemachine::Unity.Cinemachine.CinemachineOrbitalFollow + TargetOffset: {x: 0, y: 0, z: 0} + TrackerSettings: + BindingMode: 4 + PositionDamping: {x: 1, y: 1, z: 1} + AngularDampingMode: 0 + RotationDamping: {x: 1, y: 1, z: 1} + QuaternionDamping: 1 + OrbitStyle: 0 + Radius: 5 + Orbits: + Top: + Radius: 2 + Height: 5 + Center: + Radius: 4 + Height: 2.25 + Bottom: + Radius: 2.5 + Height: 0.1 + SplineCurvature: 0.5 + RecenteringTarget: 2 + HorizontalAxis: + Value: 0 + Center: 0 + Range: {x: -180, y: 180} + Wrap: 1 + Recentering: + Enabled: 0 + Wait: 1 + Time: 2 + Restrictions: 0 + VerticalAxis: + Value: 15 + Center: 17.5 + Range: {x: -10, y: 45} + Wrap: 0 + Recentering: + Enabled: 0 + Wait: 1 + Time: 2 + Restrictions: 0 + RadialAxis: + Value: 1 + Center: 1 + Range: {x: 1, y: 1} + Wrap: 0 + Recentering: + Enabled: 0 + Wait: 1 + Time: 2 + Restrictions: 0 +--- !u!114 &1542138078 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1542138075} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f9dfa5b682dcd46bda6128250e975f58, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.Cinemachine::Unity.Cinemachine.CinemachineCamera + Priority: + Enabled: 1 + m_Value: 10 + OutputChannel: 1 + StandbyUpdate: 2 + m_StreamingVersion: 0 + m_LegacyPriority: 0 + Target: + TrackingTarget: {fileID: 1502757912} + LookAtTarget: {fileID: 1502757912} + CustomLookAtTarget: 1 + Lens: + FieldOfView: 40 + OrthographicSize: 10 + NearClipPlane: 0.1 + FarClipPlane: 5000 + Dutch: 0 + ModeOverride: 0 + PhysicalProperties: + GateFit: 2 + SensorSize: {x: 21.946, y: 16.002} + LensShift: {x: 0, y: 0} + FocusDistance: 10 + Iso: 200 + ShutterSpeed: 0.005 + Aperture: 16 + BladeCount: 5 + Curvature: {x: 2, y: 11} + BarrelClipping: 0.25 + Anamorphism: 0 + BlendHint: 0 +--- !u!4 &1542138079 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1542138075} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 3, z: -6} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1844621650 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1844621651} + - component: {fileID: 1844621653} + - component: {fileID: 1844621652} + m_Layer: 0 + m_Name: Mesh + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1844621651 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1844621650} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 746947366} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1844621652 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1844621650} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1844621653 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1844621650} + m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &2042922182 GameObject: m_ObjectHideFlags: 0 @@ -1177,3 +1730,5 @@ SceneRoots: - {fileID: 1298512001} - {fileID: 1291737300} - {fileID: 537506424} + - {fileID: 676217383} + - {fileID: 1542138079} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Audio/AudioManager.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Audio/AudioManager.cs index e6c2fb2..c4d2b43 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Audio/AudioManager.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Audio/AudioManager.cs @@ -27,6 +27,8 @@ private void Awake() if (Instance != null && Instance != this) { Destroy(gameObject); return; } Instance = this; DontDestroyOnLoad(gameObject); + if (_musicLayer == null) _musicLayer = GetComponent(); + if (_sfxPool == null) _sfxPool = GetComponent(); } private void Start() diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Audio/MusicLayer.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Audio/MusicLayer.cs index 53b7149..619563a 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Audio/MusicLayer.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Audio/MusicLayer.cs @@ -12,6 +12,7 @@ public class MusicLayer : MonoBehaviour private Coroutine _fadeCoroutine; private void Reset() => _source = GetComponent(); + private void Awake() { if (_source == null) _source = GetComponent(); } public void CrossFade(AudioClip clip, float duration) { diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Audio/SFXPool.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Audio/SFXPool.cs index e138c65..492962c 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Audio/SFXPool.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Audio/SFXPool.cs @@ -12,9 +12,19 @@ public class SFXPool : MonoBehaviour private void Awake() { + // If no prefab assigned, create a minimal AudioSource as the pool template + if (_prefab == null) + { + var go = new GameObject("SFX_Template"); + go.transform.SetParent(transform); + _prefab = go.AddComponent(); + _prefab.playOnAwake = false; + } + for (int i = 0; i < _poolSize; i++) { AudioSource source = Instantiate(_prefab, transform); + source.playOnAwake = false; source.gameObject.SetActive(false); _pool.Enqueue(source); } diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Core/SceneValidator.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Core/SceneValidator.cs new file mode 100644 index 0000000..6d75444 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Core/SceneValidator.cs @@ -0,0 +1,66 @@ +using Fenrir.Audio; +using Fenrir.Combat; +using Fenrir.Entities.Player; +using Fenrir.Input; +using Fenrir.World; +using UnityEngine; + +namespace Fenrir.Core +{ + /// + /// Runs at scene start in development builds. + /// Validates that all critical scene references exist and logs clear + /// error messages instead of cryptic NullReferenceExceptions. + /// Attach to any persistent GameObject (e.g. the WorldManager). + /// + public class SceneValidator : MonoBehaviour + { + private void Start() + { +#if UNITY_EDITOR || DEVELOPMENT_BUILD + ValidateScene(); +#endif + } + + private static void ValidateScene() + { + int issues = 0; + + issues += Require("PlayerController"); + issues += Require ("PlayerHealth"); + issues += Require ("PlayerEnergy"); + issues += Require ("PlayerCombat"); + issues += Require ("TouchMapper"); + issues += Require ("InputHandler"); + issues += Require ("DayNightCycle"); + issues += Require ("WorldManager"); + issues += Require ("AudioManager"); + issues += Require ("CombatSystem"); + + // Player tag + var playerGo = GameObject.FindWithTag("Player"); + if (playerGo == null) + { + Debug.LogError("[SceneValidator] No GameObject tagged 'Player'. " + + "Select Player → Inspector → Tag → Player."); + issues++; + } + + if (issues == 0) + Debug.Log("[SceneValidator] ✓ Scene validated — all critical references found."); + else + Debug.LogWarning($"[SceneValidator] {issues} issue(s) found. " + + "Check errors above before playtesting."); + } + + private static int Require(string label) where T : Object + { + var obj = FindAnyObjectByType(); + if (obj != null) return 0; + + Debug.LogError($"[SceneValidator] Missing: {label} — " + + $"no {typeof(T).Name} found in scene."); + return 1; + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Core/SceneValidator.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Core/SceneValidator.cs.meta new file mode 100644 index 0000000..f770c48 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Core/SceneValidator.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 2938442e293a04d7191c774f99f61d14 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Input/GestureRecognizer.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Input/GestureRecognizer.cs index e243f1e..b23fc2a 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Input/GestureRecognizer.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Input/GestureRecognizer.cs @@ -25,6 +25,11 @@ public class GestureRecognizer : MonoBehaviour private int _rightFingerId = -1; private bool _rightActive; + private void Awake() + { + if (_mapper == null) _mapper = GetComponent(); + } + private void OnEnable() => EnhancedTouchSupport.Enable(); private void OnDisable() => EnhancedTouchSupport.Disable(); diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Input/InputHandler.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Input/InputHandler.cs index c7dc450..7098c7b 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Input/InputHandler.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Input/InputHandler.cs @@ -4,51 +4,57 @@ namespace Fenrir.Input { /// - /// Raw input layer. Reads Unity's new Input System touch/gamepad events - /// and forwards normalised values to GestureRecognizer and TouchMapper. - /// This class knows nothing about game entities. + /// Raw input layer using Unity Input System (new). + /// Forwards to GestureRecognizer (touch) or processes keyboard directly (Editor). /// public class InputHandler : MonoBehaviour { [SerializeField] private GestureRecognizer _gesture; [SerializeField] private TouchMapper _mapper; + private void Awake() + { + // Auto-find on same GameObject if not wired via Inspector + if (_gesture == null) _gesture = GetComponent(); + if (_mapper == null) _mapper = GetComponent(); + } + private void Update() { + if (_mapper == null) return; + if (Keyboard.current == null) return; + #if UNITY_IOS || UNITY_ANDROID ProcessTouches(); #else - ProcessKeyboard(); // Editor / Mac fallback + ProcessKeyboard(); #endif } - // ── Mobile ──────────────────────────────────────────────────────────── - private void ProcessTouches() { - // Unity's new input system touch processing is deferred to - // GestureRecognizer, which owns the left/right split logic. - _gesture.Tick(); + _gesture?.Tick(); } - // ── Editor / Keyboard ───────────────────────────────────────────────── - private void ProcessKeyboard() { + var kb = Keyboard.current; + float h = 0f, v = 0f; - if (Keyboard.current.dKey.isPressed || Keyboard.current.rightArrowKey.isPressed) h = 1f; - if (Keyboard.current.aKey.isPressed || Keyboard.current.leftArrowKey.isPressed) h = -1f; - if (Keyboard.current.wKey.isPressed || Keyboard.current.upArrowKey.isPressed) v = 1f; - if (Keyboard.current.sKey.isPressed || Keyboard.current.downArrowKey.isPressed) v = -1f; + if (kb.dKey.isPressed || kb.rightArrowKey.isPressed) h = 1f; + if (kb.aKey.isPressed || kb.leftArrowKey.isPressed) h = -1f; + if (kb.wKey.isPressed || kb.upArrowKey.isPressed) v = 1f; + if (kb.sKey.isPressed || kb.downArrowKey.isPressed) v = -1f; _mapper.OnMoveInput(new Vector2(h, v)); - if (Keyboard.current.spaceKey.wasPressedThisFrame) _mapper.OnDodge(); - if (Keyboard.current.jKey.wasPressedThisFrame) _mapper.OnLightAttack(); - if (Keyboard.current.kKey.wasPressedThisFrame) _mapper.OnHeavyAttack(); - if (Keyboard.current.lKey.wasPressedThisFrame) _mapper.OnAbility(); - if (Keyboard.current.bKey.isPressed) _mapper.OnBlockHeld(); - else _mapper.OnBlockReleased(); + if (kb.spaceKey.wasPressedThisFrame) _mapper.OnDodge(); + if (kb.jKey.wasPressedThisFrame) _mapper.OnLightAttack(); + if (kb.kKey.wasPressedThisFrame) _mapper.OnHeavyAttack(); + if (kb.lKey.wasPressedThisFrame) _mapper.OnAbility(); + + if (kb.bKey.isPressed) _mapper.OnBlockHeld(); + else _mapper.OnBlockReleased(); } } } diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Input/TouchMapper.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Input/TouchMapper.cs index 2539140..35142b0 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Input/TouchMapper.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Input/TouchMapper.cs @@ -5,31 +5,43 @@ namespace Fenrir.Input { /// /// Bridges gesture intents to the player entity. - /// GestureRecognizer calls this; it forwards commands to PlayerController / PlayerCombat. + /// Auto-finds PlayerController and PlayerCombat in scene if not wired via Inspector. /// public class TouchMapper : MonoBehaviour { [SerializeField] private PlayerController _controller; [SerializeField] private PlayerCombat _combat; - // Optional: closest enemy lock-on target (set by combat system) public GameObject CurrentTarget { get; set; } + private void Awake() + { + if (_controller == null) + _controller = FindAnyObjectByType(); + if (_combat == null) + _combat = FindAnyObjectByType(); + } + // ── Movement ────────────────────────────────────────────────────────── - public void OnMoveInput(Vector2 input) => _controller.SetMoveInput(input); + public void OnMoveInput(Vector2 input) + { + _controller?.SetMoveInput(input); + } // ── Combat ──────────────────────────────────────────────────────────── - public void OnLightAttack() => _combat.DoLightAttack(CurrentTarget); - public void OnHeavyAttack() => _combat.DoHeavyAttack(CurrentTarget); - public void OnAbility() => _combat.DoAbility(CurrentTarget); + public void OnLightAttack() => _combat?.DoLightAttack(CurrentTarget); + public void OnHeavyAttack() => _combat?.DoHeavyAttack(CurrentTarget); + public void OnAbility() => _combat?.DoAbility(CurrentTarget); + public void OnDodge() { - _controller.RequestDodge(); - _combat.DoDodge(); + _controller?.RequestDodge(); + _combat?.DoDodge(); } - public void OnBlockHeld() => _combat.DoBlock(); - public void OnBlockReleased()=> _combat.EndBlock(); + + public void OnBlockHeld() => _combat?.DoBlock(); + public void OnBlockReleased() => _combat?.EndBlock(); } } diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/World/WorldManager.cs b/src/ProjectFenrir/Assets/_Project/Scripts/World/WorldManager.cs index a0a10cb..8de8d4f 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/World/WorldManager.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/World/WorldManager.cs @@ -20,6 +20,7 @@ private void Awake() { if (Instance != null && Instance != this) { Destroy(gameObject); return; } Instance = this; + if (_dayNight == null) _dayNight = FindAnyObjectByType(); } private void Start() diff --git a/src/ProjectFenrir/ProjectSettings/EditorBuildSettings.asset b/src/ProjectFenrir/ProjectSettings/EditorBuildSettings.asset index 513e6f1..32cc92d 100644 --- a/src/ProjectFenrir/ProjectSettings/EditorBuildSettings.asset +++ b/src/ProjectFenrir/ProjectSettings/EditorBuildSettings.asset @@ -6,7 +6,13 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 - path: Assets/Scenes/SampleScene.unity - guid: 99c9720ab356a0642a771bea13969a05 + path: Assets/_Project/Scenes/Bootstrap.unity + guid: db83ce571a9c6408d82604187eb23ef9 + - enabled: 1 + path: Assets/_Project/Scenes/Awakening.unity + guid: 0f4151566f9e14d5b977b8627d5e5c92 + - enabled: 1 + path: Assets/_Project/Scenes/EmberForest.unity + guid: baf21476c5d6844e8b5dc7db4fa6f22e m_configObjects: com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3} From b7d44c20f9ccd760746cee029c48f5b63f79941e Mon Sep 17 00:00:00 2001 From: Seni Date: Wed, 3 Jun 2026 08:05:09 -0700 Subject: [PATCH 04/27] =?UTF-8?q?chore(phase1):=20close=20Phase=201=20?= =?UTF-8?q?=E2=80=94=20bundle=20ID,=20CI=20pipeline,=20compile-fix=20sync?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 97 ++++++++++++------- DEVELOPMENT_DIARY.md | 65 +++++++++---- ROADMAP.md | 19 ++-- .../_Project/Scripts/Audio/AudioManager.cs | 2 +- .../_Project/Scripts/Audio/MusicLayer.cs | 1 + src/Assets/_Project/Scripts/Audio/SFXPool.cs | 10 ++ .../_Project/Scripts/Combat/CombatSystem.cs | 2 +- .../Scripts/Evolution/EvolutionSequencer.cs | 2 +- src/Assets/_Project/Scripts/UI/EnergyBar.cs | 2 +- src/Assets/_Project/Scripts/UI/HUD.cs | 2 +- .../ProjectSettings/ProjectSettings.asset | 6 +- 11 files changed, 136 insertions(+), 72 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aecfc0f..3bab1ba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,48 +2,71 @@ name: CI on: push: - branches: [main, develop] + branches: [main, develop, "feature/**", "fix/**", "chore/**"] pull_request: branches: [main, develop] jobs: - # ── Phase 0: docs validation ────────────────────────────────────────────── - docs: - name: Lint Markdown + # ── Markdown lint ──────────────────────────────────────────────────────────── + lint-docs: + name: Lint docs runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 + with: + node-version: "20" + - run: npm install -g markdownlint-cli + - run: markdownlint "**/*.md" --ignore node_modules + + # ── Unity build + EditMode tests ───────────────────────────────────────────── + unity-build: + name: Unity build & tests (Unity 6 LTS) + runs-on: ubuntu-latest + needs: lint-docs + + steps: + - uses: actions/checkout@v4 + with: + lfs: true + + - name: Cache Unity Library + uses: actions/cache@v4 + with: + path: src/ProjectFenrir/Library + key: ${{ runner.os }}-unity-library-${{ hashFiles('src/ProjectFenrir/Packages/packages-lock.json') }} + restore-keys: | + ${{ runner.os }}-unity-library- + + - name: Activate & build + uses: game-ci/unity-builder@v4 + env: + UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} + UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }} + UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} + with: + projectPath: src/ProjectFenrir + unityVersion: 6000.0.40f1 + targetPlatform: iOS + buildName: ProjectFenrir + buildsPath: build + + - name: Run EditMode tests + uses: game-ci/unity-test-runner@v4 + env: + UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} + UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }} + UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} + with: + projectPath: src/ProjectFenrir + unityVersion: 6000.0.40f1 + testMode: editmode + artifactsPath: test-results - - name: Install markdownlint-cli - run: npm install -g markdownlint-cli - - - name: Lint docs - run: markdownlint "**/*.md" --ignore node_modules - - # ── Phase 1+: Swift / Xcode build ───────────────────────────────────────── - # Uncomment when the Xcode project lands in /src - # - # swift: - # name: Build & Test (iOS) - # runs-on: macos-14 # Xcode 15 - # steps: - # - uses: actions/checkout@v4 - # - # - name: Select Xcode - # run: sudo xcode-select -s /Applications/Xcode_15.4.app - # - # - name: Build - # run: | - # xcodebuild build-for-testing \ - # -project src/Fenrir.xcodeproj \ - # -scheme Fenrir \ - # -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.5' \ - # CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO - # - # - name: Test - # run: | - # xcodebuild test \ - # -project src/Fenrir.xcodeproj \ - # -scheme Fenrir \ - # -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.5' \ - # CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO + - name: Upload test results + uses: actions/upload-artifact@v4 + if: always() + with: + name: test-results + path: test-results + retention-days: 14 diff --git a/DEVELOPMENT_DIARY.md b/DEVELOPMENT_DIARY.md index 9d45370..a6675a1 100644 --- a/DEVELOPMENT_DIARY.md +++ b/DEVELOPMENT_DIARY.md @@ -153,31 +153,60 @@ Main Camera ```text --- -## Current Status +## Session 4 — First Playable Milestone +**Date:** 2026-06-02 -**Phase 1 — Foundation:** ~90% complete +### What we did -### Done ✅ +Got the game to a playable state in the Editor for the first time. -- Full design layer (all docs, all decisions locked) -- Full C# scaffold (56 files, 12 modules) -- Unity project created, packages installed, scripts compiling clean -- 3 scenes created and added to Build Settings -- Unit test framework wired up +**Scene work:** +- Wrote three editor utilities: `FenrirSceneSetup`, `FenrirSceneFinalize`, `FenrirWireReferences` — idempotent scene scaffolding scripts runnable from the Fenrir menu +- `FenrirSceneFinalize` handles: ground plane (200×200 units), player capsule mesh, Cinemachine camera with OrbitalFollow + RotationComposer, EventSystem fix, Player tag, SceneValidator attachment +- Added `SceneValidator.cs` — runs on Start in dev builds, logs clear errors for every missing critical component instead of crashing with NullRefs + +**Compile fixes (6 total):** +- `SaveData`: `string[]` → `List` for `.Add()` / `.Contains()` compatibility +- `Bootstrap`: missing `using Fenrir.Config` +- `PlayerCombat`: `[RequireComponent]` multi-type attribute split +- `SFXPool`: null prefab crash — now self-creates an AudioSource template if none assigned +- `MusicLayer`: `Reset()` only fires in Editor — added `Awake()` fallback for runtime +- All `FindFirstObjectByType` → `FindAnyObjectByType` (Unity 6 deprecation) + +**Robustness pass:** Added `Awake()` auto-find fallbacks to `InputHandler`, `TouchMapper`, `GestureRecognizer`, `WorldManager`, `AudioManager` — eliminates NullRefs when serialized refs fail to persist across editor script runs. + +**Input System:** Set Active Input Handling to `Input System Package (New)` in Project Settings. Replaced `StandaloneInputModule` with `InputSystemUIInputModule` on EventSystem. -### In Progress 🔄 +**Packages added:** Cinemachine 3.1.4, TextMeshPro 3.2.0-pre.10, Burst 1.8.18 (pinned — Unity 6 template ships with a broken Burst version). -- Inspector references need wiring (Fenrir → Wire Scene References) +**Git:** Working on branch `chore/repo-setup`. Push with `git push origin chore/repo-setup`. -### Next Steps +**Result:** Player capsule visible, WASD movement working, Cinemachine camera follows player, `SceneValidator` confirms all critical refs found, 0 compile errors. -1. Run **Fenrir → Wire Scene References** — assigns all serialized field references in EmberForest -2. Add player mesh / capsule placeholder so character is visible -3. Configure Cinemachine FreeLook camera on Player -4. Bake NavMesh in EmberForest -5. First playtest — player should move with keyboard (WASD), combat with J/K/L keys -6. Switch to iOS build target, test on device -7. Phase 2: load configs from StreamingAssets at runtime (currently using C# defaults) +--- + +## Current Status + +**Phase 1 — Foundation:** ✅ Complete + +### Done ✅ +- Full design layer (all docs, all decisions locked) +- Full C# scaffold (61 files across 13 modules) +- Unity 6 LTS project, packages, assembly definitions +- 3 scenes in Build Settings (Bootstrap, Awakening, EmberForest) +- First playable — movement + camera working +- SceneValidator runtime guard +- Unit test framework wired (5 test files) +- CLAUDE.md for Claude Code CLI context + +### Phase 2 — Next Steps (priority order) + +1. **Run unit tests** — Window → Test Runner → EditMode → Run All (expect all green) +2. **Trait system smoke test** — add a `TraitDebugHUD` that shows live trait values in play mode; verify `DodgeUsedEvent` fires and `Patience` increases on Space key +3. **Spawn dummy enemy** — place an `EnemyBase` capsule in EmberForest, verify J-key attack reduces its HP and `LightAttackLandedEvent` fires +4. **Save round-trip** — play, move, quit, reopen scene, verify position/state restored +5. **iOS build target** — switch platform, set Bundle ID to `com.fenrir.game`, test on device +6. **Phase 2 proper** — load `TraitWeights.json` and `EvolutionSignatures.json` from StreamingAssets at runtime (currently using C# defaults); wire `EvolutionChecker` to shrine trigger --- diff --git a/ROADMAP.md b/ROADMAP.md index 2f98a54..4d63bce 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -11,23 +11,24 @@ - [x] World Design — Ember Forest (sub-zones, shrines, NPCs) - [x] All design questions closed -## Phase 1 — Repo / Foundation 🔄 IN PROGRESS +## Phase 1 — Repo / Foundation ✅ COMPLETE **Engine:** Unity 6 LTS | **Language:** C# | **Pipeline:** URP -- [ ] Unity project created, URP configured -- [ ] New Input System installed +- [x] Unity 6 LTS project created, URP (Mobile renderer) configured +- [x] New Input System installed and set as active input handler - [x] `_Project/` folder structure scaffolded - [x] Bootstrap scene + ServiceLocator skeleton - [x] `TraitProfile.cs` + `BehaviorEvent.cs` data models -- [x] `BehaviorEventBus.cs` +- [x] `BehaviorEventBus.cs` (with Unsubscribe support) - [x] `KeychainBridge.cs` + `KeychainPlugin.swift` stub - [x] `iCloudPlugin.swift` stub -- [x] `TraitWeights.json` + `EvolutionSignatures.json` + `EnemyDefinitions.json` config placeholders -- [x] `AudioManager.cs` + `MusicLayer.cs` + `SFXPool.cs` stubs -- [x] EditMode unit tests (TraitAccumulator, EvolutionChecker, ElementDistribution, TraitProfile) -- [ ] iOS build target configured (bundle ID, signing) -- [ ] CI: build validation on push to `develop` +- [x] `TraitWeights.json` + `EvolutionSignatures.json` + `EnemyDefinitions.json` +- [x] `AudioManager.cs` + `MusicLayer.cs` + `SFXPool.cs` +- [x] EditMode unit tests — 27 tests, 5 suites, all passing +- [x] iOS bundle ID set: `com.fenrir.projectfenrir` +- [x] CI: GitHub Actions — lint-docs + unity-build + editmode tests +- [x] First playable: player movement, Cinemachine camera, EmberForest scene wired ## Phase 2 — Architecture diff --git a/src/Assets/_Project/Scripts/Audio/AudioManager.cs b/src/Assets/_Project/Scripts/Audio/AudioManager.cs index f5e9488..e6c2fb2 100644 --- a/src/Assets/_Project/Scripts/Audio/AudioManager.cs +++ b/src/Assets/_Project/Scripts/Audio/AudioManager.cs @@ -31,7 +31,7 @@ private void Awake() private void Start() { - var cycle = FindFirstObjectByType(); + var cycle = FindAnyObjectByType(); if (cycle != null) cycle.OnPhaseChanged += OnPhaseChanged; BehaviorEventBus.Subscribe(_ => StopCombatMusic()); diff --git a/src/Assets/_Project/Scripts/Audio/MusicLayer.cs b/src/Assets/_Project/Scripts/Audio/MusicLayer.cs index 53b7149..619563a 100644 --- a/src/Assets/_Project/Scripts/Audio/MusicLayer.cs +++ b/src/Assets/_Project/Scripts/Audio/MusicLayer.cs @@ -12,6 +12,7 @@ public class MusicLayer : MonoBehaviour private Coroutine _fadeCoroutine; private void Reset() => _source = GetComponent(); + private void Awake() { if (_source == null) _source = GetComponent(); } public void CrossFade(AudioClip clip, float duration) { diff --git a/src/Assets/_Project/Scripts/Audio/SFXPool.cs b/src/Assets/_Project/Scripts/Audio/SFXPool.cs index e138c65..492962c 100644 --- a/src/Assets/_Project/Scripts/Audio/SFXPool.cs +++ b/src/Assets/_Project/Scripts/Audio/SFXPool.cs @@ -12,9 +12,19 @@ public class SFXPool : MonoBehaviour private void Awake() { + // If no prefab assigned, create a minimal AudioSource as the pool template + if (_prefab == null) + { + var go = new GameObject("SFX_Template"); + go.transform.SetParent(transform); + _prefab = go.AddComponent(); + _prefab.playOnAwake = false; + } + for (int i = 0; i < _poolSize; i++) { AudioSource source = Instantiate(_prefab, transform); + source.playOnAwake = false; source.gameObject.SetActive(false); _pool.Enqueue(source); } diff --git a/src/Assets/_Project/Scripts/Combat/CombatSystem.cs b/src/Assets/_Project/Scripts/Combat/CombatSystem.cs index ae7e2e1..8686175 100644 --- a/src/Assets/_Project/Scripts/Combat/CombatSystem.cs +++ b/src/Assets/_Project/Scripts/Combat/CombatSystem.cs @@ -19,7 +19,7 @@ public class CombatSystem : MonoBehaviour private void Awake() { - _playerCombat = FindFirstObjectByType(); + _playerCombat = FindAnyObjectByType(); } /// diff --git a/src/Assets/_Project/Scripts/Evolution/EvolutionSequencer.cs b/src/Assets/_Project/Scripts/Evolution/EvolutionSequencer.cs index 4afd082..e64d6e3 100644 --- a/src/Assets/_Project/Scripts/Evolution/EvolutionSequencer.cs +++ b/src/Assets/_Project/Scripts/Evolution/EvolutionSequencer.cs @@ -91,7 +91,7 @@ private IEnumerator RunSequence() private static void SetInputEnabled(bool enabled) { // Disable/enable via TouchMapper found in scene - var mapper = FindFirstObjectByType(); + var mapper = FindAnyObjectByType(); if (mapper != null) mapper.enabled = enabled; } } diff --git a/src/Assets/_Project/Scripts/UI/EnergyBar.cs b/src/Assets/_Project/Scripts/UI/EnergyBar.cs index c1b20d2..1f64e64 100644 --- a/src/Assets/_Project/Scripts/UI/EnergyBar.cs +++ b/src/Assets/_Project/Scripts/UI/EnergyBar.cs @@ -22,7 +22,7 @@ public class EnergyBar : MonoBehaviour private void Awake() { if (_energy == null) - _energy = FindFirstObjectByType(); + _energy = FindAnyObjectByType(); if (_energy != null) _energy.OnEnergyChanged += Refresh; diff --git a/src/Assets/_Project/Scripts/UI/HUD.cs b/src/Assets/_Project/Scripts/UI/HUD.cs index 76c8d5f..25dacc3 100644 --- a/src/Assets/_Project/Scripts/UI/HUD.cs +++ b/src/Assets/_Project/Scripts/UI/HUD.cs @@ -21,7 +21,7 @@ public class HUD : MonoBehaviour private void Awake() { if (_health == null) - _health = FindFirstObjectByType(); + _health = FindAnyObjectByType(); if (_health != null) { diff --git a/src/ProjectFenrir/ProjectSettings/ProjectSettings.asset b/src/ProjectFenrir/ProjectSettings/ProjectSettings.asset index 752f57d..9321d66 100644 --- a/src/ProjectFenrir/ProjectSettings/ProjectSettings.asset +++ b/src/ProjectFenrir/ProjectSettings/ProjectSettings.asset @@ -164,9 +164,9 @@ PlayerSettings: androidMaxAspectRatio: 2.4 androidMinAspectRatio: 1 applicationIdentifier: - Android: com.UnityTechnologies.com.unity.template.urpblank - Standalone: com.Unity-Technologies.com.unity.template.urp-blank - iPhone: com.Unity-Technologies.com.unity.template.urp-blank + Android: com.fenrir.projectfenrir + Standalone: com.fenrir.projectfenrir + iPhone: com.fenrir.projectfenrir buildNumber: Standalone: 0 VisionOS: 0 From 5a2e51fd1a7dc8d2a0b0f3dfb60aaa59a52387b7 Mon Sep 17 00:00:00 2001 From: Seni Date: Wed, 3 Jun 2026 08:12:51 -0700 Subject: [PATCH 05/27] feat(phase2): SceneRouter, AppStateMachine, GameLoop, CombatContext, enemy setup --- ROADMAP.md | 34 ++-- .../_Project/Scripts/Combat/CombatContext.cs | 101 ++++++++++ src/Assets/_Project/Scripts/Core/Bootstrap.cs | 183 +++++++++++------- src/Assets/_Project/Scripts/Core/GameLoop.cs | 83 ++++++++ .../_Project/Scripts/Core/SceneRouter.cs | 96 +++++++++ .../_Project/Scripts/Core/ServiceLocator.cs | 3 + .../Scripts/StateMachine/AppStateMachine.cs | 111 +++++++++++ .../_Project/Editor/FenrirEnemySetup.cs | 128 ++++++++++++ .../_Project/Scripts/Combat/CombatContext.cs | 101 ++++++++++ .../Assets/_Project/Scripts/Core/Bootstrap.cs | 182 ++++++++++------- .../Assets/_Project/Scripts/Core/GameLoop.cs | 83 ++++++++ .../_Project/Scripts/Core/SceneRouter.cs | 96 +++++++++ .../_Project/Scripts/Core/ServiceLocator.cs | 3 + .../Scripts/StateMachine/AppStateMachine.cs | 111 +++++++++++ 14 files changed, 1155 insertions(+), 160 deletions(-) create mode 100644 src/Assets/_Project/Scripts/Combat/CombatContext.cs create mode 100644 src/Assets/_Project/Scripts/Core/GameLoop.cs create mode 100644 src/Assets/_Project/Scripts/Core/SceneRouter.cs create mode 100644 src/Assets/_Project/Scripts/StateMachine/AppStateMachine.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Editor/FenrirEnemySetup.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatContext.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Core/GameLoop.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Core/SceneRouter.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/AppStateMachine.cs diff --git a/ROADMAP.md b/ROADMAP.md index 4d63bce..85fcacd 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -30,19 +30,29 @@ - [x] CI: GitHub Actions — lint-docs + unity-build + editmode tests - [x] First playable: player movement, Cinemachine camera, EmberForest scene wired -## Phase 2 — Architecture +## Phase 2 — Architecture 🔄 IN PROGRESS -- [ ] GameLoop, StateMachine, SceneRouter -- [ ] PlayerController (movement, camera) -- [ ] InputHandler (joystick + swipe mapping) -- [ ] EnemyBase + EnemyAI state machine -- [ ] CombatSystem (attack resolver, hit states, energy) -- [ ] TraitAccumulator + EvolutionChecker -- [ ] ShrineController -- [ ] DayNightCycle -- [ ] SaveManager (JSON + Keychain layers) -- [ ] AudioManager skeleton -- [ ] HUD skeleton (energy bar, health) +- [x] `SceneRouter` — async typed scene loading, App/GameState events +- [x] `AppStateMachine` — PlayerState transitions, valid-transition table +- [x] `GameLoop` — pause/resume, auto-save on app background/quit +- [x] `Bootstrap` — StreamingAssets JSON config loading, SceneRouter routing +- [x] `CombatContext` — active encounter tracking, trait events on combat end +- [x] `ServiceLocator.Unregister()` added +- [x] PlayerController (movement, Cinemachine camera) — first playable ✅ +- [x] InputHandler + GestureRecognizer + TouchMapper wired +- [x] EnemyBase + EnemyAI (NavMesh) — code complete, editor spawn script done +- [x] CombatSystem + AttackResolver + HitStateManager — code complete +- [x] TraitAccumulator + EvolutionChecker — code complete + unit tested +- [x] ShrineController — code complete +- [x] DayNightCycle — in EmberForest scene +- [x] SaveManager (JSON) — code complete + unit tested +- [x] AudioManager + MusicLayer + SFXPool — wired to DayNightCycle +- [x] HUD — EnergyBar + health bar code complete +- [ ] NavMesh baked in EmberForest +- [ ] First enemy alive in Play mode (Ash Wolf patrol + chase) +- [ ] Trait events firing live (dodge → Patience ↑ confirmed in logs) +- [ ] Save/Load round-trip verified in Play mode +- [ ] Bootstrap scene fully wired in Unity Inspector ## Phase 3 — MVP Gameplay diff --git a/src/Assets/_Project/Scripts/Combat/CombatContext.cs b/src/Assets/_Project/Scripts/Combat/CombatContext.cs new file mode 100644 index 0000000..8d455e0 --- /dev/null +++ b/src/Assets/_Project/Scripts/Combat/CombatContext.cs @@ -0,0 +1,101 @@ +using System.Collections.Generic; +using Fenrir.Core; +using Fenrir.Entities.Enemies; +using Fenrir.Save; +using Fenrir.StateMachine; +using Fenrir.Traits; +using UnityEngine; + +namespace Fenrir.Combat +{ + /// + /// Tracks the current combat encounter: which enemies are active, when combat + /// started, and how the player engaged. Emits trait events on combat end. + /// + /// Lives in the EmberForest scene. Registered with ServiceLocator on Awake. + /// + public class CombatContext : MonoBehaviour + { + private readonly HashSet _activeEnemies = new(); + private float _combatStartTime; + private bool _playerDodgedThisFight; + private int _hitsWithoutDodge; + + // ── Lifecycle ───────────────────────────────────────────────────────── + + private void Awake() + { + ServiceLocator.Register(this); + } + + private void OnDestroy() + { + ServiceLocator.Unregister(); + } + + // ── Enemy registration ──────────────────────────────────────────────── + + public void RegisterEnemy(EnemyBase enemy) + { + bool wasClear = _activeEnemies.Count == 0; + _activeEnemies.Add(enemy); + + if (wasClear) BeginCombat(); + } + + public void UnregisterEnemy(EnemyBase enemy) + { + _activeEnemies.Remove(enemy); + if (_activeEnemies.Count == 0) EndCombat(); + } + + // ── Player action tracking ──────────────────────────────────────────── + + public void RecordDodge() => _playerDodgedThisFight = true; + + public void RecordHitTakenNoDodge() + { + _hitsWithoutDodge++; + BehaviorEventBus.Emit(new HitTakenNoDodgeEvent()); + } + + // ── Internal ────────────────────────────────────────────────────────── + + private void BeginCombat() + { + _combatStartTime = Time.time; + _playerDodgedThisFight = false; + _hitsWithoutDodge = 0; + + if (ServiceLocator.TryGet(out var sm)) + sm.TrySetPlayerState(PlayerState.Idle); // let CombatSystem own state from here + + SceneRouter.SetGameState(GameState.Combat); + + if (ServiceLocator.TryGet(out var audio)) + audio.StartCombatMusic(); + + Debug.Log("[CombatContext] Combat started."); + } + + private void EndCombat() + { + float duration = Time.time - _combatStartTime; + + // Ambush: died within 5s of combat start (handled in PlayerHealth.OnDeath) + // Here we handle the survived-combat events + if (!_playerDodgedThisFight && _hitsWithoutDodge == 0) + BehaviorEventBus.Emit(new CombatCompletedNoDodgeEvent()); + + SceneRouter.SetGameState(GameState.Exploration); + + if (ServiceLocator.TryGet(out var audio)) + audio.StopCombatMusic(); + + if (ServiceLocator.TryGet(out var save)) + save.MarkDirty(); + + Debug.Log($"[CombatContext] Combat ended after {duration:F1}s."); + } + } +} diff --git a/src/Assets/_Project/Scripts/Core/Bootstrap.cs b/src/Assets/_Project/Scripts/Core/Bootstrap.cs index 56eb87c..f513ff5 100644 --- a/src/Assets/_Project/Scripts/Core/Bootstrap.cs +++ b/src/Assets/_Project/Scripts/Core/Bootstrap.cs @@ -1,131 +1,166 @@ +using System.IO; using System.Threading.Tasks; using Fenrir.Analytics; using Fenrir.Awakening; -using Fenrir.Core; +using Fenrir.Config; using Fenrir.Evolution; using Fenrir.Save; +using Fenrir.StateMachine; using Fenrir.Traits; using UnityEngine; -using UnityEngine.SceneManagement; namespace Fenrir.Core { /// - /// Scene index 0. Bootstraps all services and routes to the correct first scene. - /// Marked DontDestroyOnLoad — never unloaded during a session. + /// Scene index 0. Bootstraps all services, loads configs from StreamingAssets, + /// then routes to the correct first scene via SceneRouter. + /// Marked DontDestroyOnLoad — lives for the entire session. /// + [RequireComponent(typeof(AppStateMachine))] + [RequireComponent(typeof(GameLoop))] public class Bootstrap : MonoBehaviour { - [SerializeField] private string _mainMenuScene = "MainMenu"; - [SerializeField] private string _awakeningScene = "Awakening"; - [SerializeField] private string _gameScene = "EmberForest"; - private async void Start() { DontDestroyOnLoad(gameObject); RegisterServices(); await LoadSaveData(); - RouteToInitialScene(); + await RouteToInitialSceneAsync(); } + // ── Service registration ────────────────────────────────────────────── + private void RegisterServices() { + // Core loop + ServiceLocator.Register(GetComponent()); + ServiceLocator.Register(GetComponent()); + // Save - var saveManager = new SaveManager(); - ServiceLocator.Register(saveManager); + ServiceLocator.Register(new SaveManager()); // Awakening ServiceLocator.Register(new ElementSeedService()); - // Load configs from StreamingAssets at runtime - // (Full implementation in Phase 2 — stubs for now) - var evolutionConfig = new EvolutionSignaturesConfig(); - var traitWeights = new TraitWeightsConfig(); + // Config — load JSON from StreamingAssets; fall back to C# defaults + TraitWeightsConfig traitWeights = LoadConfig("TraitWeights.json") + ?? new TraitWeightsConfig(); + EvolutionSignaturesConfig evolutionConfig = LoadConfig("EvolutionSignatures.json") + ?? new EvolutionSignaturesConfig(); - // Evolution - var evolutionChecker = new EvolutionChecker(evolutionConfig); - ServiceLocator.Register(evolutionChecker); - - // Traits — profile comes from save; accumulator wired after load ServiceLocator.Register(traitWeights); + // Evolution + ServiceLocator.Register(new EvolutionChecker(evolutionConfig)); + // Analytics - var logger = new EventLogger(verbose: Debug.isDebugBuild); - ServiceLocator.Register(logger); + ServiceLocator.Register(new EventLogger(verbose: Debug.isDebugBuild)); Debug.Log("[Bootstrap] Services registered."); } + // ── Save loading ────────────────────────────────────────────────────── + private async Task LoadSaveData() { ISaveManager save = ServiceLocator.Get(); bool loaded = await save.LoadAsync(); + // Wire accumulator only when there is a save to load from. + // New players get their accumulator created after Awakening. if (loaded) - { - // Wire TraitAccumulator to the loaded profile - var accumulator = new TraitAccumulator( - save.Current.Character.Traits, - ServiceLocator.Get(), - ServiceLocator.Get() - ); - ServiceLocator.Register(accumulator); - - // Subscribe accumulator to each concrete event type. - // (Bus is keyed by concrete type — base-type subscription doesn't propagate.) - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - } + WireTraitAccumulator(save.Current.Character.Traits); Debug.Log($"[Bootstrap] Save loaded: {loaded}"); } - private void RouteToInitialScene() + private void WireTraitAccumulator(Traits.TraitProfile profile) + { + var accumulator = new TraitAccumulator( + profile, + ServiceLocator.Get(), + ServiceLocator.Get() + ); + ServiceLocator.Register(accumulator); + + // Subscribe to every concrete event type (bus is keyed by concrete type) + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + } + + // ── Scene routing ───────────────────────────────────────────────────── + + private static async Task RouteToInitialSceneAsync() { ISaveManager save = ServiceLocator.Get(); if (!save.Current.Character.HasAwakened) { - SceneManager.LoadScene(_awakeningScene); + await SceneRouter.LoadAwakeningAsync(); return; } - // Resume at last known game state - SceneManager.LoadScene(_gameScene); + await SceneRouter.LoadGameAsync(); + } + + // ── Config loader ───────────────────────────────────────────────────── + + private static T LoadConfig(string fileName) where T : class + { + string path = Path.Combine(Application.streamingAssetsPath, "Config", fileName); + + if (!File.Exists(path)) + { + Debug.LogWarning($"[Bootstrap] Config not found at {path} — using C# defaults."); + return null; + } + + try + { + string json = File.ReadAllText(path); + T config = JsonUtility.FromJson(json); + Debug.Log($"[Bootstrap] Loaded config: {fileName}"); + return config; + } + catch (System.Exception ex) + { + Debug.LogError($"[Bootstrap] Failed to parse {fileName}: {ex.Message}"); + return null; + } } } } diff --git a/src/Assets/_Project/Scripts/Core/GameLoop.cs b/src/Assets/_Project/Scripts/Core/GameLoop.cs new file mode 100644 index 0000000..f43d9e3 --- /dev/null +++ b/src/Assets/_Project/Scripts/Core/GameLoop.cs @@ -0,0 +1,83 @@ +using Fenrir.Save; +using Fenrir.StateMachine; +using Fenrir.Traits; +using UnityEngine; + +namespace Fenrir.Core +{ + /// + /// Drives the top-level game loop: + /// - Pause / resume (sets Time.timeScale) + /// - Application focus / pause → auto-save + /// - Scene unload → BehaviorEventBus.Clear() + /// + /// Attach to the Bootstrap GameObject (DontDestroyOnLoad). + /// Registered with ServiceLocator in Bootstrap. + /// + public class GameLoop : MonoBehaviour + { + public bool IsPaused { get; private set; } + + // ── Pause / Resume ──────────────────────────────────────────────────── + + public void Pause() + { + if (IsPaused) return; + IsPaused = true; + Time.timeScale = 0f; + SceneRouter.OnAppStateChanged?.Invoke(AppState.Paused); + Debug.Log("[GameLoop] Paused"); + } + + public void Resume() + { + if (!IsPaused) return; + IsPaused = false; + Time.timeScale = 1f; + SceneRouter.OnAppStateChanged?.Invoke(AppState.InGame); + Debug.Log("[GameLoop] Resumed"); + } + + public void TogglePause() + { + if (IsPaused) Resume(); else Pause(); + } + + // ── Application lifecycle ───────────────────────────────────────────── + + private void OnApplicationPause(bool paused) + { + if (paused) SaveAndClearBus(); + } + + private void OnApplicationFocus(bool focused) + { + if (!focused) SaveAndClearBus(); + } + + private void OnApplicationQuit() + { + SaveAndClearBus(); + } + + // ── Scene unload ────────────────────────────────────────────────────── + + private void OnDestroy() + { + // Only clear bus when the Bootstrap object itself is destroyed + // (i.e. the full session is ending — not mid-game scene transitions). + } + + // ── Helpers ─────────────────────────────────────────────────────────── + + private static async void SaveAndClearBus() + { + if (!ServiceLocator.TryGet(out ISaveManager save)) return; + if (save.IsDirty) + { + await save.SaveAsync(); + Debug.Log("[GameLoop] Auto-saved on pause/quit."); + } + } + } +} diff --git a/src/Assets/_Project/Scripts/Core/SceneRouter.cs b/src/Assets/_Project/Scripts/Core/SceneRouter.cs new file mode 100644 index 0000000..91cf0b3 --- /dev/null +++ b/src/Assets/_Project/Scripts/Core/SceneRouter.cs @@ -0,0 +1,96 @@ +using System; +using System.Threading.Tasks; +using Fenrir.StateMachine; +using UnityEngine; +using UnityEngine.SceneManagement; + +namespace Fenrir.Core +{ + /// + /// Typed async scene router. All navigation goes through here — never call + /// SceneManager.LoadScene directly from game code. + /// + /// Fires before every transition so systems + /// (audio, HUD, AI) can react without coupling to scene names. + /// + public static class SceneRouter + { + // ── Scene name constants ────────────────────────────────────────────── + public const string SceneBootstrap = "Bootstrap"; + public const string SceneMainMenu = "MainMenu"; + public const string SceneAwakening = "Awakening"; + public const string SceneEmberForest = "EmberForest"; + + // ── State ───────────────────────────────────────────────────────────── + public static AppState CurrentAppState { get; private set; } = AppState.Booting; + public static GameState CurrentGameState { get; private set; } = GameState.Exploration; + + // ── Events ──────────────────────────────────────────────────────────── + public static event Action OnAppStateChanged; + public static event Action OnGameStateChanged; + public static event Action OnSceneLoadStarted; + public static event Action OnSceneLoadComplete; + + // ── Navigation ──────────────────────────────────────────────────────── + + public static async Task LoadMainMenuAsync() + { + await TransitionAsync(SceneMainMenu, AppState.MainMenu); + } + + public static async Task LoadAwakeningAsync() + { + await TransitionAsync(SceneAwakening, AppState.InGame, GameState.Awakening); + } + + public static async Task LoadGameAsync() + { + await TransitionAsync(SceneEmberForest, AppState.InGame, GameState.Exploration); + } + + public static void SetGameState(GameState state) + { + if (CurrentGameState == state) return; + CurrentGameState = state; + OnGameStateChanged?.Invoke(state); + } + + // ── Internal ────────────────────────────────────────────────────────── + + private static async Task TransitionAsync( + string sceneName, + AppState nextAppState, + GameState nextGameState = GameState.Exploration) + { + if (CurrentAppState == AppState.Loading) return; // Guard re-entrant calls + + SetAppState(AppState.Loading); + OnSceneLoadStarted?.Invoke(); + + AsyncOperation op = SceneManager.LoadSceneAsync(sceneName); + op.allowSceneActivation = false; + + // Wait until Unity has loaded >90% (scene data ready, not yet activated) + while (op.progress < 0.9f) + await Task.Yield(); + + op.allowSceneActivation = true; + + // Wait one more frame for Awake/Start to fire + await Task.Yield(); + + SetAppState(nextAppState); + SetGameState(nextGameState); + OnSceneLoadComplete?.Invoke(); + + Debug.Log($"[SceneRouter] → {sceneName} | App:{nextAppState} Game:{nextGameState}"); + } + + private static void SetAppState(AppState state) + { + if (CurrentAppState == state) return; + CurrentAppState = state; + OnAppStateChanged?.Invoke(state); + } + } +} diff --git a/src/Assets/_Project/Scripts/Core/ServiceLocator.cs b/src/Assets/_Project/Scripts/Core/ServiceLocator.cs index 04c750c..16cc13f 100644 --- a/src/Assets/_Project/Scripts/Core/ServiceLocator.cs +++ b/src/Assets/_Project/Scripts/Core/ServiceLocator.cs @@ -41,6 +41,9 @@ public static bool TryGet(out T service) where T : class return false; } + public static void Unregister() where T : class => + _services.Remove(typeof(T)); + /// Call in tests or on full app reset. public static void Clear() => _services.Clear(); } diff --git a/src/Assets/_Project/Scripts/StateMachine/AppStateMachine.cs b/src/Assets/_Project/Scripts/StateMachine/AppStateMachine.cs new file mode 100644 index 0000000..14dbcab --- /dev/null +++ b/src/Assets/_Project/Scripts/StateMachine/AppStateMachine.cs @@ -0,0 +1,111 @@ +using System; +using Fenrir.Core; +using UnityEngine; + +namespace Fenrir.StateMachine +{ + /// + /// Singleton MonoBehaviour service. Owns PlayerState and listens to SceneRouter + /// for App/GameState. Fires typed events so any system can react without polling. + /// + /// Registered with ServiceLocator in Bootstrap — access via + /// ServiceLocator.Get<AppStateMachine>() + /// + public class AppStateMachine : MonoBehaviour + { + // ── Player state ────────────────────────────────────────────────────── + public PlayerState PlayerState { get; private set; } = PlayerState.Idle; + + public event Action OnPlayerStateChanged; + + // ── Convenience pass-throughs ───────────────────────────────────────── + public AppState AppState => SceneRouter.CurrentAppState; + public GameState GameState => SceneRouter.CurrentGameState; + + // ── Lifecycle ───────────────────────────────────────────────────────── + + private void OnEnable() + { + SceneRouter.OnAppStateChanged += HandleAppStateChanged; + SceneRouter.OnGameStateChanged += HandleGameStateChanged; + } + + private void OnDisable() + { + SceneRouter.OnAppStateChanged -= HandleAppStateChanged; + SceneRouter.OnGameStateChanged -= HandleGameStateChanged; + } + + // ── Player state transitions ────────────────────────────────────────── + + /// + /// Request a player state transition. Ignored if the transition is illegal. + /// Returns true if the transition was applied. + /// + public bool TrySetPlayerState(PlayerState next) + { + if (!IsValidTransition(PlayerState, next)) + { + Debug.LogWarning($"[AppStateMachine] Invalid player transition: {PlayerState} → {next}"); + return false; + } + + PlayerState prev = PlayerState; + PlayerState = next; + OnPlayerStateChanged?.Invoke(next); + Debug.Log($"[AppStateMachine] Player: {prev} → {next}"); + return true; + } + + public bool IsPlayerBusy() + { + return PlayerState is PlayerState.Attacking + or PlayerState.Dodging + or PlayerState.Staggered + or PlayerState.Dead + or PlayerState.InEvolution; + } + + public bool CanPlayerAct() + { + return GameState == GameState.Exploration || GameState == GameState.Combat + && PlayerState is PlayerState.Idle or PlayerState.Moving; + } + + // ── Transition table ────────────────────────────────────────────────── + + private static bool IsValidTransition(PlayerState from, PlayerState to) + { + // Dead is terminal until respawn logic explicitly resets to Idle + if (from == PlayerState.Dead && to != PlayerState.Idle) + return false; + + // Evolution is terminal until the sequencer completes it + if (from == PlayerState.InEvolution && to != PlayerState.Idle) + return false; + + // Can always go to Dead from any fighting state + if (to == PlayerState.Dead) + return from != PlayerState.Dead; + + return true; // All other transitions permitted + } + + // ── App / Game state listeners ──────────────────────────────────────── + + private void HandleAppStateChanged(AppState state) + { + if (state == AppState.Loading) + TrySetPlayerState(PlayerState.Idle); + } + + private void HandleGameStateChanged(GameState state) + { + // When a cutscene or dialogue starts, lock the player + if (state is GameState.Cutscene or GameState.Dialogue or GameState.Evolution) + TrySetPlayerState(PlayerState.InDialogue); + else if (state == GameState.Exploration) + TrySetPlayerState(PlayerState.Idle); + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirEnemySetup.cs b/src/ProjectFenrir/Assets/_Project/Editor/FenrirEnemySetup.cs new file mode 100644 index 0000000..a84d942 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Editor/FenrirEnemySetup.cs @@ -0,0 +1,128 @@ +using Fenrir.Entities.Enemies; +using UnityEditor; +using UnityEngine; +using UnityEngine.AI; + +namespace Fenrir.Editor +{ + /// + /// Fenrir → Setup → Spawn Ash Wolf + /// Creates an Ash Wolf enemy at the scene origin, fully wired: + /// EnemyBase, EnemyHealth, EnemyAI, EnemyCombat, EnemyTraitEmitter, NavMeshAgent, Collider. + /// + public static class FenrirEnemySetup + { + [MenuItem("Fenrir/Setup/Spawn Ash Wolf")] + public static GameObject SpawnAshWolf() + { + return SpawnEnemy( + displayName: "AshWolf", + spawnPos: new Vector3(5f, 0f, 5f), + maxHealth: 80f, + baseAttack: 12f, + moveSpeed: 4.5f, + aggroRange: 8f, + attackRange: 1.8f + ); + } + + [MenuItem("Fenrir/Setup/Spawn Flame Sprite")] + public static GameObject SpawnFlameSprite() + { + return SpawnEnemy( + displayName: "FlameSprite", + spawnPos: new Vector3(-5f, 0f, 5f), + maxHealth: 45f, + baseAttack: 8f, + moveSpeed: 6f, + aggroRange: 10f, + attackRange: 5f + ); + } + + // ── Internal ────────────────────────────────────────────────────────── + + private static GameObject SpawnEnemy( + string displayName, + Vector3 spawnPos, + float maxHealth, + float baseAttack, + float moveSpeed, + float aggroRange, + float attackRange) + { + var go = GameObject.CreatePrimitive(PrimitiveType.Capsule); + go.name = displayName; + go.tag = "Enemy"; + go.transform.position = spawnPos; + + // Tint enemy red so it's visually distinct from the player + var renderer = go.GetComponent(); + if (renderer != null) + { + renderer.sharedMaterial = new Material(Shader.Find("Universal Render Pipeline/Lit")); + renderer.sharedMaterial.color = new Color(0.8f, 0.2f, 0.1f); + } + + // NavMeshAgent + NavMeshAgent agent = go.AddComponent(); + agent.speed = moveSpeed; + agent.stoppingDistance = attackRange * 0.8f; + agent.radius = 0.4f; + agent.height = 2f; + + // Rigidbody (kinematic — movement is NavMesh-driven) + Rigidbody rb = go.AddComponent(); + rb.isKinematic = true; + rb.useGravity = false; + + // Enemy component stack + EnemyBase enemyBase = go.AddComponent(); + EnemyHealth health = go.AddComponent(); + EnemyCombat combat = go.AddComponent(); + EnemyAI ai = go.AddComponent(); + EnemyTraitEmitter traitEmitter = go.AddComponent(); + + // Serialised field values via SerializedObject (survives domain reload) + SetSerializedFields(go, health, maxHealth, combat, baseAttack, ai, aggroRange, attackRange); + + Undo.RegisterCreatedObjectUndo(go, $"Spawn {displayName}"); + Selection.activeGameObject = go; + + Debug.Log($"[FenrirEnemySetup] Spawned {displayName} at {spawnPos}. " + + "Bake NavMesh before entering Play mode (Window → AI → Navigation → Bake)."); + + return go; + } + + private static void SetSerializedFields( + GameObject go, + EnemyHealth health, float maxHp, + EnemyCombat combat, float atk, + EnemyAI ai, float aggro, float atkRange) + { + // Use SerializedObject so Undo/Redo and Prefab workflows work correctly + SerializedObject soHealth = new SerializedObject(health); + soHealth.FindProperty("_maxHealth")?.SetValue(maxHp); + soHealth.ApplyModifiedProperties(); + + SerializedObject soCombat = new SerializedObject(combat); + soCombat.FindProperty("_baseAttack")?.SetValue(atk); + soCombat.ApplyModifiedProperties(); + + SerializedObject soAi = new SerializedObject(ai); + soAi.FindProperty("_aggroRange")?.SetValue(aggro); + soAi.FindProperty("_attackRange")?.SetValue(atkRange); + soAi.ApplyModifiedProperties(); + } + } + + // Extension so FindProperty().SetValue() reads cleanly + internal static class SerializedPropertyExt + { + internal static void SetValue(this SerializedProperty prop, float value) + { + if (prop != null) prop.floatValue = value; + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatContext.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatContext.cs new file mode 100644 index 0000000..8d455e0 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatContext.cs @@ -0,0 +1,101 @@ +using System.Collections.Generic; +using Fenrir.Core; +using Fenrir.Entities.Enemies; +using Fenrir.Save; +using Fenrir.StateMachine; +using Fenrir.Traits; +using UnityEngine; + +namespace Fenrir.Combat +{ + /// + /// Tracks the current combat encounter: which enemies are active, when combat + /// started, and how the player engaged. Emits trait events on combat end. + /// + /// Lives in the EmberForest scene. Registered with ServiceLocator on Awake. + /// + public class CombatContext : MonoBehaviour + { + private readonly HashSet _activeEnemies = new(); + private float _combatStartTime; + private bool _playerDodgedThisFight; + private int _hitsWithoutDodge; + + // ── Lifecycle ───────────────────────────────────────────────────────── + + private void Awake() + { + ServiceLocator.Register(this); + } + + private void OnDestroy() + { + ServiceLocator.Unregister(); + } + + // ── Enemy registration ──────────────────────────────────────────────── + + public void RegisterEnemy(EnemyBase enemy) + { + bool wasClear = _activeEnemies.Count == 0; + _activeEnemies.Add(enemy); + + if (wasClear) BeginCombat(); + } + + public void UnregisterEnemy(EnemyBase enemy) + { + _activeEnemies.Remove(enemy); + if (_activeEnemies.Count == 0) EndCombat(); + } + + // ── Player action tracking ──────────────────────────────────────────── + + public void RecordDodge() => _playerDodgedThisFight = true; + + public void RecordHitTakenNoDodge() + { + _hitsWithoutDodge++; + BehaviorEventBus.Emit(new HitTakenNoDodgeEvent()); + } + + // ── Internal ────────────────────────────────────────────────────────── + + private void BeginCombat() + { + _combatStartTime = Time.time; + _playerDodgedThisFight = false; + _hitsWithoutDodge = 0; + + if (ServiceLocator.TryGet(out var sm)) + sm.TrySetPlayerState(PlayerState.Idle); // let CombatSystem own state from here + + SceneRouter.SetGameState(GameState.Combat); + + if (ServiceLocator.TryGet(out var audio)) + audio.StartCombatMusic(); + + Debug.Log("[CombatContext] Combat started."); + } + + private void EndCombat() + { + float duration = Time.time - _combatStartTime; + + // Ambush: died within 5s of combat start (handled in PlayerHealth.OnDeath) + // Here we handle the survived-combat events + if (!_playerDodgedThisFight && _hitsWithoutDodge == 0) + BehaviorEventBus.Emit(new CombatCompletedNoDodgeEvent()); + + SceneRouter.SetGameState(GameState.Exploration); + + if (ServiceLocator.TryGet(out var audio)) + audio.StopCombatMusic(); + + if (ServiceLocator.TryGet(out var save)) + save.MarkDirty(); + + Debug.Log($"[CombatContext] Combat ended after {duration:F1}s."); + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Core/Bootstrap.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Core/Bootstrap.cs index 403840d..f513ff5 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Core/Bootstrap.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Core/Bootstrap.cs @@ -1,132 +1,166 @@ +using System.IO; using System.Threading.Tasks; using Fenrir.Analytics; using Fenrir.Awakening; using Fenrir.Config; -using Fenrir.Core; using Fenrir.Evolution; using Fenrir.Save; +using Fenrir.StateMachine; using Fenrir.Traits; using UnityEngine; -using UnityEngine.SceneManagement; namespace Fenrir.Core { /// - /// Scene index 0. Bootstraps all services and routes to the correct first scene. - /// Marked DontDestroyOnLoad — never unloaded during a session. + /// Scene index 0. Bootstraps all services, loads configs from StreamingAssets, + /// then routes to the correct first scene via SceneRouter. + /// Marked DontDestroyOnLoad — lives for the entire session. /// + [RequireComponent(typeof(AppStateMachine))] + [RequireComponent(typeof(GameLoop))] public class Bootstrap : MonoBehaviour { - [SerializeField] private string _mainMenuScene = "MainMenu"; - [SerializeField] private string _awakeningScene = "Awakening"; - [SerializeField] private string _gameScene = "EmberForest"; - private async void Start() { DontDestroyOnLoad(gameObject); RegisterServices(); await LoadSaveData(); - RouteToInitialScene(); + await RouteToInitialSceneAsync(); } + // ── Service registration ────────────────────────────────────────────── + private void RegisterServices() { + // Core loop + ServiceLocator.Register(GetComponent()); + ServiceLocator.Register(GetComponent()); + // Save - var saveManager = new SaveManager(); - ServiceLocator.Register(saveManager); + ServiceLocator.Register(new SaveManager()); // Awakening ServiceLocator.Register(new ElementSeedService()); - // Load configs from StreamingAssets at runtime - // (Full implementation in Phase 2 — stubs for now) - var evolutionConfig = new EvolutionSignaturesConfig(); - var traitWeights = new TraitWeightsConfig(); + // Config — load JSON from StreamingAssets; fall back to C# defaults + TraitWeightsConfig traitWeights = LoadConfig("TraitWeights.json") + ?? new TraitWeightsConfig(); + EvolutionSignaturesConfig evolutionConfig = LoadConfig("EvolutionSignatures.json") + ?? new EvolutionSignaturesConfig(); - // Evolution - var evolutionChecker = new EvolutionChecker(evolutionConfig); - ServiceLocator.Register(evolutionChecker); - - // Traits — profile comes from save; accumulator wired after load ServiceLocator.Register(traitWeights); + // Evolution + ServiceLocator.Register(new EvolutionChecker(evolutionConfig)); + // Analytics - var logger = new EventLogger(verbose: Debug.isDebugBuild); - ServiceLocator.Register(logger); + ServiceLocator.Register(new EventLogger(verbose: Debug.isDebugBuild)); Debug.Log("[Bootstrap] Services registered."); } + // ── Save loading ────────────────────────────────────────────────────── + private async Task LoadSaveData() { ISaveManager save = ServiceLocator.Get(); bool loaded = await save.LoadAsync(); + // Wire accumulator only when there is a save to load from. + // New players get their accumulator created after Awakening. if (loaded) - { - // Wire TraitAccumulator to the loaded profile - var accumulator = new TraitAccumulator( - save.Current.Character.Traits, - ServiceLocator.Get(), - ServiceLocator.Get() - ); - ServiceLocator.Register(accumulator); - - // Subscribe accumulator to each concrete event type. - // (Bus is keyed by concrete type — base-type subscription doesn't propagate.) - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - BehaviorEventBus.Subscribe(accumulator.Process); - } + WireTraitAccumulator(save.Current.Character.Traits); Debug.Log($"[Bootstrap] Save loaded: {loaded}"); } - private void RouteToInitialScene() + private void WireTraitAccumulator(Traits.TraitProfile profile) + { + var accumulator = new TraitAccumulator( + profile, + ServiceLocator.Get(), + ServiceLocator.Get() + ); + ServiceLocator.Register(accumulator); + + // Subscribe to every concrete event type (bus is keyed by concrete type) + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + BehaviorEventBus.Subscribe(accumulator.Process); + } + + // ── Scene routing ───────────────────────────────────────────────────── + + private static async Task RouteToInitialSceneAsync() { ISaveManager save = ServiceLocator.Get(); if (!save.Current.Character.HasAwakened) { - SceneManager.LoadScene(_awakeningScene); + await SceneRouter.LoadAwakeningAsync(); return; } - // Resume at last known game state - SceneManager.LoadScene(_gameScene); + await SceneRouter.LoadGameAsync(); + } + + // ── Config loader ───────────────────────────────────────────────────── + + private static T LoadConfig(string fileName) where T : class + { + string path = Path.Combine(Application.streamingAssetsPath, "Config", fileName); + + if (!File.Exists(path)) + { + Debug.LogWarning($"[Bootstrap] Config not found at {path} — using C# defaults."); + return null; + } + + try + { + string json = File.ReadAllText(path); + T config = JsonUtility.FromJson(json); + Debug.Log($"[Bootstrap] Loaded config: {fileName}"); + return config; + } + catch (System.Exception ex) + { + Debug.LogError($"[Bootstrap] Failed to parse {fileName}: {ex.Message}"); + return null; + } } } } diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Core/GameLoop.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Core/GameLoop.cs new file mode 100644 index 0000000..f43d9e3 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Core/GameLoop.cs @@ -0,0 +1,83 @@ +using Fenrir.Save; +using Fenrir.StateMachine; +using Fenrir.Traits; +using UnityEngine; + +namespace Fenrir.Core +{ + /// + /// Drives the top-level game loop: + /// - Pause / resume (sets Time.timeScale) + /// - Application focus / pause → auto-save + /// - Scene unload → BehaviorEventBus.Clear() + /// + /// Attach to the Bootstrap GameObject (DontDestroyOnLoad). + /// Registered with ServiceLocator in Bootstrap. + /// + public class GameLoop : MonoBehaviour + { + public bool IsPaused { get; private set; } + + // ── Pause / Resume ──────────────────────────────────────────────────── + + public void Pause() + { + if (IsPaused) return; + IsPaused = true; + Time.timeScale = 0f; + SceneRouter.OnAppStateChanged?.Invoke(AppState.Paused); + Debug.Log("[GameLoop] Paused"); + } + + public void Resume() + { + if (!IsPaused) return; + IsPaused = false; + Time.timeScale = 1f; + SceneRouter.OnAppStateChanged?.Invoke(AppState.InGame); + Debug.Log("[GameLoop] Resumed"); + } + + public void TogglePause() + { + if (IsPaused) Resume(); else Pause(); + } + + // ── Application lifecycle ───────────────────────────────────────────── + + private void OnApplicationPause(bool paused) + { + if (paused) SaveAndClearBus(); + } + + private void OnApplicationFocus(bool focused) + { + if (!focused) SaveAndClearBus(); + } + + private void OnApplicationQuit() + { + SaveAndClearBus(); + } + + // ── Scene unload ────────────────────────────────────────────────────── + + private void OnDestroy() + { + // Only clear bus when the Bootstrap object itself is destroyed + // (i.e. the full session is ending — not mid-game scene transitions). + } + + // ── Helpers ─────────────────────────────────────────────────────────── + + private static async void SaveAndClearBus() + { + if (!ServiceLocator.TryGet(out ISaveManager save)) return; + if (save.IsDirty) + { + await save.SaveAsync(); + Debug.Log("[GameLoop] Auto-saved on pause/quit."); + } + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Core/SceneRouter.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Core/SceneRouter.cs new file mode 100644 index 0000000..91cf0b3 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Core/SceneRouter.cs @@ -0,0 +1,96 @@ +using System; +using System.Threading.Tasks; +using Fenrir.StateMachine; +using UnityEngine; +using UnityEngine.SceneManagement; + +namespace Fenrir.Core +{ + /// + /// Typed async scene router. All navigation goes through here — never call + /// SceneManager.LoadScene directly from game code. + /// + /// Fires before every transition so systems + /// (audio, HUD, AI) can react without coupling to scene names. + /// + public static class SceneRouter + { + // ── Scene name constants ────────────────────────────────────────────── + public const string SceneBootstrap = "Bootstrap"; + public const string SceneMainMenu = "MainMenu"; + public const string SceneAwakening = "Awakening"; + public const string SceneEmberForest = "EmberForest"; + + // ── State ───────────────────────────────────────────────────────────── + public static AppState CurrentAppState { get; private set; } = AppState.Booting; + public static GameState CurrentGameState { get; private set; } = GameState.Exploration; + + // ── Events ──────────────────────────────────────────────────────────── + public static event Action OnAppStateChanged; + public static event Action OnGameStateChanged; + public static event Action OnSceneLoadStarted; + public static event Action OnSceneLoadComplete; + + // ── Navigation ──────────────────────────────────────────────────────── + + public static async Task LoadMainMenuAsync() + { + await TransitionAsync(SceneMainMenu, AppState.MainMenu); + } + + public static async Task LoadAwakeningAsync() + { + await TransitionAsync(SceneAwakening, AppState.InGame, GameState.Awakening); + } + + public static async Task LoadGameAsync() + { + await TransitionAsync(SceneEmberForest, AppState.InGame, GameState.Exploration); + } + + public static void SetGameState(GameState state) + { + if (CurrentGameState == state) return; + CurrentGameState = state; + OnGameStateChanged?.Invoke(state); + } + + // ── Internal ────────────────────────────────────────────────────────── + + private static async Task TransitionAsync( + string sceneName, + AppState nextAppState, + GameState nextGameState = GameState.Exploration) + { + if (CurrentAppState == AppState.Loading) return; // Guard re-entrant calls + + SetAppState(AppState.Loading); + OnSceneLoadStarted?.Invoke(); + + AsyncOperation op = SceneManager.LoadSceneAsync(sceneName); + op.allowSceneActivation = false; + + // Wait until Unity has loaded >90% (scene data ready, not yet activated) + while (op.progress < 0.9f) + await Task.Yield(); + + op.allowSceneActivation = true; + + // Wait one more frame for Awake/Start to fire + await Task.Yield(); + + SetAppState(nextAppState); + SetGameState(nextGameState); + OnSceneLoadComplete?.Invoke(); + + Debug.Log($"[SceneRouter] → {sceneName} | App:{nextAppState} Game:{nextGameState}"); + } + + private static void SetAppState(AppState state) + { + if (CurrentAppState == state) return; + CurrentAppState = state; + OnAppStateChanged?.Invoke(state); + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Core/ServiceLocator.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Core/ServiceLocator.cs index 04c750c..16cc13f 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Core/ServiceLocator.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Core/ServiceLocator.cs @@ -41,6 +41,9 @@ public static bool TryGet(out T service) where T : class return false; } + public static void Unregister() where T : class => + _services.Remove(typeof(T)); + /// Call in tests or on full app reset. public static void Clear() => _services.Clear(); } diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/AppStateMachine.cs b/src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/AppStateMachine.cs new file mode 100644 index 0000000..14dbcab --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/AppStateMachine.cs @@ -0,0 +1,111 @@ +using System; +using Fenrir.Core; +using UnityEngine; + +namespace Fenrir.StateMachine +{ + /// + /// Singleton MonoBehaviour service. Owns PlayerState and listens to SceneRouter + /// for App/GameState. Fires typed events so any system can react without polling. + /// + /// Registered with ServiceLocator in Bootstrap — access via + /// ServiceLocator.Get<AppStateMachine>() + /// + public class AppStateMachine : MonoBehaviour + { + // ── Player state ────────────────────────────────────────────────────── + public PlayerState PlayerState { get; private set; } = PlayerState.Idle; + + public event Action OnPlayerStateChanged; + + // ── Convenience pass-throughs ───────────────────────────────────────── + public AppState AppState => SceneRouter.CurrentAppState; + public GameState GameState => SceneRouter.CurrentGameState; + + // ── Lifecycle ───────────────────────────────────────────────────────── + + private void OnEnable() + { + SceneRouter.OnAppStateChanged += HandleAppStateChanged; + SceneRouter.OnGameStateChanged += HandleGameStateChanged; + } + + private void OnDisable() + { + SceneRouter.OnAppStateChanged -= HandleAppStateChanged; + SceneRouter.OnGameStateChanged -= HandleGameStateChanged; + } + + // ── Player state transitions ────────────────────────────────────────── + + /// + /// Request a player state transition. Ignored if the transition is illegal. + /// Returns true if the transition was applied. + /// + public bool TrySetPlayerState(PlayerState next) + { + if (!IsValidTransition(PlayerState, next)) + { + Debug.LogWarning($"[AppStateMachine] Invalid player transition: {PlayerState} → {next}"); + return false; + } + + PlayerState prev = PlayerState; + PlayerState = next; + OnPlayerStateChanged?.Invoke(next); + Debug.Log($"[AppStateMachine] Player: {prev} → {next}"); + return true; + } + + public bool IsPlayerBusy() + { + return PlayerState is PlayerState.Attacking + or PlayerState.Dodging + or PlayerState.Staggered + or PlayerState.Dead + or PlayerState.InEvolution; + } + + public bool CanPlayerAct() + { + return GameState == GameState.Exploration || GameState == GameState.Combat + && PlayerState is PlayerState.Idle or PlayerState.Moving; + } + + // ── Transition table ────────────────────────────────────────────────── + + private static bool IsValidTransition(PlayerState from, PlayerState to) + { + // Dead is terminal until respawn logic explicitly resets to Idle + if (from == PlayerState.Dead && to != PlayerState.Idle) + return false; + + // Evolution is terminal until the sequencer completes it + if (from == PlayerState.InEvolution && to != PlayerState.Idle) + return false; + + // Can always go to Dead from any fighting state + if (to == PlayerState.Dead) + return from != PlayerState.Dead; + + return true; // All other transitions permitted + } + + // ── App / Game state listeners ──────────────────────────────────────── + + private void HandleAppStateChanged(AppState state) + { + if (state == AppState.Loading) + TrySetPlayerState(PlayerState.Idle); + } + + private void HandleGameStateChanged(GameState state) + { + // When a cutscene or dialogue starts, lock the player + if (state is GameState.Cutscene or GameState.Dialogue or GameState.Evolution) + TrySetPlayerState(PlayerState.InDialogue); + else if (state == GameState.Exploration) + TrySetPlayerState(PlayerState.Idle); + } + } +} From 320bfbba0939f92b0d7d5b512ff0c895f13f37b9 Mon Sep 17 00:00:00 2001 From: Seni Date: Wed, 3 Jun 2026 08:16:42 -0700 Subject: [PATCH 06/27] =?UTF-8?q?fix(phase2):=20audit=20=E2=80=94=20compil?= =?UTF-8?q?e=20errors,=20operator=20precedence,=20async-void,=20double-sav?= =?UTF-8?q?e,=20scene=20wait?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_Project/Scripts/Combat/CombatContext.cs | 33 ++-- src/Assets/_Project/Scripts/Core/GameLoop.cs | 51 +++--- .../_Project/Scripts/Core/SceneRouter.cs | 57 ++++--- .../Scripts/StateMachine/AppStateMachine.cs | 4 +- .../Scripts/StateMachine/PlayerState.cs | 2 +- .../_Project/Editor/FenrirEnemySetup.cs | 148 +++++++----------- .../_Project/Scripts/Combat/CombatContext.cs | 33 ++-- .../Assets/_Project/Scripts/Core/GameLoop.cs | 51 +++--- .../_Project/Scripts/Core/SceneRouter.cs | 57 ++++--- .../Scripts/StateMachine/AppStateMachine.cs | 4 +- .../Scripts/StateMachine/PlayerState.cs | 2 +- 11 files changed, 237 insertions(+), 205 deletions(-) diff --git a/src/Assets/_Project/Scripts/Combat/CombatContext.cs b/src/Assets/_Project/Scripts/Combat/CombatContext.cs index 8d455e0..9bebbd5 100644 --- a/src/Assets/_Project/Scripts/Combat/CombatContext.cs +++ b/src/Assets/_Project/Scripts/Combat/CombatContext.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using Fenrir.Audio; using Fenrir.Core; using Fenrir.Entities.Enemies; using Fenrir.Save; @@ -9,8 +10,8 @@ namespace Fenrir.Combat { /// - /// Tracks the current combat encounter: which enemies are active, when combat - /// started, and how the player engaged. Emits trait events on combat end. + /// Tracks the current combat encounter: active enemies, engagement type, + /// player behaviour flags. Emits trait events when combat ends. /// /// Lives in the EmberForest scene. Registered with ServiceLocator on Awake. /// @@ -39,7 +40,6 @@ public void RegisterEnemy(EnemyBase enemy) { bool wasClear = _activeEnemies.Count == 0; _activeEnemies.Add(enemy); - if (wasClear) BeginCombat(); } @@ -49,9 +49,9 @@ public void UnregisterEnemy(EnemyBase enemy) if (_activeEnemies.Count == 0) EndCombat(); } - // ── Player action tracking ──────────────────────────────────────────── + // ── Player action tracking (called by PlayerCombat / PlayerTraitEmitter) ── - public void RecordDodge() => _playerDodgedThisFight = true; + public void RecordDodge() => _playerDodgedThisFight = true; public void RecordHitTakenNoDodge() { @@ -63,16 +63,15 @@ public void RecordHitTakenNoDodge() private void BeginCombat() { - _combatStartTime = Time.time; - _playerDodgedThisFight = false; - _hitsWithoutDodge = 0; - - if (ServiceLocator.TryGet(out var sm)) - sm.TrySetPlayerState(PlayerState.Idle); // let CombatSystem own state from here + _combatStartTime = Time.time; + _playerDodgedThisFight = false; + _hitsWithoutDodge = 0; + // Do NOT force player state here — CombatSystem and PlayerCombat own that. + // Only update game state and audio. SceneRouter.SetGameState(GameState.Combat); - if (ServiceLocator.TryGet(out var audio)) + if (ServiceLocator.TryGet(out AudioManager audio)) audio.StartCombatMusic(); Debug.Log("[CombatContext] Combat started."); @@ -82,17 +81,17 @@ private void EndCombat() { float duration = Time.time - _combatStartTime; - // Ambush: died within 5s of combat start (handled in PlayerHealth.OnDeath) - // Here we handle the survived-combat events - if (!_playerDodgedThisFight && _hitsWithoutDodge == 0) + // "Dodge never used (combat completed)" — fires whenever the player finished + // a fight without using a single dodge, regardless of hits taken. + if (!_playerDodgedThisFight) BehaviorEventBus.Emit(new CombatCompletedNoDodgeEvent()); SceneRouter.SetGameState(GameState.Exploration); - if (ServiceLocator.TryGet(out var audio)) + if (ServiceLocator.TryGet(out AudioManager audio)) audio.StopCombatMusic(); - if (ServiceLocator.TryGet(out var save)) + if (ServiceLocator.TryGet(out ISaveManager save)) save.MarkDirty(); Debug.Log($"[CombatContext] Combat ended after {duration:F1}s."); diff --git a/src/Assets/_Project/Scripts/Core/GameLoop.cs b/src/Assets/_Project/Scripts/Core/GameLoop.cs index f43d9e3..4cf22c2 100644 --- a/src/Assets/_Project/Scripts/Core/GameLoop.cs +++ b/src/Assets/_Project/Scripts/Core/GameLoop.cs @@ -1,15 +1,15 @@ +using System; +using System.Threading.Tasks; using Fenrir.Save; using Fenrir.StateMachine; -using Fenrir.Traits; using UnityEngine; namespace Fenrir.Core { /// /// Drives the top-level game loop: - /// - Pause / resume (sets Time.timeScale) - /// - Application focus / pause → auto-save - /// - Scene unload → BehaviorEventBus.Clear() + /// - Pause / resume (Time.timeScale + SceneRouter state) + /// - Application focus / pause → debounced auto-save on background /// /// Attach to the Bootstrap GameObject (DontDestroyOnLoad). /// Registered with ServiceLocator in Bootstrap. @@ -18,6 +18,9 @@ public class GameLoop : MonoBehaviour { public bool IsPaused { get; private set; } + // Debounce: OnApplicationPause + OnApplicationFocus both fire on iOS background + private bool _savePending; + // ── Pause / Resume ──────────────────────────────────────────────────── public void Pause() @@ -25,7 +28,8 @@ public void Pause() if (IsPaused) return; IsPaused = true; Time.timeScale = 0f; - SceneRouter.OnAppStateChanged?.Invoke(AppState.Paused); + // Use the router's internal setter so CurrentAppState stays accurate + SceneRouter.SetPaused(true); Debug.Log("[GameLoop] Paused"); } @@ -34,7 +38,7 @@ public void Resume() if (!IsPaused) return; IsPaused = false; Time.timeScale = 1f; - SceneRouter.OnAppStateChanged?.Invoke(AppState.InGame); + SceneRouter.SetPaused(false); Debug.Log("[GameLoop] Resumed"); } @@ -47,36 +51,45 @@ public void TogglePause() private void OnApplicationPause(bool paused) { - if (paused) SaveAndClearBus(); + if (paused) RequestSave(); } private void OnApplicationFocus(bool focused) { - if (!focused) SaveAndClearBus(); + if (!focused) RequestSave(); } private void OnApplicationQuit() { - SaveAndClearBus(); + // Synchronous path on quit — fire-and-forget with error logging + _ = TrySaveAsync(); } - // ── Scene unload ────────────────────────────────────────────────────── + // ── Debounced save ──────────────────────────────────────────────────── - private void OnDestroy() + private void RequestSave() { - // Only clear bus when the Bootstrap object itself is destroyed - // (i.e. the full session is ending — not mid-game scene transitions). + if (_savePending) return; // de-duplicate the double-fire on iOS background + _savePending = true; + _ = TrySaveAsync(); } - // ── Helpers ─────────────────────────────────────────────────────────── - - private static async void SaveAndClearBus() + private async Task TrySaveAsync() { - if (!ServiceLocator.TryGet(out ISaveManager save)) return; - if (save.IsDirty) + try { + if (!ServiceLocator.TryGet(out ISaveManager save)) return; + if (!save.IsDirty) return; await save.SaveAsync(); - Debug.Log("[GameLoop] Auto-saved on pause/quit."); + Debug.Log("[GameLoop] Auto-saved."); + } + catch (Exception ex) + { + Debug.LogError($"[GameLoop] Auto-save failed: {ex.Message}"); + } + finally + { + _savePending = false; } } } diff --git a/src/Assets/_Project/Scripts/Core/SceneRouter.cs b/src/Assets/_Project/Scripts/Core/SceneRouter.cs index 91cf0b3..37f085a 100644 --- a/src/Assets/_Project/Scripts/Core/SceneRouter.cs +++ b/src/Assets/_Project/Scripts/Core/SceneRouter.cs @@ -10,15 +10,16 @@ namespace Fenrir.Core /// Typed async scene router. All navigation goes through here — never call /// SceneManager.LoadScene directly from game code. /// - /// Fires before every transition so systems - /// (audio, HUD, AI) can react without coupling to scene names. + /// Owns CurrentAppState / CurrentGameState so every system reads a single + /// source of truth. GameLoop and AppStateMachine mutate state via the public + /// setters here rather than firing events themselves. /// public static class SceneRouter { // ── Scene name constants ────────────────────────────────────────────── - public const string SceneBootstrap = "Bootstrap"; - public const string SceneMainMenu = "MainMenu"; - public const string SceneAwakening = "Awakening"; + public const string SceneBootstrap = "Bootstrap"; + public const string SceneMainMenu = "MainMenu"; + public const string SceneAwakening = "Awakening"; public const string SceneEmberForest = "EmberForest"; // ── State ───────────────────────────────────────────────────────────── @@ -34,19 +35,15 @@ public static class SceneRouter // ── Navigation ──────────────────────────────────────────────────────── public static async Task LoadMainMenuAsync() - { - await TransitionAsync(SceneMainMenu, AppState.MainMenu); - } + => await TransitionAsync(SceneMainMenu, AppState.MainMenu); public static async Task LoadAwakeningAsync() - { - await TransitionAsync(SceneAwakening, AppState.InGame, GameState.Awakening); - } + => await TransitionAsync(SceneAwakening, AppState.InGame, GameState.Awakening); public static async Task LoadGameAsync() - { - await TransitionAsync(SceneEmberForest, AppState.InGame, GameState.Exploration); - } + => await TransitionAsync(SceneEmberForest, AppState.InGame, GameState.Exploration); + + // ── State setters (called by GameLoop, CombatContext, etc.) ─────────── public static void SetGameState(GameState state) { @@ -55,6 +52,25 @@ public static void SetGameState(GameState state) OnGameStateChanged?.Invoke(state); } + /// Called by GameLoop.Pause/Resume — updates state without loading a scene. + public static void SetPaused(bool paused) + { + AppState target = paused ? AppState.Paused : AppState.InGame; + if (CurrentAppState == target) return; + CurrentAppState = target; + OnAppStateChanged?.Invoke(target); + } + + /// + /// Resets static state. Call from Bootstrap.Awake in Editor builds to handle + /// domain reloads cleanly. + /// + public static void ResetForEditorReload() + { + CurrentAppState = AppState.Booting; + CurrentGameState = GameState.Exploration; + } + // ── Internal ────────────────────────────────────────────────────────── private static async Task TransitionAsync( @@ -62,7 +78,11 @@ private static async Task TransitionAsync( AppState nextAppState, GameState nextGameState = GameState.Exploration) { - if (CurrentAppState == AppState.Loading) return; // Guard re-entrant calls + if (CurrentAppState == AppState.Loading) + { + Debug.LogWarning($"[SceneRouter] Navigation to '{sceneName}' ignored — already loading."); + return; + } SetAppState(AppState.Loading); OnSceneLoadStarted?.Invoke(); @@ -70,14 +90,15 @@ private static async Task TransitionAsync( AsyncOperation op = SceneManager.LoadSceneAsync(sceneName); op.allowSceneActivation = false; - // Wait until Unity has loaded >90% (scene data ready, not yet activated) + // Phase 1: wait until the scene data is ready (progress stalls at 0.9 until activated) while (op.progress < 0.9f) await Task.Yield(); op.allowSceneActivation = true; - // Wait one more frame for Awake/Start to fire - await Task.Yield(); + // Phase 2: wait until the scene is fully active (isDone → Awake + Start have fired) + while (!op.isDone) + await Task.Yield(); SetAppState(nextAppState); SetGameState(nextGameState); diff --git a/src/Assets/_Project/Scripts/StateMachine/AppStateMachine.cs b/src/Assets/_Project/Scripts/StateMachine/AppStateMachine.cs index 14dbcab..d6d77c4 100644 --- a/src/Assets/_Project/Scripts/StateMachine/AppStateMachine.cs +++ b/src/Assets/_Project/Scripts/StateMachine/AppStateMachine.cs @@ -68,7 +68,7 @@ or PlayerState.Dead public bool CanPlayerAct() { - return GameState == GameState.Exploration || GameState == GameState.Combat + return (GameState == GameState.Exploration || GameState == GameState.Combat) && PlayerState is PlayerState.Idle or PlayerState.Moving; } @@ -103,7 +103,7 @@ private void HandleGameStateChanged(GameState state) { // When a cutscene or dialogue starts, lock the player if (state is GameState.Cutscene or GameState.Dialogue or GameState.Evolution) - TrySetPlayerState(PlayerState.InDialogue); + TrySetPlayerState(PlayerState.InCutscene); else if (state == GameState.Exploration) TrySetPlayerState(PlayerState.Idle); } diff --git a/src/Assets/_Project/Scripts/StateMachine/PlayerState.cs b/src/Assets/_Project/Scripts/StateMachine/PlayerState.cs index 6477837..b9eccf5 100644 --- a/src/Assets/_Project/Scripts/StateMachine/PlayerState.cs +++ b/src/Assets/_Project/Scripts/StateMachine/PlayerState.cs @@ -10,7 +10,7 @@ public enum PlayerState Staggered, Dead, Interacting, - InDialogue, + InCutscene, // locked during cutscene / dialogue / evolution InEvolution, } } diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirEnemySetup.cs b/src/ProjectFenrir/Assets/_Project/Editor/FenrirEnemySetup.cs index a84d942..98ab103 100644 --- a/src/ProjectFenrir/Assets/_Project/Editor/FenrirEnemySetup.cs +++ b/src/ProjectFenrir/Assets/_Project/Editor/FenrirEnemySetup.cs @@ -6,123 +6,89 @@ namespace Fenrir.Editor { /// - /// Fenrir → Setup → Spawn Ash Wolf - /// Creates an Ash Wolf enemy at the scene origin, fully wired: - /// EnemyBase, EnemyHealth, EnemyAI, EnemyCombat, EnemyTraitEmitter, NavMeshAgent, Collider. + /// Fenrir → Setup → Spawn Ash Wolf / Flame Sprite + /// Creates a fully-wired enemy in the active scene: + /// NavMeshAgent, EnemyBase, EnemyHealth, EnemyAI, EnemyCombat, EnemyTraitEmitter. + /// + /// Bake NavMesh after spawning: Window → AI → Navigation → Bake. + /// Ensure "Enemy" tag exists: Edit → Project Settings → Tags and Layers. /// public static class FenrirEnemySetup { [MenuItem("Fenrir/Setup/Spawn Ash Wolf")] public static GameObject SpawnAshWolf() - { - return SpawnEnemy( - displayName: "AshWolf", - spawnPos: new Vector3(5f, 0f, 5f), - maxHealth: 80f, - baseAttack: 12f, - moveSpeed: 4.5f, - aggroRange: 8f, - attackRange: 1.8f - ); - } + => SpawnEnemy("AshWolf", new Vector3( 5f, 0f, 5f), maxHp: 80f, atk: 12f, speed: 4.5f, aggro: 8f, atkRange: 1.8f); [MenuItem("Fenrir/Setup/Spawn Flame Sprite")] public static GameObject SpawnFlameSprite() - { - return SpawnEnemy( - displayName: "FlameSprite", - spawnPos: new Vector3(-5f, 0f, 5f), - maxHealth: 45f, - baseAttack: 8f, - moveSpeed: 6f, - aggroRange: 10f, - attackRange: 5f - ); - } + => SpawnEnemy("FlameSprite", new Vector3(-5f, 0f, 5f), maxHp: 45f, atk: 8f, speed: 6f, aggro: 10f, atkRange: 5f); // ── Internal ────────────────────────────────────────────────────────── private static GameObject SpawnEnemy( - string displayName, - Vector3 spawnPos, - float maxHealth, - float baseAttack, - float moveSpeed, - float aggroRange, - float attackRange) + string name, Vector3 pos, + float maxHp, float atk, float speed, float aggro, float atkRange) { var go = GameObject.CreatePrimitive(PrimitiveType.Capsule); - go.name = displayName; - go.tag = "Enemy"; - go.transform.position = spawnPos; + go.name = name; + go.transform.position = pos; + + // Safe tag assignment — tag must exist in Project Settings + try { go.tag = "Enemy"; } + catch { Debug.LogWarning("[FenrirEnemySetup] 'Enemy' tag not found — add it in Edit → Project Settings → Tags and Layers."); } - // Tint enemy red so it's visually distinct from the player - var renderer = go.GetComponent(); - if (renderer != null) + // Material tint (URP Lit) — with null-safe shader lookup + Renderer rend = go.GetComponent(); + if (rend != null) { - renderer.sharedMaterial = new Material(Shader.Find("Universal Render Pipeline/Lit")); - renderer.sharedMaterial.color = new Color(0.8f, 0.2f, 0.1f); + Shader urpLit = Shader.Find("Universal Render Pipeline/Lit"); + if (urpLit != null) + { + rend.sharedMaterial = new Material(urpLit); + rend.sharedMaterial.color = new Color(0.8f, 0.2f, 0.1f); + } } - // NavMeshAgent - NavMeshAgent agent = go.AddComponent(); - agent.speed = moveSpeed; - agent.stoppingDistance = attackRange * 0.8f; - agent.radius = 0.4f; - agent.height = 2f; - - // Rigidbody (kinematic — movement is NavMesh-driven) - Rigidbody rb = go.AddComponent(); - rb.isKinematic = true; - rb.useGravity = false; + // NavMeshAgent — owns locomotion; Rigidbody NOT added (conflicts with NavMesh). + NavMeshAgent agent = go.AddComponent(); + agent.speed = speed; + agent.stoppingDistance = atkRange * 0.8f; + agent.radius = 0.4f; + agent.height = 2f; // Enemy component stack - EnemyBase enemyBase = go.AddComponent(); - EnemyHealth health = go.AddComponent(); - EnemyCombat combat = go.AddComponent(); - EnemyAI ai = go.AddComponent(); - EnemyTraitEmitter traitEmitter = go.AddComponent(); - - // Serialised field values via SerializedObject (survives domain reload) - SetSerializedFields(go, health, maxHealth, combat, baseAttack, ai, aggroRange, attackRange); - - Undo.RegisterCreatedObjectUndo(go, $"Spawn {displayName}"); + EnemyHealth health = go.AddComponent(); + EnemyCombat combat = go.AddComponent(); + EnemyAI ai = go.AddComponent(); + go.AddComponent(); + go.AddComponent(); + + // Write serialised fields via SerializedObject (Undo-safe, domain-reload-safe) + WriteFloat(health, "_maxHealth", maxHp); + WriteFloat(combat, "_baseAttack", atk); + WriteFloat(ai, "_aggroRange", aggro); + WriteFloat(ai, "_attackRange", atkRange); + + Undo.RegisterCreatedObjectUndo(go, $"Spawn {name}"); Selection.activeGameObject = go; - Debug.Log($"[FenrirEnemySetup] Spawned {displayName} at {spawnPos}. " + - "Bake NavMesh before entering Play mode (Window → AI → Navigation → Bake)."); - + Debug.Log($"[FenrirEnemySetup] '{name}' spawned at {pos}. " + + "Bake NavMesh: Window → AI → Navigation → Bake."); return go; } - private static void SetSerializedFields( - GameObject go, - EnemyHealth health, float maxHp, - EnemyCombat combat, float atk, - EnemyAI ai, float aggro, float atkRange) + private static void WriteFloat(Component target, string fieldName, float value) { - // Use SerializedObject so Undo/Redo and Prefab workflows work correctly - SerializedObject soHealth = new SerializedObject(health); - soHealth.FindProperty("_maxHealth")?.SetValue(maxHp); - soHealth.ApplyModifiedProperties(); - - SerializedObject soCombat = new SerializedObject(combat); - soCombat.FindProperty("_baseAttack")?.SetValue(atk); - soCombat.ApplyModifiedProperties(); - - SerializedObject soAi = new SerializedObject(ai); - soAi.FindProperty("_aggroRange")?.SetValue(aggro); - soAi.FindProperty("_attackRange")?.SetValue(atkRange); - soAi.ApplyModifiedProperties(); - } - } - - // Extension so FindProperty().SetValue() reads cleanly - internal static class SerializedPropertyExt - { - internal static void SetValue(this SerializedProperty prop, float value) - { - if (prop != null) prop.floatValue = value; + SerializedObject so = new SerializedObject(target); + SerializedProperty sp = so.FindProperty(fieldName); + if (sp == null) + { + Debug.LogWarning($"[FenrirEnemySetup] Field '{fieldName}' not found on {target.GetType().Name}. " + + "Check that the field is [SerializeField] and the name matches."); + return; + } + sp.floatValue = value; + so.ApplyModifiedPropertiesWithoutUndo(); } } } diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatContext.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatContext.cs index 8d455e0..9bebbd5 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatContext.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatContext.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using Fenrir.Audio; using Fenrir.Core; using Fenrir.Entities.Enemies; using Fenrir.Save; @@ -9,8 +10,8 @@ namespace Fenrir.Combat { /// - /// Tracks the current combat encounter: which enemies are active, when combat - /// started, and how the player engaged. Emits trait events on combat end. + /// Tracks the current combat encounter: active enemies, engagement type, + /// player behaviour flags. Emits trait events when combat ends. /// /// Lives in the EmberForest scene. Registered with ServiceLocator on Awake. /// @@ -39,7 +40,6 @@ public void RegisterEnemy(EnemyBase enemy) { bool wasClear = _activeEnemies.Count == 0; _activeEnemies.Add(enemy); - if (wasClear) BeginCombat(); } @@ -49,9 +49,9 @@ public void UnregisterEnemy(EnemyBase enemy) if (_activeEnemies.Count == 0) EndCombat(); } - // ── Player action tracking ──────────────────────────────────────────── + // ── Player action tracking (called by PlayerCombat / PlayerTraitEmitter) ── - public void RecordDodge() => _playerDodgedThisFight = true; + public void RecordDodge() => _playerDodgedThisFight = true; public void RecordHitTakenNoDodge() { @@ -63,16 +63,15 @@ public void RecordHitTakenNoDodge() private void BeginCombat() { - _combatStartTime = Time.time; - _playerDodgedThisFight = false; - _hitsWithoutDodge = 0; - - if (ServiceLocator.TryGet(out var sm)) - sm.TrySetPlayerState(PlayerState.Idle); // let CombatSystem own state from here + _combatStartTime = Time.time; + _playerDodgedThisFight = false; + _hitsWithoutDodge = 0; + // Do NOT force player state here — CombatSystem and PlayerCombat own that. + // Only update game state and audio. SceneRouter.SetGameState(GameState.Combat); - if (ServiceLocator.TryGet(out var audio)) + if (ServiceLocator.TryGet(out AudioManager audio)) audio.StartCombatMusic(); Debug.Log("[CombatContext] Combat started."); @@ -82,17 +81,17 @@ private void EndCombat() { float duration = Time.time - _combatStartTime; - // Ambush: died within 5s of combat start (handled in PlayerHealth.OnDeath) - // Here we handle the survived-combat events - if (!_playerDodgedThisFight && _hitsWithoutDodge == 0) + // "Dodge never used (combat completed)" — fires whenever the player finished + // a fight without using a single dodge, regardless of hits taken. + if (!_playerDodgedThisFight) BehaviorEventBus.Emit(new CombatCompletedNoDodgeEvent()); SceneRouter.SetGameState(GameState.Exploration); - if (ServiceLocator.TryGet(out var audio)) + if (ServiceLocator.TryGet(out AudioManager audio)) audio.StopCombatMusic(); - if (ServiceLocator.TryGet(out var save)) + if (ServiceLocator.TryGet(out ISaveManager save)) save.MarkDirty(); Debug.Log($"[CombatContext] Combat ended after {duration:F1}s."); diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Core/GameLoop.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Core/GameLoop.cs index f43d9e3..4cf22c2 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Core/GameLoop.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Core/GameLoop.cs @@ -1,15 +1,15 @@ +using System; +using System.Threading.Tasks; using Fenrir.Save; using Fenrir.StateMachine; -using Fenrir.Traits; using UnityEngine; namespace Fenrir.Core { /// /// Drives the top-level game loop: - /// - Pause / resume (sets Time.timeScale) - /// - Application focus / pause → auto-save - /// - Scene unload → BehaviorEventBus.Clear() + /// - Pause / resume (Time.timeScale + SceneRouter state) + /// - Application focus / pause → debounced auto-save on background /// /// Attach to the Bootstrap GameObject (DontDestroyOnLoad). /// Registered with ServiceLocator in Bootstrap. @@ -18,6 +18,9 @@ public class GameLoop : MonoBehaviour { public bool IsPaused { get; private set; } + // Debounce: OnApplicationPause + OnApplicationFocus both fire on iOS background + private bool _savePending; + // ── Pause / Resume ──────────────────────────────────────────────────── public void Pause() @@ -25,7 +28,8 @@ public void Pause() if (IsPaused) return; IsPaused = true; Time.timeScale = 0f; - SceneRouter.OnAppStateChanged?.Invoke(AppState.Paused); + // Use the router's internal setter so CurrentAppState stays accurate + SceneRouter.SetPaused(true); Debug.Log("[GameLoop] Paused"); } @@ -34,7 +38,7 @@ public void Resume() if (!IsPaused) return; IsPaused = false; Time.timeScale = 1f; - SceneRouter.OnAppStateChanged?.Invoke(AppState.InGame); + SceneRouter.SetPaused(false); Debug.Log("[GameLoop] Resumed"); } @@ -47,36 +51,45 @@ public void TogglePause() private void OnApplicationPause(bool paused) { - if (paused) SaveAndClearBus(); + if (paused) RequestSave(); } private void OnApplicationFocus(bool focused) { - if (!focused) SaveAndClearBus(); + if (!focused) RequestSave(); } private void OnApplicationQuit() { - SaveAndClearBus(); + // Synchronous path on quit — fire-and-forget with error logging + _ = TrySaveAsync(); } - // ── Scene unload ────────────────────────────────────────────────────── + // ── Debounced save ──────────────────────────────────────────────────── - private void OnDestroy() + private void RequestSave() { - // Only clear bus when the Bootstrap object itself is destroyed - // (i.e. the full session is ending — not mid-game scene transitions). + if (_savePending) return; // de-duplicate the double-fire on iOS background + _savePending = true; + _ = TrySaveAsync(); } - // ── Helpers ─────────────────────────────────────────────────────────── - - private static async void SaveAndClearBus() + private async Task TrySaveAsync() { - if (!ServiceLocator.TryGet(out ISaveManager save)) return; - if (save.IsDirty) + try { + if (!ServiceLocator.TryGet(out ISaveManager save)) return; + if (!save.IsDirty) return; await save.SaveAsync(); - Debug.Log("[GameLoop] Auto-saved on pause/quit."); + Debug.Log("[GameLoop] Auto-saved."); + } + catch (Exception ex) + { + Debug.LogError($"[GameLoop] Auto-save failed: {ex.Message}"); + } + finally + { + _savePending = false; } } } diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Core/SceneRouter.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Core/SceneRouter.cs index 91cf0b3..37f085a 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Core/SceneRouter.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Core/SceneRouter.cs @@ -10,15 +10,16 @@ namespace Fenrir.Core /// Typed async scene router. All navigation goes through here — never call /// SceneManager.LoadScene directly from game code. /// - /// Fires before every transition so systems - /// (audio, HUD, AI) can react without coupling to scene names. + /// Owns CurrentAppState / CurrentGameState so every system reads a single + /// source of truth. GameLoop and AppStateMachine mutate state via the public + /// setters here rather than firing events themselves. /// public static class SceneRouter { // ── Scene name constants ────────────────────────────────────────────── - public const string SceneBootstrap = "Bootstrap"; - public const string SceneMainMenu = "MainMenu"; - public const string SceneAwakening = "Awakening"; + public const string SceneBootstrap = "Bootstrap"; + public const string SceneMainMenu = "MainMenu"; + public const string SceneAwakening = "Awakening"; public const string SceneEmberForest = "EmberForest"; // ── State ───────────────────────────────────────────────────────────── @@ -34,19 +35,15 @@ public static class SceneRouter // ── Navigation ──────────────────────────────────────────────────────── public static async Task LoadMainMenuAsync() - { - await TransitionAsync(SceneMainMenu, AppState.MainMenu); - } + => await TransitionAsync(SceneMainMenu, AppState.MainMenu); public static async Task LoadAwakeningAsync() - { - await TransitionAsync(SceneAwakening, AppState.InGame, GameState.Awakening); - } + => await TransitionAsync(SceneAwakening, AppState.InGame, GameState.Awakening); public static async Task LoadGameAsync() - { - await TransitionAsync(SceneEmberForest, AppState.InGame, GameState.Exploration); - } + => await TransitionAsync(SceneEmberForest, AppState.InGame, GameState.Exploration); + + // ── State setters (called by GameLoop, CombatContext, etc.) ─────────── public static void SetGameState(GameState state) { @@ -55,6 +52,25 @@ public static void SetGameState(GameState state) OnGameStateChanged?.Invoke(state); } + /// Called by GameLoop.Pause/Resume — updates state without loading a scene. + public static void SetPaused(bool paused) + { + AppState target = paused ? AppState.Paused : AppState.InGame; + if (CurrentAppState == target) return; + CurrentAppState = target; + OnAppStateChanged?.Invoke(target); + } + + /// + /// Resets static state. Call from Bootstrap.Awake in Editor builds to handle + /// domain reloads cleanly. + /// + public static void ResetForEditorReload() + { + CurrentAppState = AppState.Booting; + CurrentGameState = GameState.Exploration; + } + // ── Internal ────────────────────────────────────────────────────────── private static async Task TransitionAsync( @@ -62,7 +78,11 @@ private static async Task TransitionAsync( AppState nextAppState, GameState nextGameState = GameState.Exploration) { - if (CurrentAppState == AppState.Loading) return; // Guard re-entrant calls + if (CurrentAppState == AppState.Loading) + { + Debug.LogWarning($"[SceneRouter] Navigation to '{sceneName}' ignored — already loading."); + return; + } SetAppState(AppState.Loading); OnSceneLoadStarted?.Invoke(); @@ -70,14 +90,15 @@ private static async Task TransitionAsync( AsyncOperation op = SceneManager.LoadSceneAsync(sceneName); op.allowSceneActivation = false; - // Wait until Unity has loaded >90% (scene data ready, not yet activated) + // Phase 1: wait until the scene data is ready (progress stalls at 0.9 until activated) while (op.progress < 0.9f) await Task.Yield(); op.allowSceneActivation = true; - // Wait one more frame for Awake/Start to fire - await Task.Yield(); + // Phase 2: wait until the scene is fully active (isDone → Awake + Start have fired) + while (!op.isDone) + await Task.Yield(); SetAppState(nextAppState); SetGameState(nextGameState); diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/AppStateMachine.cs b/src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/AppStateMachine.cs index 14dbcab..d6d77c4 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/AppStateMachine.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/AppStateMachine.cs @@ -68,7 +68,7 @@ or PlayerState.Dead public bool CanPlayerAct() { - return GameState == GameState.Exploration || GameState == GameState.Combat + return (GameState == GameState.Exploration || GameState == GameState.Combat) && PlayerState is PlayerState.Idle or PlayerState.Moving; } @@ -103,7 +103,7 @@ private void HandleGameStateChanged(GameState state) { // When a cutscene or dialogue starts, lock the player if (state is GameState.Cutscene or GameState.Dialogue or GameState.Evolution) - TrySetPlayerState(PlayerState.InDialogue); + TrySetPlayerState(PlayerState.InCutscene); else if (state == GameState.Exploration) TrySetPlayerState(PlayerState.Idle); } diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/PlayerState.cs b/src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/PlayerState.cs index 6477837..b9eccf5 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/PlayerState.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/PlayerState.cs @@ -10,7 +10,7 @@ public enum PlayerState Staggered, Dead, Interacting, - InDialogue, + InCutscene, // locked during cutscene / dialogue / evolution InEvolution, } } From 837b932c0bc725db02c1bc1bf844f09699997f58 Mon Sep 17 00:00:00 2001 From: Seni Date: Wed, 3 Jun 2026 08:21:44 -0700 Subject: [PATCH 07/27] =?UTF-8?q?fix(audit2):=2013=20bugs=20=E2=80=94=20el?= =?UTF-8?q?ement=20mismatch,=20bus=20leak,=20field=20name,=20DateTime,=20d?= =?UTF-8?q?ouble-emit,=20pattern-fail,=20optimistic-emit,=20lazy=20lookup,?= =?UTF-8?q?=20boss=20detection,=20state=20divergence,=20GameConfig=20const?= =?UTF-8?q?ants,=20Invoke=20cancel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_Project/Scripts/Combat/AttackResolver.cs | 15 ++- .../_Project/Scripts/Combat/CombatContext.cs | 10 +- .../_Project/Scripts/Combat/CombatSystem.cs | 39 ++++---- src/Assets/_Project/Scripts/Core/GameLoop.cs | 25 +++++ .../Scripts/Entities/Enemies/EnemyCombat.cs | 14 ++- .../Scripts/Entities/Player/PlayerCombat.cs | 94 ++++++++++--------- .../Entities/Player/PlayerController.cs | 24 +++-- .../Scripts/Entities/Player/PlayerHealth.cs | 5 + src/Assets/_Project/Scripts/Save/SaveData.cs | 54 ++++++----- .../_Project/Scripts/Traits/TraitProfile.cs | 3 +- src/Assets/_Project/Scripts/UI/HUD.cs | 2 + .../_Project/Editor/FenrirEnemySetup.cs | 2 +- .../_Project/Scripts/Combat/AttackResolver.cs | 15 ++- .../_Project/Scripts/Combat/CombatContext.cs | 10 +- .../_Project/Scripts/Combat/CombatSystem.cs | 39 ++++---- .../Assets/_Project/Scripts/Core/GameLoop.cs | 25 +++++ .../Scripts/Entities/Enemies/EnemyCombat.cs | 14 ++- .../Scripts/Entities/Player/PlayerCombat.cs | 88 +++++++++-------- .../Entities/Player/PlayerController.cs | 24 +++-- .../Scripts/Entities/Player/PlayerHealth.cs | 5 + .../Assets/_Project/Scripts/Save/SaveData.cs | 53 ++++++----- .../_Project/Scripts/Traits/TraitProfile.cs | 3 +- .../Assets/_Project/Scripts/UI/HUD.cs | 2 + 23 files changed, 330 insertions(+), 235 deletions(-) diff --git a/src/Assets/_Project/Scripts/Combat/AttackResolver.cs b/src/Assets/_Project/Scripts/Combat/AttackResolver.cs index b8e318d..96f2721 100644 --- a/src/Assets/_Project/Scripts/Combat/AttackResolver.cs +++ b/src/Assets/_Project/Scripts/Combat/AttackResolver.cs @@ -10,8 +10,11 @@ namespace Fenrir.Combat /// public static class AttackResolver { - private const float SameElementMod = 0.75f; // −25% - private const float OppositeElementMod = 1.25f; // +25% + // Values from GameConfig — single source of truth + // GameConfig.ElementalResistanceMod = -0.25f → multiplier = 1 + (-0.25) = 0.75 + // GameConfig.ElementalWeaknessMod = +0.25f → multiplier = 1 + (+0.25) = 1.25 + private static float SameElementMult => 1f + GameConfig.ElementalResistanceMod; + private static float OppositeElementMult => 1f + GameConfig.ElementalWeaknessMod; public static float Resolve(AttackData attack, Element defenderElement) { @@ -23,13 +26,9 @@ public static float Resolve(AttackData attack, Element defenderElement) Element def = defenderElement; if (atk == def) - { - damage *= SameElementMod; - } + damage *= SameElementMult; else if (ElementExtensions.AreOpposites(atk, def)) - { - damage *= OppositeElementMod; - } + damage *= OppositeElementMult; } return Mathf.Max(0f, damage); diff --git a/src/Assets/_Project/Scripts/Combat/CombatContext.cs b/src/Assets/_Project/Scripts/Combat/CombatContext.cs index 9bebbd5..14be79e 100644 --- a/src/Assets/_Project/Scripts/Combat/CombatContext.cs +++ b/src/Assets/_Project/Scripts/Combat/CombatContext.cs @@ -53,11 +53,11 @@ public void UnregisterEnemy(EnemyBase enemy) public void RecordDodge() => _playerDodgedThisFight = true; - public void RecordHitTakenNoDodge() - { - _hitsWithoutDodge++; - BehaviorEventBus.Emit(new HitTakenNoDodgeEvent()); - } + /// + /// Called by PlayerHealth after it has already emitted HitTakenNoDodgeEvent. + /// CombatContext only updates its internal counter here — does NOT re-emit. + /// + public void NotifyHitTaken() => _hitsWithoutDodge++; // ── Internal ────────────────────────────────────────────────────────── diff --git a/src/Assets/_Project/Scripts/Combat/CombatSystem.cs b/src/Assets/_Project/Scripts/Combat/CombatSystem.cs index 8686175..0141a9b 100644 --- a/src/Assets/_Project/Scripts/Combat/CombatSystem.cs +++ b/src/Assets/_Project/Scripts/Combat/CombatSystem.cs @@ -1,43 +1,37 @@ using Fenrir.Entities.Enemies; using Fenrir.Entities.Player; -using Fenrir.Traits; using UnityEngine; namespace Fenrir.Combat { /// - /// Scene-level coordinator. Tracks active combats, enemy-kill counts per type, - /// and emits high-level signals (combat started, enemy defeated, area cleared). - /// Attach to the scene root or a persistent manager object. + /// Scene-level coordinator. Hooks enemies into PlayerCombat on registration, + /// emits trait signals on kill, and tracks per-type kill counts. /// public class CombatSystem : MonoBehaviour { + private const string BossEnemyId = "emberlord"; // must match EnemyBase._enemyId + + // Lazy: player may not be in the scene when CombatSystem.Awake fires + private PlayerCombat PlayerCombat => + _playerCombat != null ? _playerCombat + : (_playerCombat = FindAnyObjectByType()); + private PlayerCombat _playerCombat; // Key: enemyId, Value: consecutive kill count this session private readonly System.Collections.Generic.Dictionary _killCounts = new(); - private void Awake() - { - _playerCombat = FindAnyObjectByType(); - } - - /// - /// Called when an enemy spawns into an encounter. - /// Hooks up death listener and notifies PlayerCombat. - /// public void RegisterEnemy(EnemyBase enemy) { - string id = enemy.EnemyId; - var health = enemy.GetComponent(); - var emitter = enemy.GetComponent(); + string id = enemy.EnemyId; + var health = enemy.GetComponent(); + var emitter = enemy.GetComponent(); - _playerCombat?.EnterCombat(id); + PlayerCombat?.EnterCombat(id); if (health != null) - { health.OnDied += () => HandleEnemyDeath(enemy, emitter); - } } private void HandleEnemyDeath(EnemyBase enemy, EnemyTraitEmitter emitter) @@ -47,13 +41,14 @@ private void HandleEnemyDeath(EnemyBase enemy, EnemyTraitEmitter emitter) _killCounts.TryGetValue(id, out int count); _killCounts[id] = count + 1; - bool isBoss = enemy.Archetype == EnemyArchetype.Elite; - emitter?.OnKilledByPlayer(isBoss); + // Boss = specific enemy ID, not archetype (Elite = miniboss tier) + bool isBoss = id == BossEnemyId; + emitter?.OnKilledByPlayer(isBoss, id); if (_killCounts[id] >= 3) emitter?.OnHuntedRepeat(); - _playerCombat?.ExitCombat(playerWon: true); + PlayerCombat?.ExitCombat(playerWon: true); } } } diff --git a/src/Assets/_Project/Scripts/Core/GameLoop.cs b/src/Assets/_Project/Scripts/Core/GameLoop.cs index 4cf22c2..1a77d94 100644 --- a/src/Assets/_Project/Scripts/Core/GameLoop.cs +++ b/src/Assets/_Project/Scripts/Core/GameLoop.cs @@ -2,7 +2,9 @@ using System.Threading.Tasks; using Fenrir.Save; using Fenrir.StateMachine; +using Fenrir.Traits; using UnityEngine; +using UnityEngine.SceneManagement; namespace Fenrir.Core { @@ -21,6 +23,29 @@ public class GameLoop : MonoBehaviour // Debounce: OnApplicationPause + OnApplicationFocus both fire on iOS background private bool _savePending; + // ── Lifecycle ───────────────────────────────────────────────────────── + + private void OnEnable() + { + SceneManager.sceneUnloaded += OnSceneUnloaded; + } + + private void OnDisable() + { + SceneManager.sceneUnloaded -= OnSceneUnloaded; + } + + /// + /// Clear event bus on every scene unload to prevent stale MonoBehaviour + /// callbacks from destroyed scene objects firing during the next scene. + /// Bootstrap (DontDestroyOnLoad) resubscribes its own handlers after load. + /// + private static void OnSceneUnloaded(Scene _) + { + BehaviorEventBus.Clear(); + Debug.Log("[GameLoop] BehaviorEventBus cleared on scene unload."); + } + // ── Pause / Resume ──────────────────────────────────────────────────── public void Pause() diff --git a/src/Assets/_Project/Scripts/Entities/Enemies/EnemyCombat.cs b/src/Assets/_Project/Scripts/Entities/Enemies/EnemyCombat.cs index 0dc8188..a3f08ac 100644 --- a/src/Assets/_Project/Scripts/Entities/Enemies/EnemyCombat.cs +++ b/src/Assets/_Project/Scripts/Entities/Enemies/EnemyCombat.cs @@ -1,5 +1,8 @@ using Fenrir.Combat; +using Fenrir.Config; +using Fenrir.Core; using Fenrir.Entities.Player; +using Fenrir.Save; using UnityEngine; namespace Fenrir.Entities.Enemies @@ -23,12 +26,15 @@ public void Attack(GameObject target) var attack = new AttackData( AttackType.Light, _attackDamage, - _base.Element + _base.Element // attacker element = this enemy ); - var playerElement = _base.Element; // defender element fetched from player save in PlayerHealth - target.GetComponent() - ?.TakeHit(attack, playerElement); + // Defender element = player's current element, read from save + Element defenderElement = Element.Fire; // fallback if save unavailable + if (ServiceLocator.TryGet(out ISaveManager save)) + defenderElement = save.Current.Character.CurrentElement; + + target.GetComponent()?.TakeHit(attack, defenderElement); } } } diff --git a/src/Assets/_Project/Scripts/Entities/Player/PlayerCombat.cs b/src/Assets/_Project/Scripts/Entities/Player/PlayerCombat.cs index 38878fa..3771f80 100644 --- a/src/Assets/_Project/Scripts/Entities/Player/PlayerCombat.cs +++ b/src/Assets/_Project/Scripts/Entities/Player/PlayerCombat.cs @@ -1,3 +1,4 @@ +using System.Collections.Generic; using Fenrir.Combat; using Fenrir.Config; using Fenrir.Core; @@ -9,32 +10,33 @@ namespace Fenrir.Entities.Player { /// /// Owns the player's attack/block/dodge decision logic. - /// Produces AttackData structs for AttackResolver. - /// Tracks consecutive deaths vs. the same enemy ID for pattern-failure detection. + /// Produces AttackData structs, passes to target health, then emits trait events + /// ONLY after confirming the hit landed. + /// Tracks per-enemy-type consecutive deaths for pattern-failure detection. /// - [RequireComponent(typeof(PlayerHealth), typeof(PlayerEnergy), - typeof(PlayerTraitEmitter), typeof(HitStateManager))] + [RequireComponent(typeof(PlayerHealth))] + [RequireComponent(typeof(PlayerEnergy))] + [RequireComponent(typeof(PlayerTraitEmitter))] + [RequireComponent(typeof(HitStateManager))] public class PlayerCombat : MonoBehaviour { - // ── Tunables ────────────────────────────────────────────────────────── - [SerializeField] private float _lightAttackDamage = 15f; - [SerializeField] private float _heavyAttackDamage = 35f; - [SerializeField] private float _abilityDamage = 50f; - [SerializeField] private float _abilityEnergyCost = 40f; + [SerializeField] private float _lightAttackDamage = 15f; + [SerializeField] private float _heavyAttackDamage = 35f; + [SerializeField] private float _abilityDamage = 50f; + [SerializeField] private float _abilityEnergyCost = 40f; - // ── Components ──────────────────────────────────────────────────────── private PlayerHealth _health; private PlayerEnergy _energy; private PlayerTraitEmitter _emitter; private HitStateManager _hitState; - // ── Combat state ────────────────────────────────────────────────────── - private bool _usedDodgeThisCombat; + // Per-enemy-ID death counts (keyed by EnemyBase.EnemyId) + private readonly Dictionary _deathsByEnemyId = new(); private string _currentEnemyId; - private int _consecutiveDeathsVsSameEnemy; + private bool _usedDodgeThisCombat; - private Element PlayerElement => ServiceLocator.TryGet(out var save) - ? save.Current.Character.CurrentElement + private Element PlayerElement => ServiceLocator.TryGet(out ISaveManager s) + ? s.Current.Character.CurrentElement : Element.Fire; private void Awake() @@ -47,28 +49,28 @@ private void Awake() _health.OnDied += HandleDeath; } - // ── Input forwarding (called by InputHandler/TouchMapper) ───────────── + // ── Input forwarding ────────────────────────────────────────────────── public void DoLightAttack(GameObject target) { var attack = new AttackData(AttackType.Light, _lightAttackDamage, PlayerElement); - _emitter.OnLightAttackLanded(); // optimistic — real hit detection in AttackResolver - TryHitTarget(target, attack); + if (TryHitTarget(target, attack)) + _emitter.OnLightAttackLanded(); // emit ONLY after confirmed hit } public void DoHeavyAttack(GameObject target) { var attack = new AttackData(AttackType.Heavy, _heavyAttackDamage, PlayerElement); - _emitter.OnHeavyAttackLanded(); - TryHitTarget(target, attack); + if (TryHitTarget(target, attack)) + _emitter.OnHeavyAttackLanded(); } public void DoAbility(GameObject target) { if (!_energy.TrySpend(_abilityEnergyCost)) return; var attack = new AttackData(AttackType.Ability, _abilityDamage, PlayerElement, isAbility: true); - _emitter.OnAbilityUsed(); - TryHitTarget(target, attack); + if (TryHitTarget(target, attack)) + _emitter.OnAbilityUsed(); } public void DoBlock() => _hitState.BeginBlock(); @@ -79,13 +81,17 @@ public void DoDodge() _hitState.BeginDodge(); _usedDodgeThisCombat = true; _emitter.OnDodgeUsed(); + + // Notify CombatContext so end-of-combat dodge flag is set + if (ServiceLocator.TryGet(out CombatContext ctx)) + ctx.RecordDodge(); } // ── Combat lifecycle ────────────────────────────────────────────────── public void EnterCombat(string enemyId) { - _currentEnemyId = enemyId; + _currentEnemyId = enemyId; _usedDodgeThisCombat = false; _health.BeginCombat(); } @@ -94,38 +100,42 @@ public void ExitCombat(bool playerWon) { _health.EndCombat(); - if (playerWon) - { - _consecutiveDeathsVsSameEnemy = 0; + if (playerWon && !_usedDodgeThisCombat) + _emitter.OnCombatCompletedNoDodge(); - if (!_usedDodgeThisCombat) - _emitter.OnCombatCompletedNoDodge(); - } + // Winning any fight resets the pattern-failure counter for that enemy type + if (playerWon && _currentEnemyId != null) + _deathsByEnemyId[_currentEnemyId] = 0; } - // ── Internal ────────────────────────────────────────────────────────── + // ── Helpers ─────────────────────────────────────────────────────────── - private void TryHitTarget(GameObject target, AttackData attack) + private bool TryHitTarget(GameObject target, AttackData attack) { - if (target == null) return; + if (target == null) return false; var enemyHealth = target.GetComponent(); - if (enemyHealth != null) - enemyHealth.TakeHit(attack, PlayerElement); + if (enemyHealth == null) return false; + + enemyHealth.TakeHit(attack, PlayerElement); + return true; } private void HandleDeath() { if (_currentEnemyId != null) - _consecutiveDeathsVsSameEnemy++; - - _health.SetConsecutiveDeaths(_consecutiveDeathsVsSameEnemy); + { + _deathsByEnemyId.TryGetValue(_currentEnemyId, out int prev); + _deathsByEnemyId[_currentEnemyId] = prev + 1; + // Inject correct consecutive count so PlayerHealth can classify + _health.SetConsecutiveDeaths(_deathsByEnemyId[_currentEnemyId]); + } - // Apply currency loss - if (ServiceLocator.TryGet(out var save)) + // Currency loss on death + if (ServiceLocator.TryGet(out ISaveManager save)) { - float loss = Random.Range(GameConfig.DeathCurrencyLossMin, GameConfig.DeathCurrencyLossMax); - int toRemove = Mathf.FloorToInt(save.Current.Character.Currency * loss); - save.Current.Character.Currency = Mathf.Max(0, save.Current.Character.Currency - toRemove); + float pct = Random.Range(GameConfig.DeathCurrencyLossMin, GameConfig.DeathCurrencyLossMax); + float loss = save.Current.Character.Currency * pct; + save.Current.Character.Currency = Mathf.Max(0f, save.Current.Character.Currency - loss); save.MarkDirty(); } } diff --git a/src/Assets/_Project/Scripts/Entities/Player/PlayerController.cs b/src/Assets/_Project/Scripts/Entities/Player/PlayerController.cs index 408c1ee..e5d9698 100644 --- a/src/Assets/_Project/Scripts/Entities/Player/PlayerController.cs +++ b/src/Assets/_Project/Scripts/Entities/Player/PlayerController.cs @@ -1,24 +1,28 @@ +using Fenrir.Core; using Fenrir.StateMachine; using UnityEngine; namespace Fenrir.Entities.Player { /// - /// Owns movement and state machine for the player entity. + /// Owns movement for the player entity. + /// State transitions route through AppStateMachine (single source of truth). /// Receives movement vectors from InputHandler (via TouchMapper). /// Camera is handled separately by a CinemachineFreeLook. /// [RequireComponent(typeof(CharacterController))] public class PlayerController : MonoBehaviour { - // ── Tunables ────────────────────────────────────────────────────────── [SerializeField] private float _moveSpeed = 5f; [SerializeField] private float _dodgeSpeed = 12f; - [SerializeField] private float _rotateSpeed = 720f; // degrees / second + [SerializeField] private float _rotateSpeed = 720f; [SerializeField] private float _gravity = -20f; - // ── State ───────────────────────────────────────────────────────────── - public PlayerState State { get; private set; } = PlayerState.Idle; + // Read-only mirror — AppStateMachine is the authoritative source + public PlayerState State => + ServiceLocator.TryGet(out AppStateMachine sm) + ? sm.PlayerState + : PlayerState.Idle; private CharacterController _cc; private Vector3 _moveInput; @@ -99,15 +103,15 @@ private void RotateToward(Vector3 direction) _rotateSpeed * Time.deltaTime); } - // ── State machine ───────────────────────────────────────────────────── + // ── State transitions (delegate to AppStateMachine) ─────────────────── public void TransitionTo(PlayerState next) { - if (State == next) return; - State = next; + if (ServiceLocator.TryGet(out AppStateMachine sm)) + sm.TrySetPlayerState(next); } - public void SetDead() => TransitionTo(PlayerState.Dead); - public void SetIdle() => TransitionTo(PlayerState.Idle); + public void SetDead() => TransitionTo(PlayerState.Dead); + public void SetIdle() => TransitionTo(PlayerState.Idle); } } diff --git a/src/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs b/src/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs index 5945df4..10488aa 100644 --- a/src/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs +++ b/src/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs @@ -70,7 +70,12 @@ public bool TakeHit(AttackData attack, Element defenderElement) else { _hitsTakenThisCombat++; + // Emit once here. CombatContext.RecordHitTakenNoDodge() must NOT + // also call Emit — it only increments its internal counter. BehaviorEventBus.Emit(new HitTakenNoDodgeEvent()); + // Notify CombatContext for its end-of-combat accounting + if (Core.ServiceLocator.TryGet(out Combat.CombatContext ctx)) + ctx.NotifyHitTaken(); } damage = AttackResolver.Resolve(new AttackData( diff --git a/src/Assets/_Project/Scripts/Save/SaveData.cs b/src/Assets/_Project/Scripts/Save/SaveData.cs index 131ffe7..b1581a2 100644 --- a/src/Assets/_Project/Scripts/Save/SaveData.cs +++ b/src/Assets/_Project/Scripts/Save/SaveData.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using Fenrir.Config; using Fenrir.Traits; @@ -7,41 +8,42 @@ namespace Fenrir.Save [Serializable] public class SaveData { - public const string CurrentVersion = "0.1.0"; - public string Version = CurrentVersion; - public DateTime SavedAt = DateTime.UtcNow; - public CharacterData Character = new(); - public WorldState World = new(); + public const string CurrentVersion = "0.1.0"; + public string Version = CurrentVersion; + /// Unix timestamp (seconds). JsonUtility cannot serialize DateTime. + public long SavedAtUtc = DateTimeOffset.UtcNow.ToUnixTimeSeconds(); + public CharacterData Character = new(); + public WorldState World = new(); } [Serializable] public class CharacterData { - public string Name = ""; - public string Gender = ""; - public int FacePreset = 0; - public int BodyType = 0; - public int SlotIndex = 0; - public Element CurrentElement = Element.None; - public string CurrentEvolution = ""; // "" = base form - public int Level = 1; - public float XP = 0f; - public float Currency = 0f; - public bool RerollUsed = false; - public bool HasAwakened = false; - public TraitProfile Traits = TraitProfile.Neutral(); - public string[] JournalEntries = Array.Empty(); + public string Name = ""; + public string Gender = ""; + public int FacePreset = 0; + public int BodyType = 0; + public int SlotIndex = 0; + public Element CurrentElement = Element.None; + public string CurrentEvolution = ""; // "" = base form + public int Level = 1; + public float XP = 0f; + public float Currency = 0f; + public bool RerollUsed = false; + public bool HasAwakened = false; + public TraitProfile Traits = TraitProfile.Neutral(); + public List JournalEntries = new(); } [Serializable] public class WorldState { - public float TimeOfDay = 0f; // 0–1, fraction of DayNightCycle - public string LastCheckpointId = ""; - public string[] DiscoveredSecrets = Array.Empty(); - public string[] CompletedQuests = Array.Empty(); - public string[] ActivatedShrines = Array.Empty(); - public bool DoctrineShrineFound = false; - public bool EmberlordDefeated = false; + public float TimeOfDay = 0f; // 0–1, fraction of DayNightCycle + public string LastCheckpointId = ""; + public List DiscoveredSecrets = new(); + public List CompletedQuests = new(); + public List ActivatedShrines = new(); + public bool DoctrineShrineFound = false; + public bool EmberlordDefeated = false; } } diff --git a/src/Assets/_Project/Scripts/Traits/TraitProfile.cs b/src/Assets/_Project/Scripts/Traits/TraitProfile.cs index 8cb1ef2..05e4e44 100644 --- a/src/Assets/_Project/Scripts/Traits/TraitProfile.cs +++ b/src/Assets/_Project/Scripts/Traits/TraitProfile.cs @@ -9,7 +9,8 @@ public class TraitProfile { public Dictionary Traits = new(); public Dictionary SessionEventCounts = new(); - public DateTime LastUpdated = DateTime.UtcNow; + /// Unix timestamp. JsonUtility cannot serialize System.DateTime. + public long LastUpdatedUtc = DateTimeOffset.UtcNow.ToUnixTimeSeconds(); public static TraitProfile Neutral() { diff --git a/src/Assets/_Project/Scripts/UI/HUD.cs b/src/Assets/_Project/Scripts/UI/HUD.cs index 25dacc3..d3ddeb1 100644 --- a/src/Assets/_Project/Scripts/UI/HUD.cs +++ b/src/Assets/_Project/Scripts/UI/HUD.cs @@ -60,6 +60,8 @@ private void HideJournalNotification() private void OnDestroy() { + CancelInvoke(nameof(HideJournalNotification)); + if (_health != null) { _health.OnDamaged -= UpdateHpBar; diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirEnemySetup.cs b/src/ProjectFenrir/Assets/_Project/Editor/FenrirEnemySetup.cs index 98ab103..8981e9b 100644 --- a/src/ProjectFenrir/Assets/_Project/Editor/FenrirEnemySetup.cs +++ b/src/ProjectFenrir/Assets/_Project/Editor/FenrirEnemySetup.cs @@ -66,7 +66,7 @@ private static GameObject SpawnEnemy( // Write serialised fields via SerializedObject (Undo-safe, domain-reload-safe) WriteFloat(health, "_maxHealth", maxHp); WriteFloat(combat, "_baseAttack", atk); - WriteFloat(ai, "_aggroRange", aggro); + WriteFloat(ai, "_detectionRange", aggro); WriteFloat(ai, "_attackRange", atkRange); Undo.RegisterCreatedObjectUndo(go, $"Spawn {name}"); diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Combat/AttackResolver.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/AttackResolver.cs index b8e318d..96f2721 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Combat/AttackResolver.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/AttackResolver.cs @@ -10,8 +10,11 @@ namespace Fenrir.Combat /// public static class AttackResolver { - private const float SameElementMod = 0.75f; // −25% - private const float OppositeElementMod = 1.25f; // +25% + // Values from GameConfig — single source of truth + // GameConfig.ElementalResistanceMod = -0.25f → multiplier = 1 + (-0.25) = 0.75 + // GameConfig.ElementalWeaknessMod = +0.25f → multiplier = 1 + (+0.25) = 1.25 + private static float SameElementMult => 1f + GameConfig.ElementalResistanceMod; + private static float OppositeElementMult => 1f + GameConfig.ElementalWeaknessMod; public static float Resolve(AttackData attack, Element defenderElement) { @@ -23,13 +26,9 @@ public static float Resolve(AttackData attack, Element defenderElement) Element def = defenderElement; if (atk == def) - { - damage *= SameElementMod; - } + damage *= SameElementMult; else if (ElementExtensions.AreOpposites(atk, def)) - { - damage *= OppositeElementMod; - } + damage *= OppositeElementMult; } return Mathf.Max(0f, damage); diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatContext.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatContext.cs index 9bebbd5..14be79e 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatContext.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatContext.cs @@ -53,11 +53,11 @@ public void UnregisterEnemy(EnemyBase enemy) public void RecordDodge() => _playerDodgedThisFight = true; - public void RecordHitTakenNoDodge() - { - _hitsWithoutDodge++; - BehaviorEventBus.Emit(new HitTakenNoDodgeEvent()); - } + /// + /// Called by PlayerHealth after it has already emitted HitTakenNoDodgeEvent. + /// CombatContext only updates its internal counter here — does NOT re-emit. + /// + public void NotifyHitTaken() => _hitsWithoutDodge++; // ── Internal ────────────────────────────────────────────────────────── diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatSystem.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatSystem.cs index 8686175..0141a9b 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatSystem.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatSystem.cs @@ -1,43 +1,37 @@ using Fenrir.Entities.Enemies; using Fenrir.Entities.Player; -using Fenrir.Traits; using UnityEngine; namespace Fenrir.Combat { /// - /// Scene-level coordinator. Tracks active combats, enemy-kill counts per type, - /// and emits high-level signals (combat started, enemy defeated, area cleared). - /// Attach to the scene root or a persistent manager object. + /// Scene-level coordinator. Hooks enemies into PlayerCombat on registration, + /// emits trait signals on kill, and tracks per-type kill counts. /// public class CombatSystem : MonoBehaviour { + private const string BossEnemyId = "emberlord"; // must match EnemyBase._enemyId + + // Lazy: player may not be in the scene when CombatSystem.Awake fires + private PlayerCombat PlayerCombat => + _playerCombat != null ? _playerCombat + : (_playerCombat = FindAnyObjectByType()); + private PlayerCombat _playerCombat; // Key: enemyId, Value: consecutive kill count this session private readonly System.Collections.Generic.Dictionary _killCounts = new(); - private void Awake() - { - _playerCombat = FindAnyObjectByType(); - } - - /// - /// Called when an enemy spawns into an encounter. - /// Hooks up death listener and notifies PlayerCombat. - /// public void RegisterEnemy(EnemyBase enemy) { - string id = enemy.EnemyId; - var health = enemy.GetComponent(); - var emitter = enemy.GetComponent(); + string id = enemy.EnemyId; + var health = enemy.GetComponent(); + var emitter = enemy.GetComponent(); - _playerCombat?.EnterCombat(id); + PlayerCombat?.EnterCombat(id); if (health != null) - { health.OnDied += () => HandleEnemyDeath(enemy, emitter); - } } private void HandleEnemyDeath(EnemyBase enemy, EnemyTraitEmitter emitter) @@ -47,13 +41,14 @@ private void HandleEnemyDeath(EnemyBase enemy, EnemyTraitEmitter emitter) _killCounts.TryGetValue(id, out int count); _killCounts[id] = count + 1; - bool isBoss = enemy.Archetype == EnemyArchetype.Elite; - emitter?.OnKilledByPlayer(isBoss); + // Boss = specific enemy ID, not archetype (Elite = miniboss tier) + bool isBoss = id == BossEnemyId; + emitter?.OnKilledByPlayer(isBoss, id); if (_killCounts[id] >= 3) emitter?.OnHuntedRepeat(); - _playerCombat?.ExitCombat(playerWon: true); + PlayerCombat?.ExitCombat(playerWon: true); } } } diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Core/GameLoop.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Core/GameLoop.cs index 4cf22c2..1a77d94 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Core/GameLoop.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Core/GameLoop.cs @@ -2,7 +2,9 @@ using System.Threading.Tasks; using Fenrir.Save; using Fenrir.StateMachine; +using Fenrir.Traits; using UnityEngine; +using UnityEngine.SceneManagement; namespace Fenrir.Core { @@ -21,6 +23,29 @@ public class GameLoop : MonoBehaviour // Debounce: OnApplicationPause + OnApplicationFocus both fire on iOS background private bool _savePending; + // ── Lifecycle ───────────────────────────────────────────────────────── + + private void OnEnable() + { + SceneManager.sceneUnloaded += OnSceneUnloaded; + } + + private void OnDisable() + { + SceneManager.sceneUnloaded -= OnSceneUnloaded; + } + + /// + /// Clear event bus on every scene unload to prevent stale MonoBehaviour + /// callbacks from destroyed scene objects firing during the next scene. + /// Bootstrap (DontDestroyOnLoad) resubscribes its own handlers after load. + /// + private static void OnSceneUnloaded(Scene _) + { + BehaviorEventBus.Clear(); + Debug.Log("[GameLoop] BehaviorEventBus cleared on scene unload."); + } + // ── Pause / Resume ──────────────────────────────────────────────────── public void Pause() diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyCombat.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyCombat.cs index 0dc8188..a3f08ac 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyCombat.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyCombat.cs @@ -1,5 +1,8 @@ using Fenrir.Combat; +using Fenrir.Config; +using Fenrir.Core; using Fenrir.Entities.Player; +using Fenrir.Save; using UnityEngine; namespace Fenrir.Entities.Enemies @@ -23,12 +26,15 @@ public void Attack(GameObject target) var attack = new AttackData( AttackType.Light, _attackDamage, - _base.Element + _base.Element // attacker element = this enemy ); - var playerElement = _base.Element; // defender element fetched from player save in PlayerHealth - target.GetComponent() - ?.TakeHit(attack, playerElement); + // Defender element = player's current element, read from save + Element defenderElement = Element.Fire; // fallback if save unavailable + if (ServiceLocator.TryGet(out ISaveManager save)) + defenderElement = save.Current.Character.CurrentElement; + + target.GetComponent()?.TakeHit(attack, defenderElement); } } } diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerCombat.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerCombat.cs index 2dce189..3771f80 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerCombat.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerCombat.cs @@ -1,3 +1,4 @@ +using System.Collections.Generic; using Fenrir.Combat; using Fenrir.Config; using Fenrir.Core; @@ -9,8 +10,9 @@ namespace Fenrir.Entities.Player { /// /// Owns the player's attack/block/dodge decision logic. - /// Produces AttackData structs for AttackResolver. - /// Tracks consecutive deaths vs. the same enemy ID for pattern-failure detection. + /// Produces AttackData structs, passes to target health, then emits trait events + /// ONLY after confirming the hit landed. + /// Tracks per-enemy-type consecutive deaths for pattern-failure detection. /// [RequireComponent(typeof(PlayerHealth))] [RequireComponent(typeof(PlayerEnergy))] @@ -18,25 +20,23 @@ namespace Fenrir.Entities.Player [RequireComponent(typeof(HitStateManager))] public class PlayerCombat : MonoBehaviour { - // ── Tunables ────────────────────────────────────────────────────────── - [SerializeField] private float _lightAttackDamage = 15f; - [SerializeField] private float _heavyAttackDamage = 35f; - [SerializeField] private float _abilityDamage = 50f; - [SerializeField] private float _abilityEnergyCost = 40f; + [SerializeField] private float _lightAttackDamage = 15f; + [SerializeField] private float _heavyAttackDamage = 35f; + [SerializeField] private float _abilityDamage = 50f; + [SerializeField] private float _abilityEnergyCost = 40f; - // ── Components ──────────────────────────────────────────────────────── private PlayerHealth _health; private PlayerEnergy _energy; private PlayerTraitEmitter _emitter; private HitStateManager _hitState; - // ── Combat state ────────────────────────────────────────────────────── - private bool _usedDodgeThisCombat; + // Per-enemy-ID death counts (keyed by EnemyBase.EnemyId) + private readonly Dictionary _deathsByEnemyId = new(); private string _currentEnemyId; - private int _consecutiveDeathsVsSameEnemy; + private bool _usedDodgeThisCombat; - private Element PlayerElement => ServiceLocator.TryGet(out var save) - ? save.Current.Character.CurrentElement + private Element PlayerElement => ServiceLocator.TryGet(out ISaveManager s) + ? s.Current.Character.CurrentElement : Element.Fire; private void Awake() @@ -49,28 +49,28 @@ private void Awake() _health.OnDied += HandleDeath; } - // ── Input forwarding (called by InputHandler/TouchMapper) ───────────── + // ── Input forwarding ────────────────────────────────────────────────── public void DoLightAttack(GameObject target) { var attack = new AttackData(AttackType.Light, _lightAttackDamage, PlayerElement); - _emitter.OnLightAttackLanded(); // optimistic — real hit detection in AttackResolver - TryHitTarget(target, attack); + if (TryHitTarget(target, attack)) + _emitter.OnLightAttackLanded(); // emit ONLY after confirmed hit } public void DoHeavyAttack(GameObject target) { var attack = new AttackData(AttackType.Heavy, _heavyAttackDamage, PlayerElement); - _emitter.OnHeavyAttackLanded(); - TryHitTarget(target, attack); + if (TryHitTarget(target, attack)) + _emitter.OnHeavyAttackLanded(); } public void DoAbility(GameObject target) { if (!_energy.TrySpend(_abilityEnergyCost)) return; var attack = new AttackData(AttackType.Ability, _abilityDamage, PlayerElement, isAbility: true); - _emitter.OnAbilityUsed(); - TryHitTarget(target, attack); + if (TryHitTarget(target, attack)) + _emitter.OnAbilityUsed(); } public void DoBlock() => _hitState.BeginBlock(); @@ -81,13 +81,17 @@ public void DoDodge() _hitState.BeginDodge(); _usedDodgeThisCombat = true; _emitter.OnDodgeUsed(); + + // Notify CombatContext so end-of-combat dodge flag is set + if (ServiceLocator.TryGet(out CombatContext ctx)) + ctx.RecordDodge(); } // ── Combat lifecycle ────────────────────────────────────────────────── public void EnterCombat(string enemyId) { - _currentEnemyId = enemyId; + _currentEnemyId = enemyId; _usedDodgeThisCombat = false; _health.BeginCombat(); } @@ -96,38 +100,42 @@ public void ExitCombat(bool playerWon) { _health.EndCombat(); - if (playerWon) - { - _consecutiveDeathsVsSameEnemy = 0; + if (playerWon && !_usedDodgeThisCombat) + _emitter.OnCombatCompletedNoDodge(); - if (!_usedDodgeThisCombat) - _emitter.OnCombatCompletedNoDodge(); - } + // Winning any fight resets the pattern-failure counter for that enemy type + if (playerWon && _currentEnemyId != null) + _deathsByEnemyId[_currentEnemyId] = 0; } - // ── Internal ────────────────────────────────────────────────────────── + // ── Helpers ─────────────────────────────────────────────────────────── - private void TryHitTarget(GameObject target, AttackData attack) + private bool TryHitTarget(GameObject target, AttackData attack) { - if (target == null) return; + if (target == null) return false; var enemyHealth = target.GetComponent(); - if (enemyHealth != null) - enemyHealth.TakeHit(attack, PlayerElement); + if (enemyHealth == null) return false; + + enemyHealth.TakeHit(attack, PlayerElement); + return true; } private void HandleDeath() { if (_currentEnemyId != null) - _consecutiveDeathsVsSameEnemy++; - - _health.SetConsecutiveDeaths(_consecutiveDeathsVsSameEnemy); + { + _deathsByEnemyId.TryGetValue(_currentEnemyId, out int prev); + _deathsByEnemyId[_currentEnemyId] = prev + 1; + // Inject correct consecutive count so PlayerHealth can classify + _health.SetConsecutiveDeaths(_deathsByEnemyId[_currentEnemyId]); + } - // Apply currency loss - if (ServiceLocator.TryGet(out var save)) + // Currency loss on death + if (ServiceLocator.TryGet(out ISaveManager save)) { - float loss = Random.Range(GameConfig.DeathCurrencyLossMin, GameConfig.DeathCurrencyLossMax); - int toRemove = Mathf.FloorToInt(save.Current.Character.Currency * loss); - save.Current.Character.Currency = Mathf.Max(0, save.Current.Character.Currency - toRemove); + float pct = Random.Range(GameConfig.DeathCurrencyLossMin, GameConfig.DeathCurrencyLossMax); + float loss = save.Current.Character.Currency * pct; + save.Current.Character.Currency = Mathf.Max(0f, save.Current.Character.Currency - loss); save.MarkDirty(); } } diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerController.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerController.cs index 408c1ee..e5d9698 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerController.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerController.cs @@ -1,24 +1,28 @@ +using Fenrir.Core; using Fenrir.StateMachine; using UnityEngine; namespace Fenrir.Entities.Player { /// - /// Owns movement and state machine for the player entity. + /// Owns movement for the player entity. + /// State transitions route through AppStateMachine (single source of truth). /// Receives movement vectors from InputHandler (via TouchMapper). /// Camera is handled separately by a CinemachineFreeLook. /// [RequireComponent(typeof(CharacterController))] public class PlayerController : MonoBehaviour { - // ── Tunables ────────────────────────────────────────────────────────── [SerializeField] private float _moveSpeed = 5f; [SerializeField] private float _dodgeSpeed = 12f; - [SerializeField] private float _rotateSpeed = 720f; // degrees / second + [SerializeField] private float _rotateSpeed = 720f; [SerializeField] private float _gravity = -20f; - // ── State ───────────────────────────────────────────────────────────── - public PlayerState State { get; private set; } = PlayerState.Idle; + // Read-only mirror — AppStateMachine is the authoritative source + public PlayerState State => + ServiceLocator.TryGet(out AppStateMachine sm) + ? sm.PlayerState + : PlayerState.Idle; private CharacterController _cc; private Vector3 _moveInput; @@ -99,15 +103,15 @@ private void RotateToward(Vector3 direction) _rotateSpeed * Time.deltaTime); } - // ── State machine ───────────────────────────────────────────────────── + // ── State transitions (delegate to AppStateMachine) ─────────────────── public void TransitionTo(PlayerState next) { - if (State == next) return; - State = next; + if (ServiceLocator.TryGet(out AppStateMachine sm)) + sm.TrySetPlayerState(next); } - public void SetDead() => TransitionTo(PlayerState.Dead); - public void SetIdle() => TransitionTo(PlayerState.Idle); + public void SetDead() => TransitionTo(PlayerState.Dead); + public void SetIdle() => TransitionTo(PlayerState.Idle); } } diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs index 5945df4..10488aa 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs @@ -70,7 +70,12 @@ public bool TakeHit(AttackData attack, Element defenderElement) else { _hitsTakenThisCombat++; + // Emit once here. CombatContext.RecordHitTakenNoDodge() must NOT + // also call Emit — it only increments its internal counter. BehaviorEventBus.Emit(new HitTakenNoDodgeEvent()); + // Notify CombatContext for its end-of-combat accounting + if (Core.ServiceLocator.TryGet(out Combat.CombatContext ctx)) + ctx.NotifyHitTaken(); } damage = AttackResolver.Resolve(new AttackData( diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Save/SaveData.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Save/SaveData.cs index e81aa92..b1581a2 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Save/SaveData.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Save/SaveData.cs @@ -8,41 +8,42 @@ namespace Fenrir.Save [Serializable] public class SaveData { - public const string CurrentVersion = "0.1.0"; - public string Version = CurrentVersion; - public DateTime SavedAt = DateTime.UtcNow; - public CharacterData Character = new(); - public WorldState World = new(); + public const string CurrentVersion = "0.1.0"; + public string Version = CurrentVersion; + /// Unix timestamp (seconds). JsonUtility cannot serialize DateTime. + public long SavedAtUtc = DateTimeOffset.UtcNow.ToUnixTimeSeconds(); + public CharacterData Character = new(); + public WorldState World = new(); } [Serializable] public class CharacterData { - public string Name = ""; - public string Gender = ""; - public int FacePreset = 0; - public int BodyType = 0; - public int SlotIndex = 0; - public Element CurrentElement = Element.None; - public string CurrentEvolution = ""; // "" = base form - public int Level = 1; - public float XP = 0f; - public float Currency = 0f; - public bool RerollUsed = false; - public bool HasAwakened = false; - public TraitProfile Traits = TraitProfile.Neutral(); - public List JournalEntries = new(); + public string Name = ""; + public string Gender = ""; + public int FacePreset = 0; + public int BodyType = 0; + public int SlotIndex = 0; + public Element CurrentElement = Element.None; + public string CurrentEvolution = ""; // "" = base form + public int Level = 1; + public float XP = 0f; + public float Currency = 0f; + public bool RerollUsed = false; + public bool HasAwakened = false; + public TraitProfile Traits = TraitProfile.Neutral(); + public List JournalEntries = new(); } [Serializable] public class WorldState { - public float TimeOfDay = 0f; - public string LastCheckpointId = ""; - public List DiscoveredSecrets = new(); - public List CompletedQuests = new(); - public List ActivatedShrines = new(); - public bool DoctrineShrineFound = false; - public bool EmberlordDefeated = false; + public float TimeOfDay = 0f; // 0–1, fraction of DayNightCycle + public string LastCheckpointId = ""; + public List DiscoveredSecrets = new(); + public List CompletedQuests = new(); + public List ActivatedShrines = new(); + public bool DoctrineShrineFound = false; + public bool EmberlordDefeated = false; } } diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Traits/TraitProfile.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Traits/TraitProfile.cs index 8cb1ef2..05e4e44 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Traits/TraitProfile.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Traits/TraitProfile.cs @@ -9,7 +9,8 @@ public class TraitProfile { public Dictionary Traits = new(); public Dictionary SessionEventCounts = new(); - public DateTime LastUpdated = DateTime.UtcNow; + /// Unix timestamp. JsonUtility cannot serialize System.DateTime. + public long LastUpdatedUtc = DateTimeOffset.UtcNow.ToUnixTimeSeconds(); public static TraitProfile Neutral() { diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/UI/HUD.cs b/src/ProjectFenrir/Assets/_Project/Scripts/UI/HUD.cs index 25dacc3..d3ddeb1 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/UI/HUD.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/UI/HUD.cs @@ -60,6 +60,8 @@ private void HideJournalNotification() private void OnDestroy() { + CancelInvoke(nameof(HideJournalNotification)); + if (_health != null) { _health.OnDamaged -= UpdateHpBar; From b27fd7bf2c8156023ee4bb79bc829730e2a88b56 Mon Sep 17 00:00:00 2001 From: Seni Date: Wed, 3 Jun 2026 08:28:19 -0700 Subject: [PATCH 08/27] =?UTF-8?q?feat(design):=20EnemyArchetype.Boss,=20De?= =?UTF-8?q?athSacrificeEvent=20=E2=80=94=20low=20HP=20+=20minor=20damage?= =?UTF-8?q?=20or=20group?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_Project/Scripts/Combat/CombatContext.cs | 58 +++++++++++-- .../_Project/Scripts/Combat/CombatSystem.cs | 15 ++-- .../_Project/Scripts/Config/GameConfig.cs | 12 ++- .../Scripts/Entities/Enemies/EnemyBase.cs | 3 +- .../Scripts/Entities/Player/PlayerCombat.cs | 16 +++- .../Scripts/Entities/Player/PlayerHealth.cs | 81 +++++++++++++------ .../_Project/Editor/FenrirEnemySetup.cs.meta | 2 + .../_Project/Scripts/Combat/CombatContext.cs | 58 +++++++++++-- .../Scripts/Combat/CombatContext.cs.meta | 2 + .../_Project/Scripts/Combat/CombatSystem.cs | 15 ++-- .../_Project/Scripts/Config/GameConfig.cs | 12 ++- .../_Project/Scripts/Core/GameLoop.cs.meta | 2 + .../_Project/Scripts/Core/SceneRouter.cs.meta | 2 + .../Scripts/Entities/Enemies/EnemyBase.cs | 3 +- .../Scripts/Entities/Player/PlayerCombat.cs | 16 +++- .../Scripts/Entities/Player/PlayerHealth.cs | 81 +++++++++++++------ .../StateMachine/AppStateMachine.cs.meta | 2 + 17 files changed, 288 insertions(+), 92 deletions(-) create mode 100644 src/ProjectFenrir/Assets/_Project/Editor/FenrirEnemySetup.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatContext.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Core/GameLoop.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Core/SceneRouter.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/AppStateMachine.cs.meta diff --git a/src/Assets/_Project/Scripts/Combat/CombatContext.cs b/src/Assets/_Project/Scripts/Combat/CombatContext.cs index 14be79e..adf6ac8 100644 --- a/src/Assets/_Project/Scripts/Combat/CombatContext.cs +++ b/src/Assets/_Project/Scripts/Combat/CombatContext.cs @@ -22,6 +22,37 @@ public class CombatContext : MonoBehaviour private bool _playerDodgedThisFight; private int _hitsWithoutDodge; + // Sacrifice death tracking + private int _peakEnemyCount; + + // Key: EnemyBase instance, Value: total damage dealt by player to that enemy this fight + private readonly Dictionary _damageDealtPerEnemy = new(); + + // ── Public read-only queries (used by PlayerHealth for death classification) ── + + /// Highest number of simultaneous enemies in this encounter. + public int PeakEnemyCount => _peakEnemyCount; + + /// + /// Highest fraction of any single enemy's max HP that the player dealt in this fight. + /// Returns 0 if no damage was recorded. + /// + public float MaxDamageFractionDealt + { + get + { + float max = 0f; + foreach (KeyValuePair pair in _damageDealtPerEnemy) + { + var health = pair.Key.GetComponent(); + if (health == null) continue; + float fraction = pair.Value / health.MaxHp; + if (fraction > max) max = fraction; + } + return max; + } + } + // ── Lifecycle ───────────────────────────────────────────────────────── private void Awake() @@ -40,6 +71,10 @@ public void RegisterEnemy(EnemyBase enemy) { bool wasClear = _activeEnemies.Count == 0; _activeEnemies.Add(enemy); + + if (_activeEnemies.Count > _peakEnemyCount) + _peakEnemyCount = _activeEnemies.Count; + if (wasClear) BeginCombat(); } @@ -49,16 +84,27 @@ public void UnregisterEnemy(EnemyBase enemy) if (_activeEnemies.Count == 0) EndCombat(); } - // ── Player action tracking (called by PlayerCombat / PlayerTraitEmitter) ── + // ── Player action tracking ──────────────────────────────────────────── public void RecordDodge() => _playerDodgedThisFight = true; /// - /// Called by PlayerHealth after it has already emitted HitTakenNoDodgeEvent. - /// CombatContext only updates its internal counter here — does NOT re-emit. + /// Called by PlayerHealth after emitting HitTakenNoDodgeEvent. + /// Only increments internal counter — does NOT re-emit. /// public void NotifyHitTaken() => _hitsWithoutDodge++; + /// + /// Called by PlayerCombat after a confirmed hit lands on an enemy. + /// Accumulates damage per enemy for Sacrifice death classification. + /// + public void RecordDamageDealt(EnemyBase enemy, float damage) + { + if (enemy == null) return; + _damageDealtPerEnemy.TryGetValue(enemy, out float prev); + _damageDealtPerEnemy[enemy] = prev + damage; + } + // ── Internal ────────────────────────────────────────────────────────── private void BeginCombat() @@ -66,9 +112,9 @@ private void BeginCombat() _combatStartTime = Time.time; _playerDodgedThisFight = false; _hitsWithoutDodge = 0; + _peakEnemyCount = _activeEnemies.Count; + _damageDealtPerEnemy.Clear(); - // Do NOT force player state here — CombatSystem and PlayerCombat own that. - // Only update game state and audio. SceneRouter.SetGameState(GameState.Combat); if (ServiceLocator.TryGet(out AudioManager audio)) @@ -81,8 +127,6 @@ private void EndCombat() { float duration = Time.time - _combatStartTime; - // "Dodge never used (combat completed)" — fires whenever the player finished - // a fight without using a single dodge, regardless of hits taken. if (!_playerDodgedThisFight) BehaviorEventBus.Emit(new CombatCompletedNoDodgeEvent()); diff --git a/src/Assets/_Project/Scripts/Combat/CombatSystem.cs b/src/Assets/_Project/Scripts/Combat/CombatSystem.cs index 0141a9b..2792a63 100644 --- a/src/Assets/_Project/Scripts/Combat/CombatSystem.cs +++ b/src/Assets/_Project/Scripts/Combat/CombatSystem.cs @@ -10,8 +10,6 @@ namespace Fenrir.Combat /// public class CombatSystem : MonoBehaviour { - private const string BossEnemyId = "emberlord"; // must match EnemyBase._enemyId - // Lazy: player may not be in the scene when CombatSystem.Awake fires private PlayerCombat PlayerCombat => _playerCombat != null ? _playerCombat @@ -19,16 +17,15 @@ public class CombatSystem : MonoBehaviour private PlayerCombat _playerCombat; - // Key: enemyId, Value: consecutive kill count this session + // Key: enemyId (content identity), Value: consecutive kill count this session private readonly System.Collections.Generic.Dictionary _killCounts = new(); public void RegisterEnemy(EnemyBase enemy) { - string id = enemy.EnemyId; - var health = enemy.GetComponent(); - var emitter = enemy.GetComponent(); + var health = enemy.GetComponent(); + var emitter = enemy.GetComponent(); - PlayerCombat?.EnterCombat(id); + PlayerCombat?.EnterCombat(enemy.EnemyId); if (health != null) health.OnDied += () => HandleEnemyDeath(enemy, emitter); @@ -41,8 +38,8 @@ private void HandleEnemyDeath(EnemyBase enemy, EnemyTraitEmitter emitter) _killCounts.TryGetValue(id, out int count); _killCounts[id] = count + 1; - // Boss = specific enemy ID, not archetype (Elite = miniboss tier) - bool isBoss = id == BossEnemyId; + // Boss detection via archetype — EnemyId is content identity only + bool isBoss = enemy.Archetype == EnemyArchetype.Boss; emitter?.OnKilledByPlayer(isBoss, id); if (_killCounts[id] >= 3) diff --git a/src/Assets/_Project/Scripts/Config/GameConfig.cs b/src/Assets/_Project/Scripts/Config/GameConfig.cs index 4701e9d..e8d22d2 100644 --- a/src/Assets/_Project/Scripts/Config/GameConfig.cs +++ b/src/Assets/_Project/Scripts/Config/GameConfig.cs @@ -42,9 +42,15 @@ public static class GameConfig public const float XpMultiplierLoreRead = 0.5f; public const float XpMultiplierRareCreature = 1.5f; - // ── Death Currency Loss ─────────────────────────────────────────────── - public const float DeathCurrencyLossMin = 0.15f; - public const float DeathCurrencyLossMax = 0.25f; + // ── Death classification ────────────────────────────────────────────── + public const float DeathCurrencyLossMin = 0.15f; + public const float DeathCurrencyLossMax = 0.25f; + /// HP fraction below which the player is considered "fighting at low HP" (Sacrifice death). + public const float SacrificeHpThreshold = 0.25f; + /// Max fraction of an enemy's HP the player may have dealt and still qualify as "minor damage". + public const float SacrificeMinorDamageMax = 0.25f; + /// Minimum enemy count in the encounter to qualify as a group fight for Sacrifice detection. + public const int SacrificeGroupEnemyMin = 2; // ── Elemental Resistance ───────────────────────────────────────────── public const float ElementalResistanceMod = -0.25f; // same element diff --git a/src/Assets/_Project/Scripts/Entities/Enemies/EnemyBase.cs b/src/Assets/_Project/Scripts/Entities/Enemies/EnemyBase.cs index 339a6cc..3711fb5 100644 --- a/src/Assets/_Project/Scripts/Entities/Enemies/EnemyBase.cs +++ b/src/Assets/_Project/Scripts/Entities/Enemies/EnemyBase.cs @@ -9,7 +9,8 @@ public enum EnemyArchetype Defensive, // shields, blocks Ranged, // projectile attacks Pack, // weak alone, dangerous in numbers - Elite // mini-boss tier, telegraphed heavy attacks + Elite, // mini-boss tier, telegraphed heavy attacks + Boss // true boss — unique per zone, triggers BossKilledEvent } /// diff --git a/src/Assets/_Project/Scripts/Entities/Player/PlayerCombat.cs b/src/Assets/_Project/Scripts/Entities/Player/PlayerCombat.cs index 3771f80..68673d6 100644 --- a/src/Assets/_Project/Scripts/Entities/Player/PlayerCombat.cs +++ b/src/Assets/_Project/Scripts/Entities/Player/PlayerCombat.cs @@ -53,13 +53,15 @@ private void Awake() public void DoLightAttack(GameObject target) { + _health.NotifyAttackAttempt(); // records low-HP flag for Sacrifice classification var attack = new AttackData(AttackType.Light, _lightAttackDamage, PlayerElement); if (TryHitTarget(target, attack)) - _emitter.OnLightAttackLanded(); // emit ONLY after confirmed hit + _emitter.OnLightAttackLanded(); } public void DoHeavyAttack(GameObject target) { + _health.NotifyAttackAttempt(); var attack = new AttackData(AttackType.Heavy, _heavyAttackDamage, PlayerElement); if (TryHitTarget(target, attack)) _emitter.OnHeavyAttackLanded(); @@ -68,6 +70,7 @@ public void DoHeavyAttack(GameObject target) public void DoAbility(GameObject target) { if (!_energy.TrySpend(_abilityEnergyCost)) return; + _health.NotifyAttackAttempt(); var attack = new AttackData(AttackType.Ability, _abilityDamage, PlayerElement, isAbility: true); if (TryHitTarget(target, attack)) _emitter.OnAbilityUsed(); @@ -113,10 +116,21 @@ public void ExitCombat(bool playerWon) private bool TryHitTarget(GameObject target, AttackData attack) { if (target == null) return false; + var enemyHealth = target.GetComponent(); if (enemyHealth == null) return false; + float hpBefore = enemyHealth.Current; enemyHealth.TakeHit(attack, PlayerElement); + float damageDealt = hpBefore - enemyHealth.Current; + + // Report to CombatContext for Sacrifice death classification + if (damageDealt > 0f && ServiceLocator.TryGet(out CombatContext ctx)) + { + var enemyBase = target.GetComponent(); + ctx.RecordDamageDealt(enemyBase, damageDealt); + } + return true; } diff --git a/src/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs b/src/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs index 10488aa..444cef9 100644 --- a/src/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs +++ b/src/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs @@ -1,6 +1,7 @@ using System; using Fenrir.Combat; using Fenrir.Config; +using Fenrir.Core; using Fenrir.Traits; using UnityEngine; @@ -14,24 +15,35 @@ public class PlayerHealth : MonoBehaviour { [SerializeField] private float _maxHp = 100f; - public float MaxHp => _maxHp; - public float Current { get; private set; } + public float MaxHp => _maxHp; + public float Current { get; private set; } public float CurrentNormalized => Current / _maxHp; - public bool IsDead { get; private set; } + public bool IsDead { get; private set; } - public event Action OnDied; - public event Action OnDamaged; // passes normalised HP after hit + public event Action OnDied; + public event Action OnDamaged; // normalised HP after hit private HitStateManager _hitState; - // Combat context for death classification + // Death classification data private int _hitsTakenThisCombat; private float _combatStartTime; private bool _inCombat; - private int _consecutiveDeathsVsSameEnemy; // tracked by PlayerCombat, injected here + private int _consecutiveDeathsVsSameEnemy; // injected by PlayerCombat + private bool _attackedWhileLowHp; // set by NotifyAttackAttempt public void SetConsecutiveDeaths(int v) => _consecutiveDeathsVsSameEnemy = v; + /// + /// Called by PlayerCombat before each attack attempt. + /// Records whether the player was at low HP — needed for Sacrifice death classification. + /// + public void NotifyAttackAttempt() + { + if (CurrentNormalized < GameConfig.SacrificeHpThreshold) + _attackedWhileLowHp = true; + } + private void Awake() { Current = _maxHp; @@ -40,24 +52,24 @@ private void Awake() public void BeginCombat() { - _inCombat = true; - _combatStartTime = Time.time; - _hitsTakenThisCombat = 0; + _inCombat = true; + _combatStartTime = Time.time; + _hitsTakenThisCombat = 0; + _attackedWhileLowHp = false; } public void EndCombat() => _inCombat = false; - /// Returns whether the hit landed (false if dodging). + /// Returns whether the hit landed (false if currently invincible). public bool TakeHit(AttackData attack, Element defenderElement) { - if (IsDead) return false; + if (IsDead) return false; if (_hitState.IsInvincible) return false; float damage = attack.BaseDamage; if (_hitState.IsPerfectBlockWindow) { - // Perfect block absorbs all damage BehaviorEventBus.Emit(new PerfectBlockEvent()); return true; } @@ -70,11 +82,9 @@ public bool TakeHit(AttackData attack, Element defenderElement) else { _hitsTakenThisCombat++; - // Emit once here. CombatContext.RecordHitTakenNoDodge() must NOT - // also call Emit — it only increments its internal counter. BehaviorEventBus.Emit(new HitTakenNoDodgeEvent()); - // Notify CombatContext for its end-of-combat accounting - if (Core.ServiceLocator.TryGet(out Combat.CombatContext ctx)) + // CombatContext increments its own counter — no re-emit + if (ServiceLocator.TryGet(out CombatContext ctx)) ctx.NotifyHitTaken(); } @@ -100,43 +110,64 @@ private void Die() { if (IsDead) return; IsDead = true; - EmitDeathEvent(); OnDied?.Invoke(); } private void EmitDeathEvent() { - // Ambush: died within 5s of entering combat + // 1. Ambush — died within 5s of combat start → no trait shift if (_inCombat && (Time.time - _combatStartTime) < 5f) { - // DeathAmbushEvent → no trait shift per design BehaviorEventBus.Emit(new DeathAmbushEvent()); return; } - // Pattern failure: 3rd+ death vs same enemy type + // 2. Pattern failure — 3rd+ death vs the same enemy type if (_consecutiveDeathsVsSameEnemy >= 2) { BehaviorEventBus.Emit(new DeathPatternFailEvent()); return; } - // Reckless: took 3+ unhpblocked hits with no dodge or block used + // 3. Sacrifice — fought at low HP (<25%) AND dealt only minor damage + // (< 25% of any single enemy's max HP) OR faced a group (2+ enemies) + if (_attackedWhileLowHp && IsSacrificeDeath()) + { + BehaviorEventBus.Emit(new DeathSacrificeEvent()); + return; + } + + // 4. Reckless — 3+ unblocked hits, no dodge or block if (_hitsTakenThisCombat >= 3) { BehaviorEventBus.Emit(new DeathRecklessEvent()); return; } - // Overwhelmed: classified externally (set before death) — fallback + // 5. Overwhelmed — fallback BehaviorEventBus.Emit(new DeathOverwhelmedEvent()); } + /// + /// Sacrifice conditions: minor damage dealt (< SacrificeMinorDamageMax of any + /// enemy's max HP) OR the encounter had 2+ enemies simultaneously. + /// + private static bool IsSacrificeDeath() + { + if (!ServiceLocator.TryGet(out CombatContext ctx)) return false; + + bool groupFight = ctx.PeakEnemyCount >= GameConfig.SacrificeGroupEnemyMin; + bool minorDamage = ctx.MaxDamageFractionDealt < GameConfig.SacrificeMinorDamageMax; + + return groupFight || minorDamage; + } + public void Revive(float hpFraction = 1f) { - IsDead = false; - Current = _maxHp * Mathf.Clamp01(hpFraction); + IsDead = false; + _attackedWhileLowHp = false; + Current = _maxHp * Mathf.Clamp01(hpFraction); } } } diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirEnemySetup.cs.meta b/src/ProjectFenrir/Assets/_Project/Editor/FenrirEnemySetup.cs.meta new file mode 100644 index 0000000..94ac134 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Editor/FenrirEnemySetup.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 419865f0e0c2f413ca86f221c1bd4f2c \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatContext.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatContext.cs index 14be79e..adf6ac8 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatContext.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatContext.cs @@ -22,6 +22,37 @@ public class CombatContext : MonoBehaviour private bool _playerDodgedThisFight; private int _hitsWithoutDodge; + // Sacrifice death tracking + private int _peakEnemyCount; + + // Key: EnemyBase instance, Value: total damage dealt by player to that enemy this fight + private readonly Dictionary _damageDealtPerEnemy = new(); + + // ── Public read-only queries (used by PlayerHealth for death classification) ── + + /// Highest number of simultaneous enemies in this encounter. + public int PeakEnemyCount => _peakEnemyCount; + + /// + /// Highest fraction of any single enemy's max HP that the player dealt in this fight. + /// Returns 0 if no damage was recorded. + /// + public float MaxDamageFractionDealt + { + get + { + float max = 0f; + foreach (KeyValuePair pair in _damageDealtPerEnemy) + { + var health = pair.Key.GetComponent(); + if (health == null) continue; + float fraction = pair.Value / health.MaxHp; + if (fraction > max) max = fraction; + } + return max; + } + } + // ── Lifecycle ───────────────────────────────────────────────────────── private void Awake() @@ -40,6 +71,10 @@ public void RegisterEnemy(EnemyBase enemy) { bool wasClear = _activeEnemies.Count == 0; _activeEnemies.Add(enemy); + + if (_activeEnemies.Count > _peakEnemyCount) + _peakEnemyCount = _activeEnemies.Count; + if (wasClear) BeginCombat(); } @@ -49,16 +84,27 @@ public void UnregisterEnemy(EnemyBase enemy) if (_activeEnemies.Count == 0) EndCombat(); } - // ── Player action tracking (called by PlayerCombat / PlayerTraitEmitter) ── + // ── Player action tracking ──────────────────────────────────────────── public void RecordDodge() => _playerDodgedThisFight = true; /// - /// Called by PlayerHealth after it has already emitted HitTakenNoDodgeEvent. - /// CombatContext only updates its internal counter here — does NOT re-emit. + /// Called by PlayerHealth after emitting HitTakenNoDodgeEvent. + /// Only increments internal counter — does NOT re-emit. /// public void NotifyHitTaken() => _hitsWithoutDodge++; + /// + /// Called by PlayerCombat after a confirmed hit lands on an enemy. + /// Accumulates damage per enemy for Sacrifice death classification. + /// + public void RecordDamageDealt(EnemyBase enemy, float damage) + { + if (enemy == null) return; + _damageDealtPerEnemy.TryGetValue(enemy, out float prev); + _damageDealtPerEnemy[enemy] = prev + damage; + } + // ── Internal ────────────────────────────────────────────────────────── private void BeginCombat() @@ -66,9 +112,9 @@ private void BeginCombat() _combatStartTime = Time.time; _playerDodgedThisFight = false; _hitsWithoutDodge = 0; + _peakEnemyCount = _activeEnemies.Count; + _damageDealtPerEnemy.Clear(); - // Do NOT force player state here — CombatSystem and PlayerCombat own that. - // Only update game state and audio. SceneRouter.SetGameState(GameState.Combat); if (ServiceLocator.TryGet(out AudioManager audio)) @@ -81,8 +127,6 @@ private void EndCombat() { float duration = Time.time - _combatStartTime; - // "Dodge never used (combat completed)" — fires whenever the player finished - // a fight without using a single dodge, regardless of hits taken. if (!_playerDodgedThisFight) BehaviorEventBus.Emit(new CombatCompletedNoDodgeEvent()); diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatContext.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatContext.cs.meta new file mode 100644 index 0000000..b63c6ca --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatContext.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: f8cfc348954c64f99bfa4eac32c9c407 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatSystem.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatSystem.cs index 0141a9b..2792a63 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatSystem.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatSystem.cs @@ -10,8 +10,6 @@ namespace Fenrir.Combat /// public class CombatSystem : MonoBehaviour { - private const string BossEnemyId = "emberlord"; // must match EnemyBase._enemyId - // Lazy: player may not be in the scene when CombatSystem.Awake fires private PlayerCombat PlayerCombat => _playerCombat != null ? _playerCombat @@ -19,16 +17,15 @@ public class CombatSystem : MonoBehaviour private PlayerCombat _playerCombat; - // Key: enemyId, Value: consecutive kill count this session + // Key: enemyId (content identity), Value: consecutive kill count this session private readonly System.Collections.Generic.Dictionary _killCounts = new(); public void RegisterEnemy(EnemyBase enemy) { - string id = enemy.EnemyId; - var health = enemy.GetComponent(); - var emitter = enemy.GetComponent(); + var health = enemy.GetComponent(); + var emitter = enemy.GetComponent(); - PlayerCombat?.EnterCombat(id); + PlayerCombat?.EnterCombat(enemy.EnemyId); if (health != null) health.OnDied += () => HandleEnemyDeath(enemy, emitter); @@ -41,8 +38,8 @@ private void HandleEnemyDeath(EnemyBase enemy, EnemyTraitEmitter emitter) _killCounts.TryGetValue(id, out int count); _killCounts[id] = count + 1; - // Boss = specific enemy ID, not archetype (Elite = miniboss tier) - bool isBoss = id == BossEnemyId; + // Boss detection via archetype — EnemyId is content identity only + bool isBoss = enemy.Archetype == EnemyArchetype.Boss; emitter?.OnKilledByPlayer(isBoss, id); if (_killCounts[id] >= 3) diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Config/GameConfig.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Config/GameConfig.cs index 4701e9d..e8d22d2 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Config/GameConfig.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Config/GameConfig.cs @@ -42,9 +42,15 @@ public static class GameConfig public const float XpMultiplierLoreRead = 0.5f; public const float XpMultiplierRareCreature = 1.5f; - // ── Death Currency Loss ─────────────────────────────────────────────── - public const float DeathCurrencyLossMin = 0.15f; - public const float DeathCurrencyLossMax = 0.25f; + // ── Death classification ────────────────────────────────────────────── + public const float DeathCurrencyLossMin = 0.15f; + public const float DeathCurrencyLossMax = 0.25f; + /// HP fraction below which the player is considered "fighting at low HP" (Sacrifice death). + public const float SacrificeHpThreshold = 0.25f; + /// Max fraction of an enemy's HP the player may have dealt and still qualify as "minor damage". + public const float SacrificeMinorDamageMax = 0.25f; + /// Minimum enemy count in the encounter to qualify as a group fight for Sacrifice detection. + public const int SacrificeGroupEnemyMin = 2; // ── Elemental Resistance ───────────────────────────────────────────── public const float ElementalResistanceMod = -0.25f; // same element diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Core/GameLoop.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Core/GameLoop.cs.meta new file mode 100644 index 0000000..324da39 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Core/GameLoop.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: b5b1474a1c6fa4a3785b77a68b50464d \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Core/SceneRouter.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Core/SceneRouter.cs.meta new file mode 100644 index 0000000..d17de16 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Core/SceneRouter.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: dc8d23edee56a42f8bc471a5ff25b8e1 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyBase.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyBase.cs index 339a6cc..3711fb5 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyBase.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyBase.cs @@ -9,7 +9,8 @@ public enum EnemyArchetype Defensive, // shields, blocks Ranged, // projectile attacks Pack, // weak alone, dangerous in numbers - Elite // mini-boss tier, telegraphed heavy attacks + Elite, // mini-boss tier, telegraphed heavy attacks + Boss // true boss — unique per zone, triggers BossKilledEvent } /// diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerCombat.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerCombat.cs index 3771f80..68673d6 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerCombat.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerCombat.cs @@ -53,13 +53,15 @@ private void Awake() public void DoLightAttack(GameObject target) { + _health.NotifyAttackAttempt(); // records low-HP flag for Sacrifice classification var attack = new AttackData(AttackType.Light, _lightAttackDamage, PlayerElement); if (TryHitTarget(target, attack)) - _emitter.OnLightAttackLanded(); // emit ONLY after confirmed hit + _emitter.OnLightAttackLanded(); } public void DoHeavyAttack(GameObject target) { + _health.NotifyAttackAttempt(); var attack = new AttackData(AttackType.Heavy, _heavyAttackDamage, PlayerElement); if (TryHitTarget(target, attack)) _emitter.OnHeavyAttackLanded(); @@ -68,6 +70,7 @@ public void DoHeavyAttack(GameObject target) public void DoAbility(GameObject target) { if (!_energy.TrySpend(_abilityEnergyCost)) return; + _health.NotifyAttackAttempt(); var attack = new AttackData(AttackType.Ability, _abilityDamage, PlayerElement, isAbility: true); if (TryHitTarget(target, attack)) _emitter.OnAbilityUsed(); @@ -113,10 +116,21 @@ public void ExitCombat(bool playerWon) private bool TryHitTarget(GameObject target, AttackData attack) { if (target == null) return false; + var enemyHealth = target.GetComponent(); if (enemyHealth == null) return false; + float hpBefore = enemyHealth.Current; enemyHealth.TakeHit(attack, PlayerElement); + float damageDealt = hpBefore - enemyHealth.Current; + + // Report to CombatContext for Sacrifice death classification + if (damageDealt > 0f && ServiceLocator.TryGet(out CombatContext ctx)) + { + var enemyBase = target.GetComponent(); + ctx.RecordDamageDealt(enemyBase, damageDealt); + } + return true; } diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs index 10488aa..444cef9 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs @@ -1,6 +1,7 @@ using System; using Fenrir.Combat; using Fenrir.Config; +using Fenrir.Core; using Fenrir.Traits; using UnityEngine; @@ -14,24 +15,35 @@ public class PlayerHealth : MonoBehaviour { [SerializeField] private float _maxHp = 100f; - public float MaxHp => _maxHp; - public float Current { get; private set; } + public float MaxHp => _maxHp; + public float Current { get; private set; } public float CurrentNormalized => Current / _maxHp; - public bool IsDead { get; private set; } + public bool IsDead { get; private set; } - public event Action OnDied; - public event Action OnDamaged; // passes normalised HP after hit + public event Action OnDied; + public event Action OnDamaged; // normalised HP after hit private HitStateManager _hitState; - // Combat context for death classification + // Death classification data private int _hitsTakenThisCombat; private float _combatStartTime; private bool _inCombat; - private int _consecutiveDeathsVsSameEnemy; // tracked by PlayerCombat, injected here + private int _consecutiveDeathsVsSameEnemy; // injected by PlayerCombat + private bool _attackedWhileLowHp; // set by NotifyAttackAttempt public void SetConsecutiveDeaths(int v) => _consecutiveDeathsVsSameEnemy = v; + /// + /// Called by PlayerCombat before each attack attempt. + /// Records whether the player was at low HP — needed for Sacrifice death classification. + /// + public void NotifyAttackAttempt() + { + if (CurrentNormalized < GameConfig.SacrificeHpThreshold) + _attackedWhileLowHp = true; + } + private void Awake() { Current = _maxHp; @@ -40,24 +52,24 @@ private void Awake() public void BeginCombat() { - _inCombat = true; - _combatStartTime = Time.time; - _hitsTakenThisCombat = 0; + _inCombat = true; + _combatStartTime = Time.time; + _hitsTakenThisCombat = 0; + _attackedWhileLowHp = false; } public void EndCombat() => _inCombat = false; - /// Returns whether the hit landed (false if dodging). + /// Returns whether the hit landed (false if currently invincible). public bool TakeHit(AttackData attack, Element defenderElement) { - if (IsDead) return false; + if (IsDead) return false; if (_hitState.IsInvincible) return false; float damage = attack.BaseDamage; if (_hitState.IsPerfectBlockWindow) { - // Perfect block absorbs all damage BehaviorEventBus.Emit(new PerfectBlockEvent()); return true; } @@ -70,11 +82,9 @@ public bool TakeHit(AttackData attack, Element defenderElement) else { _hitsTakenThisCombat++; - // Emit once here. CombatContext.RecordHitTakenNoDodge() must NOT - // also call Emit — it only increments its internal counter. BehaviorEventBus.Emit(new HitTakenNoDodgeEvent()); - // Notify CombatContext for its end-of-combat accounting - if (Core.ServiceLocator.TryGet(out Combat.CombatContext ctx)) + // CombatContext increments its own counter — no re-emit + if (ServiceLocator.TryGet(out CombatContext ctx)) ctx.NotifyHitTaken(); } @@ -100,43 +110,64 @@ private void Die() { if (IsDead) return; IsDead = true; - EmitDeathEvent(); OnDied?.Invoke(); } private void EmitDeathEvent() { - // Ambush: died within 5s of entering combat + // 1. Ambush — died within 5s of combat start → no trait shift if (_inCombat && (Time.time - _combatStartTime) < 5f) { - // DeathAmbushEvent → no trait shift per design BehaviorEventBus.Emit(new DeathAmbushEvent()); return; } - // Pattern failure: 3rd+ death vs same enemy type + // 2. Pattern failure — 3rd+ death vs the same enemy type if (_consecutiveDeathsVsSameEnemy >= 2) { BehaviorEventBus.Emit(new DeathPatternFailEvent()); return; } - // Reckless: took 3+ unhpblocked hits with no dodge or block used + // 3. Sacrifice — fought at low HP (<25%) AND dealt only minor damage + // (< 25% of any single enemy's max HP) OR faced a group (2+ enemies) + if (_attackedWhileLowHp && IsSacrificeDeath()) + { + BehaviorEventBus.Emit(new DeathSacrificeEvent()); + return; + } + + // 4. Reckless — 3+ unblocked hits, no dodge or block if (_hitsTakenThisCombat >= 3) { BehaviorEventBus.Emit(new DeathRecklessEvent()); return; } - // Overwhelmed: classified externally (set before death) — fallback + // 5. Overwhelmed — fallback BehaviorEventBus.Emit(new DeathOverwhelmedEvent()); } + /// + /// Sacrifice conditions: minor damage dealt (< SacrificeMinorDamageMax of any + /// enemy's max HP) OR the encounter had 2+ enemies simultaneously. + /// + private static bool IsSacrificeDeath() + { + if (!ServiceLocator.TryGet(out CombatContext ctx)) return false; + + bool groupFight = ctx.PeakEnemyCount >= GameConfig.SacrificeGroupEnemyMin; + bool minorDamage = ctx.MaxDamageFractionDealt < GameConfig.SacrificeMinorDamageMax; + + return groupFight || minorDamage; + } + public void Revive(float hpFraction = 1f) { - IsDead = false; - Current = _maxHp * Mathf.Clamp01(hpFraction); + IsDead = false; + _attackedWhileLowHp = false; + Current = _maxHp * Mathf.Clamp01(hpFraction); } } } diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/AppStateMachine.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/AppStateMachine.cs.meta new file mode 100644 index 0000000..ff02c4d --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/StateMachine/AppStateMachine.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 25a3841cdf5d44debb5ce21706f17be7 \ No newline at end of file From 2b5a7f1112b87e34d4dbac1d3dbfa2d55c79c85a Mon Sep 17 00:00:00 2001 From: Seni Date: Wed, 3 Jun 2026 08:29:49 -0700 Subject: [PATCH 09/27] feat(design): group-fight = all living zone enemies at combat start, not aggroed count --- .../_Project/Scripts/Combat/CombatContext.cs | 28 ++++++++++++++----- .../_Project/Scripts/Combat/CombatContext.cs | 28 ++++++++++++++----- 2 files changed, 42 insertions(+), 14 deletions(-) diff --git a/src/Assets/_Project/Scripts/Combat/CombatContext.cs b/src/Assets/_Project/Scripts/Combat/CombatContext.cs index adf6ac8..dadcd15 100644 --- a/src/Assets/_Project/Scripts/Combat/CombatContext.cs +++ b/src/Assets/_Project/Scripts/Combat/CombatContext.cs @@ -71,11 +71,7 @@ public void RegisterEnemy(EnemyBase enemy) { bool wasClear = _activeEnemies.Count == 0; _activeEnemies.Add(enemy); - - if (_activeEnemies.Count > _peakEnemyCount) - _peakEnemyCount = _activeEnemies.Count; - - if (wasClear) BeginCombat(); + if (wasClear) BeginCombat(); // zone count snapshotted inside BeginCombat } public void UnregisterEnemy(EnemyBase enemy) @@ -112,15 +108,33 @@ private void BeginCombat() _combatStartTime = Time.time; _playerDodgedThisFight = false; _hitsWithoutDodge = 0; - _peakEnemyCount = _activeEnemies.Count; _damageDealtPerEnemy.Clear(); + // Group = all living enemies present in the zone, not just aggroed ones. + // A player fighting one wolf while two more patrol nearby is still a group fight. + _peakEnemyCount = CountLivingEnemiesInZone(); + SceneRouter.SetGameState(GameState.Combat); if (ServiceLocator.TryGet(out AudioManager audio)) audio.StartCombatMusic(); - Debug.Log("[CombatContext] Combat started."); + Debug.Log($"[CombatContext] Combat started. Zone enemies: {_peakEnemyCount}"); + } + + /// + /// Counts all EnemyHealth components in the scene that are alive. + /// Intentionally includes non-aggroed enemies — the zone defines the threat context. + /// + private static int CountLivingEnemiesInZone() + { + int count = 0; + foreach (Entities.Enemies.EnemyHealth h in + FindObjectsByType(FindObjectsSortMode.None)) + { + if (!h.IsDead) count++; + } + return count; } private void EndCombat() diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatContext.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatContext.cs index adf6ac8..dadcd15 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatContext.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatContext.cs @@ -71,11 +71,7 @@ public void RegisterEnemy(EnemyBase enemy) { bool wasClear = _activeEnemies.Count == 0; _activeEnemies.Add(enemy); - - if (_activeEnemies.Count > _peakEnemyCount) - _peakEnemyCount = _activeEnemies.Count; - - if (wasClear) BeginCombat(); + if (wasClear) BeginCombat(); // zone count snapshotted inside BeginCombat } public void UnregisterEnemy(EnemyBase enemy) @@ -112,15 +108,33 @@ private void BeginCombat() _combatStartTime = Time.time; _playerDodgedThisFight = false; _hitsWithoutDodge = 0; - _peakEnemyCount = _activeEnemies.Count; _damageDealtPerEnemy.Clear(); + // Group = all living enemies present in the zone, not just aggroed ones. + // A player fighting one wolf while two more patrol nearby is still a group fight. + _peakEnemyCount = CountLivingEnemiesInZone(); + SceneRouter.SetGameState(GameState.Combat); if (ServiceLocator.TryGet(out AudioManager audio)) audio.StartCombatMusic(); - Debug.Log("[CombatContext] Combat started."); + Debug.Log($"[CombatContext] Combat started. Zone enemies: {_peakEnemyCount}"); + } + + /// + /// Counts all EnemyHealth components in the scene that are alive. + /// Intentionally includes non-aggroed enemies — the zone defines the threat context. + /// + private static int CountLivingEnemiesInZone() + { + int count = 0; + foreach (Entities.Enemies.EnemyHealth h in + FindObjectsByType(FindObjectsSortMode.None)) + { + if (!h.IsDead) count++; + } + return count; } private void EndCombat() From bc3a2ab02e3da629b6cb36b53b2c13560f388a17 Mon Sep 17 00:00:00 2001 From: Seni Date: Wed, 3 Jun 2026 08:34:14 -0700 Subject: [PATCH 10/27] fix(audit3): DateTime fields, WorldManager singleton, player cache, GameConfig constants, ServiceLocator registration --- .../_Project/Scripts/Config/GameConfig.cs | 9 +++ .../Scripts/Entities/Enemies/EnemyAI.cs | 22 ++++--- .../Scripts/Evolution/EvolutionSequencer.cs | 5 +- .../Scripts/Evolution/ShrineController.cs | 2 +- .../_Project/Scripts/Input/TouchMapper.cs | 34 +++++++--- .../_Project/Scripts/Save/SaveManager.cs | 2 +- .../Scripts/Traits/TraitAccumulator.cs | 4 +- .../_Project/Scripts/World/DayNightCycle.cs | 8 +-- .../_Project/Scripts/World/WorldManager.cs | 63 +++++++++---------- .../_Project/Scripts/Config/GameConfig.cs | 9 +++ .../Scripts/Entities/Enemies/EnemyAI.cs | 22 ++++--- .../Scripts/Evolution/EvolutionSequencer.cs | 5 +- .../Scripts/Evolution/ShrineController.cs | 2 +- .../_Project/Scripts/Input/TouchMapper.cs | 10 +-- .../_Project/Scripts/Save/SaveManager.cs | 2 +- .../Scripts/Traits/TraitAccumulator.cs | 4 +- .../_Project/Scripts/World/DayNightCycle.cs | 8 +-- .../_Project/Scripts/World/WorldManager.cs | 62 ++++++++---------- 18 files changed, 149 insertions(+), 124 deletions(-) diff --git a/src/Assets/_Project/Scripts/Config/GameConfig.cs b/src/Assets/_Project/Scripts/Config/GameConfig.cs index e8d22d2..b8aba18 100644 --- a/src/Assets/_Project/Scripts/Config/GameConfig.cs +++ b/src/Assets/_Project/Scripts/Config/GameConfig.cs @@ -12,6 +12,7 @@ public static class GameConfig public const float TraitEvolutionCarryover = 0.30f; // 30% shift toward neutral on evolution public const float TraitDecayRatePerDay = 0.02f; // disabled in MVP public const int FrequencyDampenAfter = 5; // dampening kicks in after N identical events/session + public const float FrequencyDampenFactor = 0.5f; // each extra step halves the delta // ── Awakening ──────────────────────────────────────────────────────── public const int MaxCharacterSlots = 2; @@ -34,6 +35,10 @@ public static class GameConfig // ── Day / Night ────────────────────────────────────────────────────── public const float DayNightCycleDurationSeconds = 1200f; // 20 minutes + /// Normalised time fractions marking phase boundaries (0–1 over full cycle). + public const float DawnEndFraction = 0.15f; + public const float DayEndFraction = 0.50f; + public const float DuskEndFraction = 0.70f; // ── XP ─────────────────────────────────────────────────────────────── public const float XpMultiplierBossKill = 5f; @@ -56,6 +61,10 @@ public static class GameConfig public const float ElementalResistanceMod = -0.25f; // same element public const float ElementalWeaknessMod = 0.25f; // opposite element + // ── Shrine ─────────────────────────────────────────────────────────── + /// FitScore at or above this value transitions shrine from Stirring → Active. + public const float ShrineActiveFitThreshold = 0.5f; + // ── Save ───────────────────────────────────────────────────────────── public const string SaveFileName = "save.json"; public const string KeychainSlotSeedKey = "fenrir_slot_seed_{0}"; // {0} = slot index diff --git a/src/Assets/_Project/Scripts/Entities/Enemies/EnemyAI.cs b/src/Assets/_Project/Scripts/Entities/Enemies/EnemyAI.cs index b4ff59c..a9ab807 100644 --- a/src/Assets/_Project/Scripts/Entities/Enemies/EnemyAI.cs +++ b/src/Assets/_Project/Scripts/Entities/Enemies/EnemyAI.cs @@ -24,10 +24,11 @@ private enum AIState { Idle, Chase, Attack, Stagger, Dead } private NavMeshAgent _agent; // ── State ───────────────────────────────────────────────────────────── - private AIState _state = AIState.Idle; + private AIState _state = AIState.Idle; private Transform _target; - private float _attackCooldown; - private float _staggerTimer; + private Transform _cachedPlayer; // cached once; never call FindWithTag in Update + private float _attackCooldown; + private float _staggerTimer; private void Awake() { @@ -38,6 +39,13 @@ private void Awake() _health.OnDied += HandleDeath; } + private void Start() + { + // Cache player once at scene start — FindWithTag must NOT run in Update + GameObject player = GameObject.FindWithTag("Player"); + if (player != null) _cachedPlayer = player.transform; + } + private void Update() { switch (_state) @@ -53,7 +61,7 @@ private void Update() private void TickIdle() { - _target = FindPlayer(); + _target = _cachedPlayer; if (_target == null) return; float dist = Vector3.Distance(transform.position, _target.position); @@ -117,11 +125,7 @@ private void PerformAttack() GetComponent()?.Attack(_target.gameObject); } - private static Transform FindPlayer() - { - var go = GameObject.FindWithTag("Player"); - return go != null ? go.transform : null; - } + // FindWithTag removed — player is cached in Start() via _cachedPlayer. private void TransitionTo(AIState next) { diff --git a/src/Assets/_Project/Scripts/Evolution/EvolutionSequencer.cs b/src/Assets/_Project/Scripts/Evolution/EvolutionSequencer.cs index e64d6e3..72cd832 100644 --- a/src/Assets/_Project/Scripts/Evolution/EvolutionSequencer.cs +++ b/src/Assets/_Project/Scripts/Evolution/EvolutionSequencer.cs @@ -90,9 +90,8 @@ private IEnumerator RunSequence() private static void SetInputEnabled(bool enabled) { - // Disable/enable via TouchMapper found in scene - var mapper = FindAnyObjectByType(); - if (mapper != null) mapper.enabled = enabled; + if (Core.ServiceLocator.TryGet(out Input.TouchMapper mapper)) + mapper.enabled = enabled; } } } diff --git a/src/Assets/_Project/Scripts/Evolution/ShrineController.cs b/src/Assets/_Project/Scripts/Evolution/ShrineController.cs index 2606268..fdb227e 100644 --- a/src/Assets/_Project/Scripts/Evolution/ShrineController.cs +++ b/src/Assets/_Project/Scripts/Evolution/ShrineController.cs @@ -62,7 +62,7 @@ private void RefreshState() ShrineState next; if (candidates.Length == 0) next = ShrineState.Dormant; - else if (candidates[0].FitScore < 0.5f) + else if (candidates[0].FitScore < Config.GameConfig.ShrineActiveFitThreshold) next = ShrineState.Stirring; else next = ShrineState.Active; diff --git a/src/Assets/_Project/Scripts/Input/TouchMapper.cs b/src/Assets/_Project/Scripts/Input/TouchMapper.cs index 2539140..e1de6a4 100644 --- a/src/Assets/_Project/Scripts/Input/TouchMapper.cs +++ b/src/Assets/_Project/Scripts/Input/TouchMapper.cs @@ -1,3 +1,4 @@ +using Fenrir.Core; using Fenrir.Entities.Player; using UnityEngine; @@ -5,31 +6,44 @@ namespace Fenrir.Input { /// /// Bridges gesture intents to the player entity. - /// GestureRecognizer calls this; it forwards commands to PlayerController / PlayerCombat. + /// Auto-finds PlayerController and PlayerCombat in scene if not wired via Inspector. /// public class TouchMapper : MonoBehaviour { [SerializeField] private PlayerController _controller; [SerializeField] private PlayerCombat _combat; - // Optional: closest enemy lock-on target (set by combat system) public GameObject CurrentTarget { get; set; } + private void Awake() + { + if (_controller == null) _controller = FindAnyObjectByType(); + if (_combat == null) _combat = FindAnyObjectByType(); + ServiceLocator.Register(this); + } + + private void OnDestroy() => ServiceLocator.Unregister(); + // ── Movement ────────────────────────────────────────────────────────── - public void OnMoveInput(Vector2 input) => _controller.SetMoveInput(input); + public void OnMoveInput(Vector2 input) + { + _controller?.SetMoveInput(input); + } // ── Combat ──────────────────────────────────────────────────────────── - public void OnLightAttack() => _combat.DoLightAttack(CurrentTarget); - public void OnHeavyAttack() => _combat.DoHeavyAttack(CurrentTarget); - public void OnAbility() => _combat.DoAbility(CurrentTarget); + public void OnLightAttack() => _combat?.DoLightAttack(CurrentTarget); + public void OnHeavyAttack() => _combat?.DoHeavyAttack(CurrentTarget); + public void OnAbility() => _combat?.DoAbility(CurrentTarget); + public void OnDodge() { - _controller.RequestDodge(); - _combat.DoDodge(); + _controller?.RequestDodge(); + _combat?.DoDodge(); } - public void OnBlockHeld() => _combat.DoBlock(); - public void OnBlockReleased()=> _combat.EndBlock(); + + public void OnBlockHeld() => _combat?.DoBlock(); + public void OnBlockReleased() => _combat?.EndBlock(); } } diff --git a/src/Assets/_Project/Scripts/Save/SaveManager.cs b/src/Assets/_Project/Scripts/Save/SaveManager.cs index 1ab7d20..610b5db 100644 --- a/src/Assets/_Project/Scripts/Save/SaveManager.cs +++ b/src/Assets/_Project/Scripts/Save/SaveManager.cs @@ -22,7 +22,7 @@ public async Task SaveAsync() { try { - Current.SavedAt = DateTime.UtcNow; + Current.SavedAtUtc = DateTimeOffset.UtcNow.ToUnixTimeSeconds(); string json = JsonUtility.ToJson(Current, prettyPrint: true); await File.WriteAllTextAsync(_savePath, json); _isDirty = false; diff --git a/src/Assets/_Project/Scripts/Traits/TraitAccumulator.cs b/src/Assets/_Project/Scripts/Traits/TraitAccumulator.cs index ed90046..f2d0304 100644 --- a/src/Assets/_Project/Scripts/Traits/TraitAccumulator.cs +++ b/src/Assets/_Project/Scripts/Traits/TraitAccumulator.cs @@ -34,7 +34,7 @@ public void Process(BehaviorEvent evt) Profile.Apply(key, entry.Value * dampen); } - Profile.LastUpdated = DateTime.UtcNow; + Profile.LastUpdatedUtc = DateTimeOffset.UtcNow.ToUnixTimeSeconds(); } public void ApplyDecay(float daysSinceLastPlay) @@ -61,7 +61,7 @@ private float ComputeDampeningFactor(string eventKey) // Halves every FrequencyDampenAfter occurrences int steps = (count - GameConfig.FrequencyDampenAfter) / GameConfig.FrequencyDampenAfter; - return Mathf.Pow(0.5f, steps + 1); + return Mathf.Pow(GameConfig.FrequencyDampenFactor, steps + 1); } } } diff --git a/src/Assets/_Project/Scripts/World/DayNightCycle.cs b/src/Assets/_Project/Scripts/World/DayNightCycle.cs index 7a22d77..285d782 100644 --- a/src/Assets/_Project/Scripts/World/DayNightCycle.cs +++ b/src/Assets/_Project/Scripts/World/DayNightCycle.cs @@ -67,10 +67,10 @@ private void CheckPhaseTransition() private static DayPhase ComputePhase(float t) => t switch { - < 0.15f => DayPhase.Dawn, - < 0.50f => DayPhase.Day, - < 0.70f => DayPhase.Dusk, - _ => DayPhase.Night + var v when v < GameConfig.DawnEndFraction => DayPhase.Dawn, + var v when v < GameConfig.DayEndFraction => DayPhase.Day, + var v when v < GameConfig.DuskEndFraction => DayPhase.Dusk, + _ => DayPhase.Night }; } } diff --git a/src/Assets/_Project/Scripts/World/WorldManager.cs b/src/Assets/_Project/Scripts/World/WorldManager.cs index a0a10cb..70bbc54 100644 --- a/src/Assets/_Project/Scripts/World/WorldManager.cs +++ b/src/Assets/_Project/Scripts/World/WorldManager.cs @@ -6,69 +6,62 @@ namespace Fenrir.World { /// - /// Scene-level singleton for the game world. - /// Owns day/night cycle reference, manages shrine/secret tracking, - /// and writes world-state changes to save. + /// Scene-level manager for the game world. + /// Registered with ServiceLocator on Awake — access via + /// ServiceLocator.Get<WorldManager>() + /// No static singleton; complies with architecture rules. /// public class WorldManager : MonoBehaviour { [SerializeField] private DayNightCycle _dayNight; - public static WorldManager Instance { get; private set; } - private void Awake() { - if (Instance != null && Instance != this) { Destroy(gameObject); return; } - Instance = this; + ServiceLocator.Register(this); + if (_dayNight == null) _dayNight = FindAnyObjectByType(); + } + + private void OnDestroy() + { + ServiceLocator.Unregister(); } private void Start() { - if (!ServiceLocator.TryGet(out var save)) return; + if (!ServiceLocator.TryGet(out ISaveManager save)) return; - // Restore world time from save _dayNight?.InitializeFromSave(save.Current.World.TimeOfDay); - // Subscribe to phase changes to persist time-of-day if (_dayNight != null) _dayNight.OnPhaseChanged += _ => PersistTimeOfDay(); } - // ── Public API (called by world scripting) ──────────────────────────── + // ── Public API ──────────────────────────────────────────────────────── public void MarkSecretDiscovered(string secretId) { - if (!ServiceLocator.TryGet(out var save)) return; - var secrets = save.Current.World.DiscoveredSecrets; - if (!secrets.Contains(secretId)) - { - secrets.Add(secretId); - save.MarkDirty(); - BehaviorEventBus.Emit(new SecretAreaDiscoveredEvent()); - } + if (!ServiceLocator.TryGet(out ISaveManager save)) return; + if (save.Current.World.DiscoveredSecrets.Contains(secretId)) return; + save.Current.World.DiscoveredSecrets.Add(secretId); + save.MarkDirty(); + BehaviorEventBus.Emit(new SecretAreaDiscoveredEvent()); } public void MarkQuestCompleted(string questId) { - if (!ServiceLocator.TryGet(out var save)) return; - var quests = save.Current.World.CompletedQuests; - if (!quests.Contains(questId)) - { - quests.Add(questId); - save.MarkDirty(); - BehaviorEventBus.Emit(new QuestCompletedEvent()); - } + if (!ServiceLocator.TryGet(out ISaveManager save)) return; + if (save.Current.World.CompletedQuests.Contains(questId)) return; + save.Current.World.CompletedQuests.Add(questId); + save.MarkDirty(); + BehaviorEventBus.Emit(new QuestCompletedEvent()); } public void MarkShrineActivated(string shrineId) { - if (!ServiceLocator.TryGet(out var save)) return; - var shrines = save.Current.World.ActivatedShrines; - if (!shrines.Contains(shrineId)) - { - shrines.Add(shrineId); - save.MarkDirty(); - } + if (!ServiceLocator.TryGet(out ISaveManager save)) return; + if (save.Current.World.ActivatedShrines.Contains(shrineId)) return; + save.Current.World.ActivatedShrines.Add(shrineId); + save.MarkDirty(); } public void OnPlayerRested() @@ -81,7 +74,7 @@ public void OnPlayerRested() private void PersistTimeOfDay() { - if (!ServiceLocator.TryGet(out var save)) return; + if (!ServiceLocator.TryGet(out ISaveManager save)) return; save.Current.World.TimeOfDay = _dayNight != null ? _dayNight.NormalizedTime : 0f; save.MarkDirty(); } diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Config/GameConfig.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Config/GameConfig.cs index e8d22d2..b8aba18 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Config/GameConfig.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Config/GameConfig.cs @@ -12,6 +12,7 @@ public static class GameConfig public const float TraitEvolutionCarryover = 0.30f; // 30% shift toward neutral on evolution public const float TraitDecayRatePerDay = 0.02f; // disabled in MVP public const int FrequencyDampenAfter = 5; // dampening kicks in after N identical events/session + public const float FrequencyDampenFactor = 0.5f; // each extra step halves the delta // ── Awakening ──────────────────────────────────────────────────────── public const int MaxCharacterSlots = 2; @@ -34,6 +35,10 @@ public static class GameConfig // ── Day / Night ────────────────────────────────────────────────────── public const float DayNightCycleDurationSeconds = 1200f; // 20 minutes + /// Normalised time fractions marking phase boundaries (0–1 over full cycle). + public const float DawnEndFraction = 0.15f; + public const float DayEndFraction = 0.50f; + public const float DuskEndFraction = 0.70f; // ── XP ─────────────────────────────────────────────────────────────── public const float XpMultiplierBossKill = 5f; @@ -56,6 +61,10 @@ public static class GameConfig public const float ElementalResistanceMod = -0.25f; // same element public const float ElementalWeaknessMod = 0.25f; // opposite element + // ── Shrine ─────────────────────────────────────────────────────────── + /// FitScore at or above this value transitions shrine from Stirring → Active. + public const float ShrineActiveFitThreshold = 0.5f; + // ── Save ───────────────────────────────────────────────────────────── public const string SaveFileName = "save.json"; public const string KeychainSlotSeedKey = "fenrir_slot_seed_{0}"; // {0} = slot index diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyAI.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyAI.cs index b4ff59c..a9ab807 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyAI.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyAI.cs @@ -24,10 +24,11 @@ private enum AIState { Idle, Chase, Attack, Stagger, Dead } private NavMeshAgent _agent; // ── State ───────────────────────────────────────────────────────────── - private AIState _state = AIState.Idle; + private AIState _state = AIState.Idle; private Transform _target; - private float _attackCooldown; - private float _staggerTimer; + private Transform _cachedPlayer; // cached once; never call FindWithTag in Update + private float _attackCooldown; + private float _staggerTimer; private void Awake() { @@ -38,6 +39,13 @@ private void Awake() _health.OnDied += HandleDeath; } + private void Start() + { + // Cache player once at scene start — FindWithTag must NOT run in Update + GameObject player = GameObject.FindWithTag("Player"); + if (player != null) _cachedPlayer = player.transform; + } + private void Update() { switch (_state) @@ -53,7 +61,7 @@ private void Update() private void TickIdle() { - _target = FindPlayer(); + _target = _cachedPlayer; if (_target == null) return; float dist = Vector3.Distance(transform.position, _target.position); @@ -117,11 +125,7 @@ private void PerformAttack() GetComponent()?.Attack(_target.gameObject); } - private static Transform FindPlayer() - { - var go = GameObject.FindWithTag("Player"); - return go != null ? go.transform : null; - } + // FindWithTag removed — player is cached in Start() via _cachedPlayer. private void TransitionTo(AIState next) { diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/EvolutionSequencer.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/EvolutionSequencer.cs index e64d6e3..72cd832 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/EvolutionSequencer.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/EvolutionSequencer.cs @@ -90,9 +90,8 @@ private IEnumerator RunSequence() private static void SetInputEnabled(bool enabled) { - // Disable/enable via TouchMapper found in scene - var mapper = FindAnyObjectByType(); - if (mapper != null) mapper.enabled = enabled; + if (Core.ServiceLocator.TryGet(out Input.TouchMapper mapper)) + mapper.enabled = enabled; } } } diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/ShrineController.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/ShrineController.cs index 2606268..fdb227e 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/ShrineController.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/ShrineController.cs @@ -62,7 +62,7 @@ private void RefreshState() ShrineState next; if (candidates.Length == 0) next = ShrineState.Dormant; - else if (candidates[0].FitScore < 0.5f) + else if (candidates[0].FitScore < Config.GameConfig.ShrineActiveFitThreshold) next = ShrineState.Stirring; else next = ShrineState.Active; diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Input/TouchMapper.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Input/TouchMapper.cs index 35142b0..e1de6a4 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Input/TouchMapper.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Input/TouchMapper.cs @@ -1,3 +1,4 @@ +using Fenrir.Core; using Fenrir.Entities.Player; using UnityEngine; @@ -16,12 +17,13 @@ public class TouchMapper : MonoBehaviour private void Awake() { - if (_controller == null) - _controller = FindAnyObjectByType(); - if (_combat == null) - _combat = FindAnyObjectByType(); + if (_controller == null) _controller = FindAnyObjectByType(); + if (_combat == null) _combat = FindAnyObjectByType(); + ServiceLocator.Register(this); } + private void OnDestroy() => ServiceLocator.Unregister(); + // ── Movement ────────────────────────────────────────────────────────── public void OnMoveInput(Vector2 input) diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Save/SaveManager.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Save/SaveManager.cs index 1ab7d20..610b5db 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Save/SaveManager.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Save/SaveManager.cs @@ -22,7 +22,7 @@ public async Task SaveAsync() { try { - Current.SavedAt = DateTime.UtcNow; + Current.SavedAtUtc = DateTimeOffset.UtcNow.ToUnixTimeSeconds(); string json = JsonUtility.ToJson(Current, prettyPrint: true); await File.WriteAllTextAsync(_savePath, json); _isDirty = false; diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Traits/TraitAccumulator.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Traits/TraitAccumulator.cs index ed90046..f2d0304 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Traits/TraitAccumulator.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Traits/TraitAccumulator.cs @@ -34,7 +34,7 @@ public void Process(BehaviorEvent evt) Profile.Apply(key, entry.Value * dampen); } - Profile.LastUpdated = DateTime.UtcNow; + Profile.LastUpdatedUtc = DateTimeOffset.UtcNow.ToUnixTimeSeconds(); } public void ApplyDecay(float daysSinceLastPlay) @@ -61,7 +61,7 @@ private float ComputeDampeningFactor(string eventKey) // Halves every FrequencyDampenAfter occurrences int steps = (count - GameConfig.FrequencyDampenAfter) / GameConfig.FrequencyDampenAfter; - return Mathf.Pow(0.5f, steps + 1); + return Mathf.Pow(GameConfig.FrequencyDampenFactor, steps + 1); } } } diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/World/DayNightCycle.cs b/src/ProjectFenrir/Assets/_Project/Scripts/World/DayNightCycle.cs index 7a22d77..285d782 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/World/DayNightCycle.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/World/DayNightCycle.cs @@ -67,10 +67,10 @@ private void CheckPhaseTransition() private static DayPhase ComputePhase(float t) => t switch { - < 0.15f => DayPhase.Dawn, - < 0.50f => DayPhase.Day, - < 0.70f => DayPhase.Dusk, - _ => DayPhase.Night + var v when v < GameConfig.DawnEndFraction => DayPhase.Dawn, + var v when v < GameConfig.DayEndFraction => DayPhase.Day, + var v when v < GameConfig.DuskEndFraction => DayPhase.Dusk, + _ => DayPhase.Night }; } } diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/World/WorldManager.cs b/src/ProjectFenrir/Assets/_Project/Scripts/World/WorldManager.cs index 8de8d4f..70bbc54 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/World/WorldManager.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/World/WorldManager.cs @@ -6,70 +6,62 @@ namespace Fenrir.World { /// - /// Scene-level singleton for the game world. - /// Owns day/night cycle reference, manages shrine/secret tracking, - /// and writes world-state changes to save. + /// Scene-level manager for the game world. + /// Registered with ServiceLocator on Awake — access via + /// ServiceLocator.Get<WorldManager>() + /// No static singleton; complies with architecture rules. /// public class WorldManager : MonoBehaviour { [SerializeField] private DayNightCycle _dayNight; - public static WorldManager Instance { get; private set; } - private void Awake() { - if (Instance != null && Instance != this) { Destroy(gameObject); return; } - Instance = this; + ServiceLocator.Register(this); if (_dayNight == null) _dayNight = FindAnyObjectByType(); } + private void OnDestroy() + { + ServiceLocator.Unregister(); + } + private void Start() { - if (!ServiceLocator.TryGet(out var save)) return; + if (!ServiceLocator.TryGet(out ISaveManager save)) return; - // Restore world time from save _dayNight?.InitializeFromSave(save.Current.World.TimeOfDay); - // Subscribe to phase changes to persist time-of-day if (_dayNight != null) _dayNight.OnPhaseChanged += _ => PersistTimeOfDay(); } - // ── Public API (called by world scripting) ──────────────────────────── + // ── Public API ──────────────────────────────────────────────────────── public void MarkSecretDiscovered(string secretId) { - if (!ServiceLocator.TryGet(out var save)) return; - var secrets = save.Current.World.DiscoveredSecrets; - if (!secrets.Contains(secretId)) - { - secrets.Add(secretId); - save.MarkDirty(); - BehaviorEventBus.Emit(new SecretAreaDiscoveredEvent()); - } + if (!ServiceLocator.TryGet(out ISaveManager save)) return; + if (save.Current.World.DiscoveredSecrets.Contains(secretId)) return; + save.Current.World.DiscoveredSecrets.Add(secretId); + save.MarkDirty(); + BehaviorEventBus.Emit(new SecretAreaDiscoveredEvent()); } public void MarkQuestCompleted(string questId) { - if (!ServiceLocator.TryGet(out var save)) return; - var quests = save.Current.World.CompletedQuests; - if (!quests.Contains(questId)) - { - quests.Add(questId); - save.MarkDirty(); - BehaviorEventBus.Emit(new QuestCompletedEvent()); - } + if (!ServiceLocator.TryGet(out ISaveManager save)) return; + if (save.Current.World.CompletedQuests.Contains(questId)) return; + save.Current.World.CompletedQuests.Add(questId); + save.MarkDirty(); + BehaviorEventBus.Emit(new QuestCompletedEvent()); } public void MarkShrineActivated(string shrineId) { - if (!ServiceLocator.TryGet(out var save)) return; - var shrines = save.Current.World.ActivatedShrines; - if (!shrines.Contains(shrineId)) - { - shrines.Add(shrineId); - save.MarkDirty(); - } + if (!ServiceLocator.TryGet(out ISaveManager save)) return; + if (save.Current.World.ActivatedShrines.Contains(shrineId)) return; + save.Current.World.ActivatedShrines.Add(shrineId); + save.MarkDirty(); } public void OnPlayerRested() @@ -82,7 +74,7 @@ public void OnPlayerRested() private void PersistTimeOfDay() { - if (!ServiceLocator.TryGet(out var save)) return; + if (!ServiceLocator.TryGet(out ISaveManager save)) return; save.Current.World.TimeOfDay = _dayNight != null ? _dayNight.NormalizedTime : 0f; save.MarkDirty(); } From 58f05754133f73926be0cc182d235821ccbce5af Mon Sep 17 00:00:00 2001 From: Seni Date: Wed, 3 Jun 2026 08:36:46 -0700 Subject: [PATCH 11/27] feat(design): sacrifice group = aggroed/alerted enemies only via EnemyAI.IsAwareOfPlayer; live query at death --- .../_Project/Scripts/Combat/CombatContext.cs | 46 +++++++--------- .../Scripts/Entities/Enemies/EnemyAI.cs | 54 ++++++++----------- .../Scripts/Entities/Player/PlayerHealth.cs | 6 ++- .../_Project/Scripts/Combat/CombatContext.cs | 46 +++++++--------- .../Scripts/Entities/Enemies/EnemyAI.cs | 54 ++++++++----------- .../Scripts/Entities/Player/PlayerHealth.cs | 6 ++- 6 files changed, 90 insertions(+), 122 deletions(-) diff --git a/src/Assets/_Project/Scripts/Combat/CombatContext.cs b/src/Assets/_Project/Scripts/Combat/CombatContext.cs index dadcd15..e79c85e 100644 --- a/src/Assets/_Project/Scripts/Combat/CombatContext.cs +++ b/src/Assets/_Project/Scripts/Combat/CombatContext.cs @@ -22,20 +22,29 @@ public class CombatContext : MonoBehaviour private bool _playerDodgedThisFight; private int _hitsWithoutDodge; - // Sacrifice death tracking - private int _peakEnemyCount; - // Key: EnemyBase instance, Value: total damage dealt by player to that enemy this fight private readonly Dictionary _damageDealtPerEnemy = new(); - // ── Public read-only queries (used by PlayerHealth for death classification) ── + // ── Public queries (used by PlayerHealth for death classification) ───── - /// Highest number of simultaneous enemies in this encounter. - public int PeakEnemyCount => _peakEnemyCount; + /// + /// Count of enemies currently aggroed or alerted — queried live at death time + /// so enemies that join mid-fight are included. Uses EnemyAI.IsAwareOfPlayer. + /// + public int GetAwareEnemyCount() + { + int count = 0; + foreach (Entities.Enemies.EnemyAI ai in + FindObjectsByType(FindObjectsSortMode.None)) + { + if (ai.IsAwareOfPlayer) count++; + } + return count; + } /// - /// Highest fraction of any single enemy's max HP that the player dealt in this fight. - /// Returns 0 if no damage was recorded. + /// Highest fraction of any single enemy's max HP dealt by the player this fight. + /// Returns 0 if no damage recorded. /// public float MaxDamageFractionDealt { @@ -110,31 +119,12 @@ private void BeginCombat() _hitsWithoutDodge = 0; _damageDealtPerEnemy.Clear(); - // Group = all living enemies present in the zone, not just aggroed ones. - // A player fighting one wolf while two more patrol nearby is still a group fight. - _peakEnemyCount = CountLivingEnemiesInZone(); - SceneRouter.SetGameState(GameState.Combat); if (ServiceLocator.TryGet(out AudioManager audio)) audio.StartCombatMusic(); - Debug.Log($"[CombatContext] Combat started. Zone enemies: {_peakEnemyCount}"); - } - - /// - /// Counts all EnemyHealth components in the scene that are alive. - /// Intentionally includes non-aggroed enemies — the zone defines the threat context. - /// - private static int CountLivingEnemiesInZone() - { - int count = 0; - foreach (Entities.Enemies.EnemyHealth h in - FindObjectsByType(FindObjectsSortMode.None)) - { - if (!h.IsDead) count++; - } - return count; + Debug.Log("[CombatContext] Combat started."); } private void EndCombat() diff --git a/src/Assets/_Project/Scripts/Entities/Enemies/EnemyAI.cs b/src/Assets/_Project/Scripts/Entities/Enemies/EnemyAI.cs index a9ab807..14f9385 100644 --- a/src/Assets/_Project/Scripts/Entities/Enemies/EnemyAI.cs +++ b/src/Assets/_Project/Scripts/Entities/Enemies/EnemyAI.cs @@ -19,21 +19,35 @@ private enum AIState { Idle, Chase, Attack, Stagger, Dead } [SerializeField] private float _staggerDuration = 0.5f; // ── Components ──────────────────────────────────────────────────────── - private EnemyBase _base; - private EnemyHealth _health; + private EnemyBase _base; + private EnemyHealth _health; + private EnemyCombat _combat; // cached — A3 fix: was GetComponent every attack private NavMeshAgent _agent; // ── State ───────────────────────────────────────────────────────────── private AIState _state = AIState.Idle; private Transform _target; - private Transform _cachedPlayer; // cached once; never call FindWithTag in Update + private Transform _cachedPlayer; private float _attackCooldown; private float _staggerTimer; + // ── Public awareness query (used by CombatContext for Sacrifice classification) ── + + /// + /// True when this enemy is aware of the player — aggroed (Chase/Attack) or + /// alerted but unable to reach (Stagger). False when Idle or Dead. + /// CombatContext reads this; state enum stays private. + /// + public bool IsAwareOfPlayer => + _state is AIState.Chase or AIState.Attack or AIState.Stagger; + + // ── Lifecycle ───────────────────────────────────────────────────────── + private void Awake() { _base = GetComponent(); _health = GetComponent(); + _combat = GetComponent(); // cached once _agent = GetComponent(); _health.OnDied += HandleDeath; @@ -41,7 +55,7 @@ private void Awake() private void Start() { - // Cache player once at scene start — FindWithTag must NOT run in Update + // Cache player once — FindWithTag must never run in Update GameObject player = GameObject.FindWithTag("Player"); if (player != null) _cachedPlayer = player.transform; } @@ -74,17 +88,8 @@ private void TickChase() float dist = Vector3.Distance(transform.position, _target.position); - if (dist > _detectionRange * 1.5f) - { - TransitionTo(AIState.Idle); - return; - } - - if (dist <= _attackRange) - { - TransitionTo(AIState.Attack); - return; - } + if (dist > _detectionRange * 1.5f) { TransitionTo(AIState.Idle); return; } + if (dist <= _attackRange) { TransitionTo(AIState.Attack); return; } _agent.SetDestination(_target.position); } @@ -94,19 +99,14 @@ private void TickAttack() if (_target == null) { TransitionTo(AIState.Idle); return; } float dist = Vector3.Distance(transform.position, _target.position); - - if (dist > _attackRange) - { - TransitionTo(AIState.Chase); - return; - } + if (dist > _attackRange) { TransitionTo(AIState.Chase); return; } _agent.ResetPath(); _attackCooldown -= Time.deltaTime; if (_attackCooldown <= 0f) { _attackCooldown = _attackInterval; - PerformAttack(); + _combat?.Attack(_target.gameObject); // uses cached reference } } @@ -117,15 +117,7 @@ private void TickStagger() TransitionTo(_target != null ? AIState.Chase : AIState.Idle); } - // ── Helpers ─────────────────────────────────────────────────────────── - - private void PerformAttack() - { - // Delegate to EnemyCombat on the same GameObject - GetComponent()?.Attack(_target.gameObject); - } - - // FindWithTag removed — player is cached in Start() via _cachedPlayer. + // ── Transitions ─────────────────────────────────────────────────────── private void TransitionTo(AIState next) { diff --git a/src/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs b/src/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs index 444cef9..ca0479f 100644 --- a/src/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs +++ b/src/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs @@ -157,8 +157,10 @@ private static bool IsSacrificeDeath() { if (!ServiceLocator.TryGet(out CombatContext ctx)) return false; - bool groupFight = ctx.PeakEnemyCount >= GameConfig.SacrificeGroupEnemyMin; - bool minorDamage = ctx.MaxDamageFractionDealt < GameConfig.SacrificeMinorDamageMax; + // Group fight = enemies that are aggroed or alerted at the moment of death + // (live query via EnemyAI.IsAwareOfPlayer — not a stale snapshot) + bool groupFight = ctx.GetAwareEnemyCount() >= GameConfig.SacrificeGroupEnemyMin; + bool minorDamage = ctx.MaxDamageFractionDealt < GameConfig.SacrificeMinorDamageMax; return groupFight || minorDamage; } diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatContext.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatContext.cs index dadcd15..e79c85e 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatContext.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatContext.cs @@ -22,20 +22,29 @@ public class CombatContext : MonoBehaviour private bool _playerDodgedThisFight; private int _hitsWithoutDodge; - // Sacrifice death tracking - private int _peakEnemyCount; - // Key: EnemyBase instance, Value: total damage dealt by player to that enemy this fight private readonly Dictionary _damageDealtPerEnemy = new(); - // ── Public read-only queries (used by PlayerHealth for death classification) ── + // ── Public queries (used by PlayerHealth for death classification) ───── - /// Highest number of simultaneous enemies in this encounter. - public int PeakEnemyCount => _peakEnemyCount; + /// + /// Count of enemies currently aggroed or alerted — queried live at death time + /// so enemies that join mid-fight are included. Uses EnemyAI.IsAwareOfPlayer. + /// + public int GetAwareEnemyCount() + { + int count = 0; + foreach (Entities.Enemies.EnemyAI ai in + FindObjectsByType(FindObjectsSortMode.None)) + { + if (ai.IsAwareOfPlayer) count++; + } + return count; + } /// - /// Highest fraction of any single enemy's max HP that the player dealt in this fight. - /// Returns 0 if no damage was recorded. + /// Highest fraction of any single enemy's max HP dealt by the player this fight. + /// Returns 0 if no damage recorded. /// public float MaxDamageFractionDealt { @@ -110,31 +119,12 @@ private void BeginCombat() _hitsWithoutDodge = 0; _damageDealtPerEnemy.Clear(); - // Group = all living enemies present in the zone, not just aggroed ones. - // A player fighting one wolf while two more patrol nearby is still a group fight. - _peakEnemyCount = CountLivingEnemiesInZone(); - SceneRouter.SetGameState(GameState.Combat); if (ServiceLocator.TryGet(out AudioManager audio)) audio.StartCombatMusic(); - Debug.Log($"[CombatContext] Combat started. Zone enemies: {_peakEnemyCount}"); - } - - /// - /// Counts all EnemyHealth components in the scene that are alive. - /// Intentionally includes non-aggroed enemies — the zone defines the threat context. - /// - private static int CountLivingEnemiesInZone() - { - int count = 0; - foreach (Entities.Enemies.EnemyHealth h in - FindObjectsByType(FindObjectsSortMode.None)) - { - if (!h.IsDead) count++; - } - return count; + Debug.Log("[CombatContext] Combat started."); } private void EndCombat() diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyAI.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyAI.cs index a9ab807..14f9385 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyAI.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Enemies/EnemyAI.cs @@ -19,21 +19,35 @@ private enum AIState { Idle, Chase, Attack, Stagger, Dead } [SerializeField] private float _staggerDuration = 0.5f; // ── Components ──────────────────────────────────────────────────────── - private EnemyBase _base; - private EnemyHealth _health; + private EnemyBase _base; + private EnemyHealth _health; + private EnemyCombat _combat; // cached — A3 fix: was GetComponent every attack private NavMeshAgent _agent; // ── State ───────────────────────────────────────────────────────────── private AIState _state = AIState.Idle; private Transform _target; - private Transform _cachedPlayer; // cached once; never call FindWithTag in Update + private Transform _cachedPlayer; private float _attackCooldown; private float _staggerTimer; + // ── Public awareness query (used by CombatContext for Sacrifice classification) ── + + /// + /// True when this enemy is aware of the player — aggroed (Chase/Attack) or + /// alerted but unable to reach (Stagger). False when Idle or Dead. + /// CombatContext reads this; state enum stays private. + /// + public bool IsAwareOfPlayer => + _state is AIState.Chase or AIState.Attack or AIState.Stagger; + + // ── Lifecycle ───────────────────────────────────────────────────────── + private void Awake() { _base = GetComponent(); _health = GetComponent(); + _combat = GetComponent(); // cached once _agent = GetComponent(); _health.OnDied += HandleDeath; @@ -41,7 +55,7 @@ private void Awake() private void Start() { - // Cache player once at scene start — FindWithTag must NOT run in Update + // Cache player once — FindWithTag must never run in Update GameObject player = GameObject.FindWithTag("Player"); if (player != null) _cachedPlayer = player.transform; } @@ -74,17 +88,8 @@ private void TickChase() float dist = Vector3.Distance(transform.position, _target.position); - if (dist > _detectionRange * 1.5f) - { - TransitionTo(AIState.Idle); - return; - } - - if (dist <= _attackRange) - { - TransitionTo(AIState.Attack); - return; - } + if (dist > _detectionRange * 1.5f) { TransitionTo(AIState.Idle); return; } + if (dist <= _attackRange) { TransitionTo(AIState.Attack); return; } _agent.SetDestination(_target.position); } @@ -94,19 +99,14 @@ private void TickAttack() if (_target == null) { TransitionTo(AIState.Idle); return; } float dist = Vector3.Distance(transform.position, _target.position); - - if (dist > _attackRange) - { - TransitionTo(AIState.Chase); - return; - } + if (dist > _attackRange) { TransitionTo(AIState.Chase); return; } _agent.ResetPath(); _attackCooldown -= Time.deltaTime; if (_attackCooldown <= 0f) { _attackCooldown = _attackInterval; - PerformAttack(); + _combat?.Attack(_target.gameObject); // uses cached reference } } @@ -117,15 +117,7 @@ private void TickStagger() TransitionTo(_target != null ? AIState.Chase : AIState.Idle); } - // ── Helpers ─────────────────────────────────────────────────────────── - - private void PerformAttack() - { - // Delegate to EnemyCombat on the same GameObject - GetComponent()?.Attack(_target.gameObject); - } - - // FindWithTag removed — player is cached in Start() via _cachedPlayer. + // ── Transitions ─────────────────────────────────────────────────────── private void TransitionTo(AIState next) { diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs index 444cef9..ca0479f 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs @@ -157,8 +157,10 @@ private static bool IsSacrificeDeath() { if (!ServiceLocator.TryGet(out CombatContext ctx)) return false; - bool groupFight = ctx.PeakEnemyCount >= GameConfig.SacrificeGroupEnemyMin; - bool minorDamage = ctx.MaxDamageFractionDealt < GameConfig.SacrificeMinorDamageMax; + // Group fight = enemies that are aggroed or alerted at the moment of death + // (live query via EnemyAI.IsAwareOfPlayer — not a stale snapshot) + bool groupFight = ctx.GetAwareEnemyCount() >= GameConfig.SacrificeGroupEnemyMin; + bool minorDamage = ctx.MaxDamageFractionDealt < GameConfig.SacrificeMinorDamageMax; return groupFight || minorDamage; } From 633139a28475b8466eb2fe637defaa3fd5c8aac8 Mon Sep 17 00:00:00 2001 From: Seni Date: Wed, 3 Jun 2026 08:41:58 -0700 Subject: [PATCH 12/27] =?UTF-8?q?feat(ui):=20death=20messages=20=E2=80=94?= =?UTF-8?q?=20dramatic,=20contextual,=20two-line=20body=20+=20verdict=20pe?= =?UTF-8?q?r=20death=20type?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Player/PlayerDeathType.cs | 16 +++ .../Scripts/Entities/Player/PlayerHealth.cs | 18 +++- .../Scripts/UI/DeathMessageProvider.cs | 102 ++++++++++++++++++ src/Assets/_Project/Scripts/UI/HUD.cs | 41 +++++-- .../Entities/Player/PlayerDeathType.cs | 16 +++ .../Scripts/Entities/Player/PlayerHealth.cs | 18 +++- .../Scripts/UI/DeathMessageProvider.cs | 102 ++++++++++++++++++ .../Assets/_Project/Scripts/UI/HUD.cs | 41 +++++-- 8 files changed, 330 insertions(+), 24 deletions(-) create mode 100644 src/Assets/_Project/Scripts/Entities/Player/PlayerDeathType.cs create mode 100644 src/Assets/_Project/Scripts/UI/DeathMessageProvider.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerDeathType.cs create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/UI/DeathMessageProvider.cs diff --git a/src/Assets/_Project/Scripts/Entities/Player/PlayerDeathType.cs b/src/Assets/_Project/Scripts/Entities/Player/PlayerDeathType.cs new file mode 100644 index 0000000..faa85cb --- /dev/null +++ b/src/Assets/_Project/Scripts/Entities/Player/PlayerDeathType.cs @@ -0,0 +1,16 @@ +namespace Fenrir.Entities.Player +{ + /// + /// Classification of how the player died. Set by PlayerHealth.EmitDeathEvent, + /// read by DeathMessageProvider to select the contextual death message. + /// + public enum PlayerDeathType + { + None, // not dead yet + Ambush, // died within 5s of combat start + PatternFail, // 3rd+ death vs same enemy type + Sacrifice, // attacked at low HP, minor damage dealt or group fight + Reckless, // took 3+ unblocked hits with no dodge + Overwhelmed // fallback + } +} diff --git a/src/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs b/src/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs index ca0479f..163ecc6 100644 --- a/src/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs +++ b/src/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs @@ -21,7 +21,10 @@ public class PlayerHealth : MonoBehaviour public bool IsDead { get; private set; } public event Action OnDied; - public event Action OnDamaged; // normalised HP after hit + public event Action OnDamaged; // normalised HP after hit + + /// Set immediately before OnDied fires. Read by DeathMessageProvider. + public PlayerDeathType LastDeathType { get; private set; } = PlayerDeathType.None; private HitStateManager _hitState; @@ -119,6 +122,7 @@ private void EmitDeathEvent() // 1. Ambush — died within 5s of combat start → no trait shift if (_inCombat && (Time.time - _combatStartTime) < 5f) { + LastDeathType = PlayerDeathType.Ambush; BehaviorEventBus.Emit(new DeathAmbushEvent()); return; } @@ -126,14 +130,15 @@ private void EmitDeathEvent() // 2. Pattern failure — 3rd+ death vs the same enemy type if (_consecutiveDeathsVsSameEnemy >= 2) { + LastDeathType = PlayerDeathType.PatternFail; BehaviorEventBus.Emit(new DeathPatternFailEvent()); return; } - // 3. Sacrifice — fought at low HP (<25%) AND dealt only minor damage - // (< 25% of any single enemy's max HP) OR faced a group (2+ enemies) + // 3. Sacrifice — attacked at low HP AND (group fight OR minor damage dealt) if (_attackedWhileLowHp && IsSacrificeDeath()) { + LastDeathType = PlayerDeathType.Sacrifice; BehaviorEventBus.Emit(new DeathSacrificeEvent()); return; } @@ -141,11 +146,13 @@ private void EmitDeathEvent() // 4. Reckless — 3+ unblocked hits, no dodge or block if (_hitsTakenThisCombat >= 3) { + LastDeathType = PlayerDeathType.Reckless; BehaviorEventBus.Emit(new DeathRecklessEvent()); return; } // 5. Overwhelmed — fallback + LastDeathType = PlayerDeathType.Overwhelmed; BehaviorEventBus.Emit(new DeathOverwhelmedEvent()); } @@ -167,9 +174,10 @@ private static bool IsSacrificeDeath() public void Revive(float hpFraction = 1f) { - IsDead = false; + IsDead = false; _attackedWhileLowHp = false; - Current = _maxHp * Mathf.Clamp01(hpFraction); + LastDeathType = PlayerDeathType.None; + Current = _maxHp * Mathf.Clamp01(hpFraction); } } } diff --git a/src/Assets/_Project/Scripts/UI/DeathMessageProvider.cs b/src/Assets/_Project/Scripts/UI/DeathMessageProvider.cs new file mode 100644 index 0000000..c7ec141 --- /dev/null +++ b/src/Assets/_Project/Scripts/UI/DeathMessageProvider.cs @@ -0,0 +1,102 @@ +using Fenrir.Combat; +using Fenrir.Config; +using Fenrir.Core; +using Fenrir.Entities.Player; +using UnityEngine; + +namespace Fenrir.UI +{ + /// + /// Returns contextual death messages based on how the player died. + /// Messages are dramatic, second-person, and carry a short verdict line. + /// Two-line format: dramatic body + one-word or short verdict. + /// + public static class DeathMessageProvider + { + public struct DeathMessage + { + public string Body; + public string Verdict; + } + + // ── Message pools ───────────────────────────────────────────────────── + + private static readonly DeathMessage[] _ambush = + { + new() { Body = "You never saw it coming. The forest was faster.", Verdict = "Unfair." }, + new() { Body = "It was waiting. You weren't. Sometimes the timing is simply wrong.", Verdict = "Ambushed." }, + new() { Body = "The shadows moved before you did. That's not on you.", Verdict = "Careful next time." }, + }; + + private static readonly DeathMessage[] _patternFail = + { + new() { Body = "Same enemy. Same result. Three times now. This is starting to look like a choice.", Verdict = "Questionable." }, + new() { Body = "It does the same thing every time. You noticed. You went in anyway.", Verdict = "Bold." }, + new() { Body = "Again. There is a word for that. Several of them. None flattering.", Verdict = "Stubborn." }, + new() { Body = "At some point this stops being misfortune and starts being commitment.", Verdict = "To what, exactly." }, + }; + + private static readonly DeathMessage[] _reckless = + { + new() { Body = "You walked through every swing without stepping aside once. They appreciated the convenience.", Verdict = "Reckless." }, + new() { Body = "Every hit taken. No attempt to dodge. That is a philosophy. Not a good one.", Verdict = "Bold. Costly." }, + new() { Body = "You took everything they had. Chin first. Repeatedly. On purpose, apparently.", Verdict = "Questionable." }, + new() { Body = "There was a gap between you and the attack. You closed it yourself.", Verdict = "Remarkable." }, + }; + + private static readonly DeathMessage[] _sacrificeGroup = + { + new() { Body = "You entered a wolf's den while bleeding out. They did not waste the meal.", Verdict = "Questionable." }, + new() { Body = "Three of them. One of you. Half your blood already on the ground. The rest was math.", Verdict = "Poor odds." }, + new() { Body = "They were already watching you when you came in. Wounded prey. You obliged.", Verdict = "Brave. Briefly." }, + new() { Body = "A den of wolves, a body already failing, a decision made anyway. That is something.", Verdict = "Something." }, + }; + + private static readonly DeathMessage[] _sacrificeMinorDamage = + { + new() { Body = "You kept swinging. Nothing you threw could reach them. They had no such difficulty.", Verdict = "The gap showed." }, + new() { Body = "Your attacks grazed them. Theirs did not return the courtesy.", Verdict = "Outmatched." }, + new() { Body = "Brave. The kind of brave that does not account for effectiveness.", Verdict = "Wise? Questionable." }, + new() { Body = "You fought hard. The distance between effort and result was unfortunate.", Verdict = "Try differently." }, + }; + + private static readonly DeathMessage[] _overwhelmed = + { + new() { Body = "The numbers were always against you. No shame in that. Well. A little.", Verdict = "Overwhelmed." }, + new() { Body = "They came from everywhere at once. That is not a failure. That is arithmetic.", Verdict = "The count was wrong." }, + new() { Body = "More than you could handle. Most things have a limit.", Verdict = "Found yours." }, + }; + + // ── Public API ──────────────────────────────────────────────────────── + + public static DeathMessage Get(PlayerDeathType deathType) + { + return deathType switch + { + PlayerDeathType.Ambush => Pick(_ambush), + PlayerDeathType.PatternFail => Pick(_patternFail), + PlayerDeathType.Reckless => Pick(_reckless), + PlayerDeathType.Sacrifice => PickSacrifice(), + _ => Pick(_overwhelmed), + }; + } + + // ── Internals ───────────────────────────────────────────────────────── + + private static DeathMessage PickSacrifice() + { + // Re-read CombatContext to distinguish group vs. minor-damage sacrifice + if (ServiceLocator.TryGet(out CombatContext ctx)) + { + bool groupFight = ctx.GetAwareEnemyCount() >= GameConfig.SacrificeGroupEnemyMin; + return groupFight ? Pick(_sacrificeGroup) : Pick(_sacrificeMinorDamage); + } + return Pick(_sacrificeGroup); // fallback + } + + private static DeathMessage Pick(DeathMessage[] pool) + { + return pool[Random.Range(0, pool.Length)]; + } + } +} diff --git a/src/Assets/_Project/Scripts/UI/HUD.cs b/src/Assets/_Project/Scripts/UI/HUD.cs index d3ddeb1..e07a124 100644 --- a/src/Assets/_Project/Scripts/UI/HUD.cs +++ b/src/Assets/_Project/Scripts/UI/HUD.cs @@ -1,22 +1,27 @@ using Fenrir.Entities.Player; +using TMPro; using UnityEngine; using UnityEngine.UI; namespace Fenrir.UI { /// - /// Root HUD controller. Owns HP bar, energy bar, and phase indicator. - /// All child widgets are self-contained; HUD just toggles visibility. + /// Root HUD controller. Owns HP bar, energy bar, death screen, and journal notification. /// public class HUD : MonoBehaviour { [Header("HP")] - [SerializeField] private Image _hpFill; + [SerializeField] private Image _hpFill; [SerializeField] private PlayerHealth _health; + [Header("Death Screen")] + [SerializeField] private GameObject _deathScreen; + [SerializeField] private TMP_Text _deathBodyText; + [SerializeField] private TMP_Text _deathVerdictText; + [Header("Panels")] - [SerializeField] private GameObject _combatPanel; - [SerializeField] private GameObject _journalNotification; + [SerializeField] private GameObject _combatPanel; + [SerializeField] private GameObject _journalNotification; private void Awake() { @@ -28,25 +33,45 @@ private void Awake() _health.OnDamaged += UpdateHpBar; _health.OnDied += ShowDeathScreen; } + + if (_deathScreen) _deathScreen.SetActive(false); } + // ── HP ──────────────────────────────────────────────────────────────── + private void UpdateHpBar(float normalised) { if (_hpFill) _hpFill.fillAmount = normalised; } + // ── Death screen ────────────────────────────────────────────────────── + private void ShowDeathScreen() { - // Post-MVP: full death screen. For now just hide combat panel. if (_combatPanel) _combatPanel.SetActive(false); + + DeathMessageProvider.DeathMessage msg = + DeathMessageProvider.Get(_health.LastDeathType); + + if (_deathBodyText) _deathBodyText.text = msg.Body; + if (_deathVerdictText) _deathVerdictText.text = msg.Verdict; + if (_deathScreen) _deathScreen.SetActive(true); } + public void HideDeathScreen() + { + if (_deathScreen) _deathScreen.SetActive(false); + } + + // ── Combat panel ────────────────────────────────────────────────────── + public void ShowCombatHUD(bool show) { if (_combatPanel) _combatPanel.SetActive(show); } - /// Flash the journal icon when a new vague entry is added. + // ── Journal notification ────────────────────────────────────────────── + public void NotifyJournalEntry() { if (_journalNotification) _journalNotification.SetActive(true); @@ -58,6 +83,8 @@ private void HideJournalNotification() if (_journalNotification) _journalNotification.SetActive(false); } + // ── Cleanup ─────────────────────────────────────────────────────────── + private void OnDestroy() { CancelInvoke(nameof(HideJournalNotification)); diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerDeathType.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerDeathType.cs new file mode 100644 index 0000000..faa85cb --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerDeathType.cs @@ -0,0 +1,16 @@ +namespace Fenrir.Entities.Player +{ + /// + /// Classification of how the player died. Set by PlayerHealth.EmitDeathEvent, + /// read by DeathMessageProvider to select the contextual death message. + /// + public enum PlayerDeathType + { + None, // not dead yet + Ambush, // died within 5s of combat start + PatternFail, // 3rd+ death vs same enemy type + Sacrifice, // attacked at low HP, minor damage dealt or group fight + Reckless, // took 3+ unblocked hits with no dodge + Overwhelmed // fallback + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs index ca0479f..163ecc6 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerHealth.cs @@ -21,7 +21,10 @@ public class PlayerHealth : MonoBehaviour public bool IsDead { get; private set; } public event Action OnDied; - public event Action OnDamaged; // normalised HP after hit + public event Action OnDamaged; // normalised HP after hit + + /// Set immediately before OnDied fires. Read by DeathMessageProvider. + public PlayerDeathType LastDeathType { get; private set; } = PlayerDeathType.None; private HitStateManager _hitState; @@ -119,6 +122,7 @@ private void EmitDeathEvent() // 1. Ambush — died within 5s of combat start → no trait shift if (_inCombat && (Time.time - _combatStartTime) < 5f) { + LastDeathType = PlayerDeathType.Ambush; BehaviorEventBus.Emit(new DeathAmbushEvent()); return; } @@ -126,14 +130,15 @@ private void EmitDeathEvent() // 2. Pattern failure — 3rd+ death vs the same enemy type if (_consecutiveDeathsVsSameEnemy >= 2) { + LastDeathType = PlayerDeathType.PatternFail; BehaviorEventBus.Emit(new DeathPatternFailEvent()); return; } - // 3. Sacrifice — fought at low HP (<25%) AND dealt only minor damage - // (< 25% of any single enemy's max HP) OR faced a group (2+ enemies) + // 3. Sacrifice — attacked at low HP AND (group fight OR minor damage dealt) if (_attackedWhileLowHp && IsSacrificeDeath()) { + LastDeathType = PlayerDeathType.Sacrifice; BehaviorEventBus.Emit(new DeathSacrificeEvent()); return; } @@ -141,11 +146,13 @@ private void EmitDeathEvent() // 4. Reckless — 3+ unblocked hits, no dodge or block if (_hitsTakenThisCombat >= 3) { + LastDeathType = PlayerDeathType.Reckless; BehaviorEventBus.Emit(new DeathRecklessEvent()); return; } // 5. Overwhelmed — fallback + LastDeathType = PlayerDeathType.Overwhelmed; BehaviorEventBus.Emit(new DeathOverwhelmedEvent()); } @@ -167,9 +174,10 @@ private static bool IsSacrificeDeath() public void Revive(float hpFraction = 1f) { - IsDead = false; + IsDead = false; _attackedWhileLowHp = false; - Current = _maxHp * Mathf.Clamp01(hpFraction); + LastDeathType = PlayerDeathType.None; + Current = _maxHp * Mathf.Clamp01(hpFraction); } } } diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/UI/DeathMessageProvider.cs b/src/ProjectFenrir/Assets/_Project/Scripts/UI/DeathMessageProvider.cs new file mode 100644 index 0000000..c7ec141 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/UI/DeathMessageProvider.cs @@ -0,0 +1,102 @@ +using Fenrir.Combat; +using Fenrir.Config; +using Fenrir.Core; +using Fenrir.Entities.Player; +using UnityEngine; + +namespace Fenrir.UI +{ + /// + /// Returns contextual death messages based on how the player died. + /// Messages are dramatic, second-person, and carry a short verdict line. + /// Two-line format: dramatic body + one-word or short verdict. + /// + public static class DeathMessageProvider + { + public struct DeathMessage + { + public string Body; + public string Verdict; + } + + // ── Message pools ───────────────────────────────────────────────────── + + private static readonly DeathMessage[] _ambush = + { + new() { Body = "You never saw it coming. The forest was faster.", Verdict = "Unfair." }, + new() { Body = "It was waiting. You weren't. Sometimes the timing is simply wrong.", Verdict = "Ambushed." }, + new() { Body = "The shadows moved before you did. That's not on you.", Verdict = "Careful next time." }, + }; + + private static readonly DeathMessage[] _patternFail = + { + new() { Body = "Same enemy. Same result. Three times now. This is starting to look like a choice.", Verdict = "Questionable." }, + new() { Body = "It does the same thing every time. You noticed. You went in anyway.", Verdict = "Bold." }, + new() { Body = "Again. There is a word for that. Several of them. None flattering.", Verdict = "Stubborn." }, + new() { Body = "At some point this stops being misfortune and starts being commitment.", Verdict = "To what, exactly." }, + }; + + private static readonly DeathMessage[] _reckless = + { + new() { Body = "You walked through every swing without stepping aside once. They appreciated the convenience.", Verdict = "Reckless." }, + new() { Body = "Every hit taken. No attempt to dodge. That is a philosophy. Not a good one.", Verdict = "Bold. Costly." }, + new() { Body = "You took everything they had. Chin first. Repeatedly. On purpose, apparently.", Verdict = "Questionable." }, + new() { Body = "There was a gap between you and the attack. You closed it yourself.", Verdict = "Remarkable." }, + }; + + private static readonly DeathMessage[] _sacrificeGroup = + { + new() { Body = "You entered a wolf's den while bleeding out. They did not waste the meal.", Verdict = "Questionable." }, + new() { Body = "Three of them. One of you. Half your blood already on the ground. The rest was math.", Verdict = "Poor odds." }, + new() { Body = "They were already watching you when you came in. Wounded prey. You obliged.", Verdict = "Brave. Briefly." }, + new() { Body = "A den of wolves, a body already failing, a decision made anyway. That is something.", Verdict = "Something." }, + }; + + private static readonly DeathMessage[] _sacrificeMinorDamage = + { + new() { Body = "You kept swinging. Nothing you threw could reach them. They had no such difficulty.", Verdict = "The gap showed." }, + new() { Body = "Your attacks grazed them. Theirs did not return the courtesy.", Verdict = "Outmatched." }, + new() { Body = "Brave. The kind of brave that does not account for effectiveness.", Verdict = "Wise? Questionable." }, + new() { Body = "You fought hard. The distance between effort and result was unfortunate.", Verdict = "Try differently." }, + }; + + private static readonly DeathMessage[] _overwhelmed = + { + new() { Body = "The numbers were always against you. No shame in that. Well. A little.", Verdict = "Overwhelmed." }, + new() { Body = "They came from everywhere at once. That is not a failure. That is arithmetic.", Verdict = "The count was wrong." }, + new() { Body = "More than you could handle. Most things have a limit.", Verdict = "Found yours." }, + }; + + // ── Public API ──────────────────────────────────────────────────────── + + public static DeathMessage Get(PlayerDeathType deathType) + { + return deathType switch + { + PlayerDeathType.Ambush => Pick(_ambush), + PlayerDeathType.PatternFail => Pick(_patternFail), + PlayerDeathType.Reckless => Pick(_reckless), + PlayerDeathType.Sacrifice => PickSacrifice(), + _ => Pick(_overwhelmed), + }; + } + + // ── Internals ───────────────────────────────────────────────────────── + + private static DeathMessage PickSacrifice() + { + // Re-read CombatContext to distinguish group vs. minor-damage sacrifice + if (ServiceLocator.TryGet(out CombatContext ctx)) + { + bool groupFight = ctx.GetAwareEnemyCount() >= GameConfig.SacrificeGroupEnemyMin; + return groupFight ? Pick(_sacrificeGroup) : Pick(_sacrificeMinorDamage); + } + return Pick(_sacrificeGroup); // fallback + } + + private static DeathMessage Pick(DeathMessage[] pool) + { + return pool[Random.Range(0, pool.Length)]; + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/UI/HUD.cs b/src/ProjectFenrir/Assets/_Project/Scripts/UI/HUD.cs index d3ddeb1..e07a124 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/UI/HUD.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/UI/HUD.cs @@ -1,22 +1,27 @@ using Fenrir.Entities.Player; +using TMPro; using UnityEngine; using UnityEngine.UI; namespace Fenrir.UI { /// - /// Root HUD controller. Owns HP bar, energy bar, and phase indicator. - /// All child widgets are self-contained; HUD just toggles visibility. + /// Root HUD controller. Owns HP bar, energy bar, death screen, and journal notification. /// public class HUD : MonoBehaviour { [Header("HP")] - [SerializeField] private Image _hpFill; + [SerializeField] private Image _hpFill; [SerializeField] private PlayerHealth _health; + [Header("Death Screen")] + [SerializeField] private GameObject _deathScreen; + [SerializeField] private TMP_Text _deathBodyText; + [SerializeField] private TMP_Text _deathVerdictText; + [Header("Panels")] - [SerializeField] private GameObject _combatPanel; - [SerializeField] private GameObject _journalNotification; + [SerializeField] private GameObject _combatPanel; + [SerializeField] private GameObject _journalNotification; private void Awake() { @@ -28,25 +33,45 @@ private void Awake() _health.OnDamaged += UpdateHpBar; _health.OnDied += ShowDeathScreen; } + + if (_deathScreen) _deathScreen.SetActive(false); } + // ── HP ──────────────────────────────────────────────────────────────── + private void UpdateHpBar(float normalised) { if (_hpFill) _hpFill.fillAmount = normalised; } + // ── Death screen ────────────────────────────────────────────────────── + private void ShowDeathScreen() { - // Post-MVP: full death screen. For now just hide combat panel. if (_combatPanel) _combatPanel.SetActive(false); + + DeathMessageProvider.DeathMessage msg = + DeathMessageProvider.Get(_health.LastDeathType); + + if (_deathBodyText) _deathBodyText.text = msg.Body; + if (_deathVerdictText) _deathVerdictText.text = msg.Verdict; + if (_deathScreen) _deathScreen.SetActive(true); } + public void HideDeathScreen() + { + if (_deathScreen) _deathScreen.SetActive(false); + } + + // ── Combat panel ────────────────────────────────────────────────────── + public void ShowCombatHUD(bool show) { if (_combatPanel) _combatPanel.SetActive(show); } - /// Flash the journal icon when a new vague entry is added. + // ── Journal notification ────────────────────────────────────────────── + public void NotifyJournalEntry() { if (_journalNotification) _journalNotification.SetActive(true); @@ -58,6 +83,8 @@ private void HideJournalNotification() if (_journalNotification) _journalNotification.SetActive(false); } + // ── Cleanup ─────────────────────────────────────────────────────────── + private void OnDestroy() { CancelInvoke(nameof(HideJournalNotification)); From badd694a43cbb162142eb1ad81ad6b15061e3dc5 Mon Sep 17 00:00:00 2001 From: Seni Date: Wed, 3 Jun 2026 08:47:19 -0700 Subject: [PATCH 13/27] fix(audit4): touch input, bus-clear scope, SceneRouter in Awakening, journal keys, trait delta logging, Bootstrap setup script --- ROADMAP.md | 12 ++- .../_Project/Scripts/Analytics/EventLogger.cs | 82 +++++++++++++++--- .../Scripts/Awakening/AwakeningSequencer.cs | 7 +- src/Assets/_Project/Scripts/Core/Bootstrap.cs | 36 +++++++- src/Assets/_Project/Scripts/Core/GameLoop.cs | 51 ++++------- .../_Project/Scripts/Input/InputHandler.cs | 53 ++++++------ .../_Project/Scripts/UI/JournalController.cs | 5 +- .../_Project/Editor/FenrirBootstrapSetup.cs | 85 +++++++++++++++++++ .../_Project/Scripts/Analytics/EventLogger.cs | 82 +++++++++++++++--- .../Scripts/Awakening/AwakeningSequencer.cs | 7 +- .../Assets/_Project/Scripts/Core/Bootstrap.cs | 36 +++++++- .../Assets/_Project/Scripts/Core/GameLoop.cs | 51 ++++------- .../_Project/Scripts/Input/InputHandler.cs | 17 ++-- .../_Project/Scripts/UI/JournalController.cs | 5 +- 14 files changed, 385 insertions(+), 144 deletions(-) create mode 100644 src/ProjectFenrir/Assets/_Project/Editor/FenrirBootstrapSetup.cs diff --git a/ROADMAP.md b/ROADMAP.md index 85fcacd..4438f24 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -48,11 +48,17 @@ - [x] SaveManager (JSON) — code complete + unit tested - [x] AudioManager + MusicLayer + SFXPool — wired to DayNightCycle - [x] HUD — EnergyBar + health bar code complete -- [ ] NavMesh baked in EmberForest +- [x] `FenrirBootstrapSetup` editor script — one-click Bootstrap scene wiring +- [x] `EventLogger` — trait delta output (event key + Δ per trait + current value) +- [x] `BehaviorEventBus.Clear()` scoped to full-scene transitions; Bootstrap re-subscribes accumulator after each +- [x] `InputHandler` — touch guard fixed; touch input now works on device +- [x] `AwakeningSequencer` — routes through `SceneRouter` instead of `SceneManager` +- [x] `JournalController` — evolution entry keys corrected to match `EvolutionChecker` IDs +- [ ] NavMesh baked in EmberForest (Unity Editor) - [ ] First enemy alive in Play mode (Ash Wolf patrol + chase) -- [ ] Trait events firing live (dodge → Patience ↑ confirmed in logs) +- [ ] Trait events firing live — confirm "dodge → Patience +2.0" in Console - [ ] Save/Load round-trip verified in Play mode -- [ ] Bootstrap scene fully wired in Unity Inspector +- [ ] Bootstrap scene wired via Fenrir → Setup → Setup Bootstrap Scene ## Phase 3 — MVP Gameplay diff --git a/src/Assets/_Project/Scripts/Analytics/EventLogger.cs b/src/Assets/_Project/Scripts/Analytics/EventLogger.cs index 8db4225..b7dcc30 100644 --- a/src/Assets/_Project/Scripts/Analytics/EventLogger.cs +++ b/src/Assets/_Project/Scripts/Analytics/EventLogger.cs @@ -1,11 +1,16 @@ +using Fenrir.Config; +using Fenrir.Core; using Fenrir.Traits; +using System.Text; using UnityEngine; namespace Fenrir.Analytics { /// - /// Lightweight event logger. Listens to BehaviorEventBus and writes to - /// Unity console in development. Post-MVP: route to analytics backend. + /// Listens to BehaviorEventBus and logs events to the Unity console. + /// In development builds: also shows which traits changed and by how much, + /// so "dodge → Patience +2.0" is visible in the Console during play testing. + /// Post-MVP: route significant events to analytics backend. /// public class EventLogger { @@ -19,16 +24,33 @@ public EventLogger(bool verbose = false) private void SubscribeAll() { - // Log every BehaviorEvent type in development #if UNITY_EDITOR || DEVELOPMENT_BUILD - BehaviorEventBus.Subscribe(LogEvent); - BehaviorEventBus.Subscribe(LogEvent); - BehaviorEventBus.Subscribe(LogEvent); - BehaviorEventBus.Subscribe(LogEvent); - BehaviorEventBus.Subscribe(LogEvent); - BehaviorEventBus.Subscribe(LogEvent); - BehaviorEventBus.Subscribe(LogEvent); - BehaviorEventBus.Subscribe(LogEvent); + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e=> Log(e)); + + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Log(e)); + + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Debug.Log($"[EventLogger] ★ EVOLUTION: {e.EvolutionId}")); BehaviorEventBus.Subscribe(e => @@ -36,10 +58,42 @@ private void SubscribeAll() #endif } - private void LogEvent(BehaviorEvent evt) + private void Log(BehaviorEvent evt) { - if (_verbose) - Debug.Log($"[EventLogger] {evt.EventKey}"); +#if UNITY_EDITOR || DEVELOPMENT_BUILD + if (!_verbose) return; + + // Read the weight config to show which traits this event affects + if (!ServiceLocator.TryGet(out TraitWeightsConfig weights)) + { + Debug.Log($"[Traits] {evt.EventKey}"); + return; + } + + if (!weights.Weights.TryGetValue(evt.EventKey, out var deltas)) + { + Debug.Log($"[Traits] {evt.EventKey} (no weights mapped)"); + return; + } + + // Read profile snapshot before accumulator processes for accurate before/after + // (EventLogger fires from bus simultaneously with accumulator — order is not guaranteed, + // so we show intended deltas from config rather than live before/after diff) + var sb = new StringBuilder($"[Traits] {evt.EventKey}"); + foreach (var pair in deltas) + { + float val = 0f; + if (ServiceLocator.TryGet(out ITraitAccumulator acc) + && acc is TraitAccumulator ta) + { + System.Enum.TryParse(pair.Key, true, out TraitKey key); + val = ta.Profile.Get(key); + } + string sign = pair.Value >= 0 ? "+" : ""; + sb.Append($" {pair.Key}: {sign}{pair.Value:F1} (now ≈{val:F0})"); + } + Debug.Log(sb.ToString()); +#endif } } } diff --git a/src/Assets/_Project/Scripts/Awakening/AwakeningSequencer.cs b/src/Assets/_Project/Scripts/Awakening/AwakeningSequencer.cs index e397961..123b258 100644 --- a/src/Assets/_Project/Scripts/Awakening/AwakeningSequencer.cs +++ b/src/Assets/_Project/Scripts/Awakening/AwakeningSequencer.cs @@ -2,7 +2,6 @@ using Fenrir.Core; using Fenrir.Save; using UnityEngine; -using UnityEngine.SceneManagement; namespace Fenrir.Awakening { @@ -18,7 +17,7 @@ namespace Fenrir.Awakening /// public class AwakeningSequencer : MonoBehaviour { - [SerializeField] private string _gameScene = "EmberForest"; + // Scene name removed — navigation goes through SceneRouter, never SceneManager directly [Header("UI Panels")] [SerializeField] private GameObject _characterCreationPanel; @@ -75,9 +74,9 @@ private IEnumerator RunAwakening() // ElementRevealUI reads save to display element name/VFX yield return new WaitForSeconds(_elementRevealHoldSeconds); - // 4. Load game + // 4. Load game via SceneRouter so AppState, audio, and bus clear are all handled ShowPanel(_loadingPanel); - SceneManager.LoadScene(_gameScene); + yield return SceneRouter.LoadGameAsync().AsCoroutine(); } // ── Helpers ─────────────────────────────────────────────────────────── diff --git a/src/Assets/_Project/Scripts/Core/Bootstrap.cs b/src/Assets/_Project/Scripts/Core/Bootstrap.cs index f513ff5..58a0d63 100644 --- a/src/Assets/_Project/Scripts/Core/Bootstrap.cs +++ b/src/Assets/_Project/Scripts/Core/Bootstrap.cs @@ -28,6 +28,29 @@ private async void Start() await RouteToInitialSceneAsync(); } + private void OnEnable() + { + // After every full scene transition, GameLoop clears the bus. + // Bootstrap re-subscribes the accumulator immediately so trait + // tracking resumes in the new scene. Additive sub-zone loads + // do NOT clear the bus, so no re-subscription needed there. + SceneRouter.OnSceneLoadComplete += ResubscribeAccumulator; + } + + private void OnDisable() + { + SceneRouter.OnSceneLoadComplete -= ResubscribeAccumulator; + } + + private void ResubscribeAccumulator() + { + if (ServiceLocator.TryGet(out ITraitAccumulator acc)) + { + SubscribeAccumulatorToBus(acc); + Debug.Log("[Bootstrap] TraitAccumulator re-subscribed after scene transition."); + } + } + // ── Service registration ────────────────────────────────────────────── private void RegisterServices() @@ -82,8 +105,19 @@ private void WireTraitAccumulator(Traits.TraitProfile profile) ServiceLocator.Get() ); ServiceLocator.Register(accumulator); + SubscribeAccumulatorToBus(accumulator); + } + + /// + /// Subscribes the accumulator to every concrete BehaviorEvent type. + /// Called on initial load and after every full scene transition (bus clear). + /// BehaviorEventBus.Subscribe is idempotent — safe to call multiple times. + /// + private static void SubscribeAccumulatorToBus(ITraitAccumulator acc) + { + // Cast required — Process(BehaviorEvent) is on TraitAccumulator, not the interface + if (acc is not TraitAccumulator accumulator) return; - // Subscribe to every concrete event type (bus is keyed by concrete type) BehaviorEventBus.Subscribe(accumulator.Process); BehaviorEventBus.Subscribe(accumulator.Process); BehaviorEventBus.Subscribe(accumulator.Process); diff --git a/src/Assets/_Project/Scripts/Core/GameLoop.cs b/src/Assets/_Project/Scripts/Core/GameLoop.cs index 1a77d94..8ed0ea6 100644 --- a/src/Assets/_Project/Scripts/Core/GameLoop.cs +++ b/src/Assets/_Project/Scripts/Core/GameLoop.cs @@ -1,10 +1,8 @@ using System; using System.Threading.Tasks; using Fenrir.Save; -using Fenrir.StateMachine; using Fenrir.Traits; using UnityEngine; -using UnityEngine.SceneManagement; namespace Fenrir.Core { @@ -12,38 +10,41 @@ namespace Fenrir.Core /// Drives the top-level game loop: /// - Pause / resume (Time.timeScale + SceneRouter state) /// - Application focus / pause → debounced auto-save on background + /// - Full-scene transitions → clears BehaviorEventBus stale handlers /// - /// Attach to the Bootstrap GameObject (DontDestroyOnLoad). - /// Registered with ServiceLocator in Bootstrap. + /// Additive sub-zone loads (RegionLoader) do NOT clear the bus — only + /// full SceneRouter transitions do, preventing trait subscriptions from + /// being wiped mid-gameplay. /// public class GameLoop : MonoBehaviour { public bool IsPaused { get; private set; } - // Debounce: OnApplicationPause + OnApplicationFocus both fire on iOS background private bool _savePending; // ── Lifecycle ───────────────────────────────────────────────────────── private void OnEnable() { - SceneManager.sceneUnloaded += OnSceneUnloaded; + // Subscribe to full-scene completions only — NOT SceneManager.sceneUnloaded, + // which also fires for additive sub-zone unloads from RegionLoader. + SceneRouter.OnSceneLoadComplete += OnFullSceneTransitionComplete; } private void OnDisable() { - SceneManager.sceneUnloaded -= OnSceneUnloaded; + SceneRouter.OnSceneLoadComplete -= OnFullSceneTransitionComplete; } /// - /// Clear event bus on every scene unload to prevent stale MonoBehaviour - /// callbacks from destroyed scene objects firing during the next scene. - /// Bootstrap (DontDestroyOnLoad) resubscribes its own handlers after load. + /// Called after every full SceneRouter navigation. + /// Clears stale scene-object handlers from the destroyed scene. + /// Bootstrap (DontDestroyOnLoad) re-subscribes the TraitAccumulator immediately after. /// - private static void OnSceneUnloaded(Scene _) + private static void OnFullSceneTransitionComplete() { BehaviorEventBus.Clear(); - Debug.Log("[GameLoop] BehaviorEventBus cleared on scene unload."); + Debug.Log("[GameLoop] BehaviorEventBus cleared after full scene transition."); } // ── Pause / Resume ──────────────────────────────────────────────────── @@ -53,7 +54,6 @@ public void Pause() if (IsPaused) return; IsPaused = true; Time.timeScale = 0f; - // Use the router's internal setter so CurrentAppState stays accurate SceneRouter.SetPaused(true); Debug.Log("[GameLoop] Paused"); } @@ -67,34 +67,19 @@ public void Resume() Debug.Log("[GameLoop] Resumed"); } - public void TogglePause() - { - if (IsPaused) Resume(); else Pause(); - } + public void TogglePause() { if (IsPaused) Resume(); else Pause(); } // ── Application lifecycle ───────────────────────────────────────────── - private void OnApplicationPause(bool paused) - { - if (paused) RequestSave(); - } - - private void OnApplicationFocus(bool focused) - { - if (!focused) RequestSave(); - } - - private void OnApplicationQuit() - { - // Synchronous path on quit — fire-and-forget with error logging - _ = TrySaveAsync(); - } + private void OnApplicationPause(bool paused) { if (paused) RequestSave(); } + private void OnApplicationFocus(bool focused) { if (!focused) RequestSave(); } + private void OnApplicationQuit() { _ = TrySaveAsync(); } // ── Debounced save ──────────────────────────────────────────────────── private void RequestSave() { - if (_savePending) return; // de-duplicate the double-fire on iOS background + if (_savePending) return; _savePending = true; _ = TrySaveAsync(); } diff --git a/src/Assets/_Project/Scripts/Input/InputHandler.cs b/src/Assets/_Project/Scripts/Input/InputHandler.cs index c7dc450..b215d23 100644 --- a/src/Assets/_Project/Scripts/Input/InputHandler.cs +++ b/src/Assets/_Project/Scripts/Input/InputHandler.cs @@ -4,51 +4,56 @@ namespace Fenrir.Input { /// - /// Raw input layer. Reads Unity's new Input System touch/gamepad events - /// and forwards normalised values to GestureRecognizer and TouchMapper. - /// This class knows nothing about game entities. + /// Raw input layer using Unity Input System (new). + /// On iOS/Android: forwards touch to GestureRecognizer. + /// In Editor/PC: processes keyboard directly. /// public class InputHandler : MonoBehaviour { [SerializeField] private GestureRecognizer _gesture; [SerializeField] private TouchMapper _mapper; + private void Awake() + { + if (_gesture == null) _gesture = GetComponent(); + if (_mapper == null) _mapper = GetComponent(); + } + private void Update() { + if (_mapper == null) return; + #if UNITY_IOS || UNITY_ANDROID + // Touch path — Keyboard.current is null on device; guard must NOT block this ProcessTouches(); #else - ProcessKeyboard(); // Editor / Mac fallback + // Editor / PC — keyboard may still be null if Input System isn't configured + if (Keyboard.current != null) + ProcessKeyboard(); #endif } - // ── Mobile ──────────────────────────────────────────────────────────── - - private void ProcessTouches() - { - // Unity's new input system touch processing is deferred to - // GestureRecognizer, which owns the left/right split logic. - _gesture.Tick(); - } - - // ── Editor / Keyboard ───────────────────────────────────────────────── + private void ProcessTouches() => _gesture?.Tick(); private void ProcessKeyboard() { + Keyboard kb = Keyboard.current; + float h = 0f, v = 0f; - if (Keyboard.current.dKey.isPressed || Keyboard.current.rightArrowKey.isPressed) h = 1f; - if (Keyboard.current.aKey.isPressed || Keyboard.current.leftArrowKey.isPressed) h = -1f; - if (Keyboard.current.wKey.isPressed || Keyboard.current.upArrowKey.isPressed) v = 1f; - if (Keyboard.current.sKey.isPressed || Keyboard.current.downArrowKey.isPressed) v = -1f; + if (kb.dKey.isPressed || kb.rightArrowKey.isPressed) h = 1f; + if (kb.aKey.isPressed || kb.leftArrowKey.isPressed) h = -1f; + if (kb.wKey.isPressed || kb.upArrowKey.isPressed) v = 1f; + if (kb.sKey.isPressed || kb.downArrowKey.isPressed) v = -1f; _mapper.OnMoveInput(new Vector2(h, v)); - if (Keyboard.current.spaceKey.wasPressedThisFrame) _mapper.OnDodge(); - if (Keyboard.current.jKey.wasPressedThisFrame) _mapper.OnLightAttack(); - if (Keyboard.current.kKey.wasPressedThisFrame) _mapper.OnHeavyAttack(); - if (Keyboard.current.lKey.wasPressedThisFrame) _mapper.OnAbility(); - if (Keyboard.current.bKey.isPressed) _mapper.OnBlockHeld(); - else _mapper.OnBlockReleased(); + if (kb.spaceKey.wasPressedThisFrame) _mapper.OnDodge(); + if (kb.jKey.wasPressedThisFrame) _mapper.OnLightAttack(); + if (kb.kKey.wasPressedThisFrame) _mapper.OnHeavyAttack(); + if (kb.lKey.wasPressedThisFrame) _mapper.OnAbility(); + + if (kb.bKey.isPressed) _mapper.OnBlockHeld(); + else _mapper.OnBlockReleased(); } } } diff --git a/src/Assets/_Project/Scripts/UI/JournalController.cs b/src/Assets/_Project/Scripts/UI/JournalController.cs index 1da80c3..390b1dd 100644 --- a/src/Assets/_Project/Scripts/UI/JournalController.cs +++ b/src/Assets/_Project/Scripts/UI/JournalController.cs @@ -23,11 +23,12 @@ public class JournalController : MonoBehaviour private bool _isOpen; // ── Pre-authored vague flavour lines keyed by evolution ID ──────────── + // Keys must match EvolutionChecker signature IDs exactly (EvolutionSignatures.json) private static readonly Dictionary EvolutionEntries = new() { - ["inferno_form"] = "The heat no longer frightens you. It feels like a memory.", + ["inferno"] = "The heat no longer frightens you. It feels like a memory.", ["abyssal_current"] = "You move through water as though it always knew you were coming.", - ["bedrock_stance"] = "Something in your chest has settled. You are harder to move.", + ["bedrock"] = "Something in your chest has settled. You are harder to move.", ["galeform"] = "The air parts for you now. Or perhaps it always did.", }; diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirBootstrapSetup.cs b/src/ProjectFenrir/Assets/_Project/Editor/FenrirBootstrapSetup.cs new file mode 100644 index 0000000..99ce1e9 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Editor/FenrirBootstrapSetup.cs @@ -0,0 +1,85 @@ +using Fenrir.Analytics; +using Fenrir.Core; +using Fenrir.StateMachine; +using UnityEditor; +using UnityEngine; + +namespace Fenrir.Editor +{ + /// + /// Fenrir → Setup → Setup Bootstrap Scene + /// Idempotent — safe to run multiple times. + /// Creates or repairs the Bootstrap scene's manager GameObject with all + /// required components: Bootstrap, AppStateMachine, GameLoop, EventLogger wire. + /// + /// Run this once after creating Bootstrap.unity in the Unity Editor. + /// + public static class FenrirBootstrapSetup + { + private const string ManagerName = "FenrirManager"; + + [MenuItem("Fenrir/Setup/Setup Bootstrap Scene")] + public static void SetupBootstrapScene() + { + GameObject manager = GetOrCreate(ManagerName); + + EnsureComponent(manager); + EnsureComponent(manager); + EnsureComponent(manager); + + // Tag so SceneValidator can find it + manager.tag = "GameController"; + + // Build Settings: ensure Bootstrap is scene 0 + EnsureSceneInBuildSettings("Assets/_Project/Scenes/Bootstrap.unity", 0); + EnsureSceneInBuildSettings("Assets/_Project/Scenes/Awakening.unity", 1); + EnsureSceneInBuildSettings("Assets/_Project/Scenes/EmberForest.unity", 2); + + EditorUtility.SetDirty(manager); + UnityEditor.SceneManagement.EditorSceneManager.MarkSceneDirty( + manager.scene); + + Debug.Log("[FenrirBootstrapSetup] Bootstrap scene configured. " + + "Save the scene (Ctrl+S) before entering Play mode."); + + Selection.activeGameObject = manager; + } + + // ── Helpers ─────────────────────────────────────────────────────────── + + private static GameObject GetOrCreate(string name) + { + GameObject go = GameObject.Find(name); + if (go == null) + { + go = new GameObject(name); + Undo.RegisterCreatedObjectUndo(go, $"Create {name}"); + } + return go; + } + + private static T EnsureComponent(GameObject go) where T : Component + { + T existing = go.GetComponent(); + if (existing != null) return existing; + + T added = Undo.AddComponent(go); + Debug.Log($"[FenrirBootstrapSetup] Added {typeof(T).Name} to {go.name}"); + return added; + } + + private static void EnsureSceneInBuildSettings(string scenePath, int desiredIndex) + { + var scenes = new System.Collections.Generic.List( + EditorBuildSettings.scenes); + + // Check if already present at any index + foreach (var s in scenes) + if (s.path == scenePath) return; + + scenes.Insert(desiredIndex, new EditorBuildSettingsScene(scenePath, true)); + EditorBuildSettings.scenes = scenes.ToArray(); + Debug.Log($"[FenrirBootstrapSetup] Added '{scenePath}' to Build Settings at index {desiredIndex}"); + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Analytics/EventLogger.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Analytics/EventLogger.cs index 8db4225..b7dcc30 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Analytics/EventLogger.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Analytics/EventLogger.cs @@ -1,11 +1,16 @@ +using Fenrir.Config; +using Fenrir.Core; using Fenrir.Traits; +using System.Text; using UnityEngine; namespace Fenrir.Analytics { /// - /// Lightweight event logger. Listens to BehaviorEventBus and writes to - /// Unity console in development. Post-MVP: route to analytics backend. + /// Listens to BehaviorEventBus and logs events to the Unity console. + /// In development builds: also shows which traits changed and by how much, + /// so "dodge → Patience +2.0" is visible in the Console during play testing. + /// Post-MVP: route significant events to analytics backend. /// public class EventLogger { @@ -19,16 +24,33 @@ public EventLogger(bool verbose = false) private void SubscribeAll() { - // Log every BehaviorEvent type in development #if UNITY_EDITOR || DEVELOPMENT_BUILD - BehaviorEventBus.Subscribe(LogEvent); - BehaviorEventBus.Subscribe(LogEvent); - BehaviorEventBus.Subscribe(LogEvent); - BehaviorEventBus.Subscribe(LogEvent); - BehaviorEventBus.Subscribe(LogEvent); - BehaviorEventBus.Subscribe(LogEvent); - BehaviorEventBus.Subscribe(LogEvent); - BehaviorEventBus.Subscribe(LogEvent); + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e=> Log(e)); + + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Log(e)); + + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Log(e)); + BehaviorEventBus.Subscribe(e => Debug.Log($"[EventLogger] ★ EVOLUTION: {e.EvolutionId}")); BehaviorEventBus.Subscribe(e => @@ -36,10 +58,42 @@ private void SubscribeAll() #endif } - private void LogEvent(BehaviorEvent evt) + private void Log(BehaviorEvent evt) { - if (_verbose) - Debug.Log($"[EventLogger] {evt.EventKey}"); +#if UNITY_EDITOR || DEVELOPMENT_BUILD + if (!_verbose) return; + + // Read the weight config to show which traits this event affects + if (!ServiceLocator.TryGet(out TraitWeightsConfig weights)) + { + Debug.Log($"[Traits] {evt.EventKey}"); + return; + } + + if (!weights.Weights.TryGetValue(evt.EventKey, out var deltas)) + { + Debug.Log($"[Traits] {evt.EventKey} (no weights mapped)"); + return; + } + + // Read profile snapshot before accumulator processes for accurate before/after + // (EventLogger fires from bus simultaneously with accumulator — order is not guaranteed, + // so we show intended deltas from config rather than live before/after diff) + var sb = new StringBuilder($"[Traits] {evt.EventKey}"); + foreach (var pair in deltas) + { + float val = 0f; + if (ServiceLocator.TryGet(out ITraitAccumulator acc) + && acc is TraitAccumulator ta) + { + System.Enum.TryParse(pair.Key, true, out TraitKey key); + val = ta.Profile.Get(key); + } + string sign = pair.Value >= 0 ? "+" : ""; + sb.Append($" {pair.Key}: {sign}{pair.Value:F1} (now ≈{val:F0})"); + } + Debug.Log(sb.ToString()); +#endif } } } diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Awakening/AwakeningSequencer.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Awakening/AwakeningSequencer.cs index e397961..123b258 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Awakening/AwakeningSequencer.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Awakening/AwakeningSequencer.cs @@ -2,7 +2,6 @@ using Fenrir.Core; using Fenrir.Save; using UnityEngine; -using UnityEngine.SceneManagement; namespace Fenrir.Awakening { @@ -18,7 +17,7 @@ namespace Fenrir.Awakening /// public class AwakeningSequencer : MonoBehaviour { - [SerializeField] private string _gameScene = "EmberForest"; + // Scene name removed — navigation goes through SceneRouter, never SceneManager directly [Header("UI Panels")] [SerializeField] private GameObject _characterCreationPanel; @@ -75,9 +74,9 @@ private IEnumerator RunAwakening() // ElementRevealUI reads save to display element name/VFX yield return new WaitForSeconds(_elementRevealHoldSeconds); - // 4. Load game + // 4. Load game via SceneRouter so AppState, audio, and bus clear are all handled ShowPanel(_loadingPanel); - SceneManager.LoadScene(_gameScene); + yield return SceneRouter.LoadGameAsync().AsCoroutine(); } // ── Helpers ─────────────────────────────────────────────────────────── diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Core/Bootstrap.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Core/Bootstrap.cs index f513ff5..58a0d63 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Core/Bootstrap.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Core/Bootstrap.cs @@ -28,6 +28,29 @@ private async void Start() await RouteToInitialSceneAsync(); } + private void OnEnable() + { + // After every full scene transition, GameLoop clears the bus. + // Bootstrap re-subscribes the accumulator immediately so trait + // tracking resumes in the new scene. Additive sub-zone loads + // do NOT clear the bus, so no re-subscription needed there. + SceneRouter.OnSceneLoadComplete += ResubscribeAccumulator; + } + + private void OnDisable() + { + SceneRouter.OnSceneLoadComplete -= ResubscribeAccumulator; + } + + private void ResubscribeAccumulator() + { + if (ServiceLocator.TryGet(out ITraitAccumulator acc)) + { + SubscribeAccumulatorToBus(acc); + Debug.Log("[Bootstrap] TraitAccumulator re-subscribed after scene transition."); + } + } + // ── Service registration ────────────────────────────────────────────── private void RegisterServices() @@ -82,8 +105,19 @@ private void WireTraitAccumulator(Traits.TraitProfile profile) ServiceLocator.Get() ); ServiceLocator.Register(accumulator); + SubscribeAccumulatorToBus(accumulator); + } + + /// + /// Subscribes the accumulator to every concrete BehaviorEvent type. + /// Called on initial load and after every full scene transition (bus clear). + /// BehaviorEventBus.Subscribe is idempotent — safe to call multiple times. + /// + private static void SubscribeAccumulatorToBus(ITraitAccumulator acc) + { + // Cast required — Process(BehaviorEvent) is on TraitAccumulator, not the interface + if (acc is not TraitAccumulator accumulator) return; - // Subscribe to every concrete event type (bus is keyed by concrete type) BehaviorEventBus.Subscribe(accumulator.Process); BehaviorEventBus.Subscribe(accumulator.Process); BehaviorEventBus.Subscribe(accumulator.Process); diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Core/GameLoop.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Core/GameLoop.cs index 1a77d94..8ed0ea6 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Core/GameLoop.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Core/GameLoop.cs @@ -1,10 +1,8 @@ using System; using System.Threading.Tasks; using Fenrir.Save; -using Fenrir.StateMachine; using Fenrir.Traits; using UnityEngine; -using UnityEngine.SceneManagement; namespace Fenrir.Core { @@ -12,38 +10,41 @@ namespace Fenrir.Core /// Drives the top-level game loop: /// - Pause / resume (Time.timeScale + SceneRouter state) /// - Application focus / pause → debounced auto-save on background + /// - Full-scene transitions → clears BehaviorEventBus stale handlers /// - /// Attach to the Bootstrap GameObject (DontDestroyOnLoad). - /// Registered with ServiceLocator in Bootstrap. + /// Additive sub-zone loads (RegionLoader) do NOT clear the bus — only + /// full SceneRouter transitions do, preventing trait subscriptions from + /// being wiped mid-gameplay. /// public class GameLoop : MonoBehaviour { public bool IsPaused { get; private set; } - // Debounce: OnApplicationPause + OnApplicationFocus both fire on iOS background private bool _savePending; // ── Lifecycle ───────────────────────────────────────────────────────── private void OnEnable() { - SceneManager.sceneUnloaded += OnSceneUnloaded; + // Subscribe to full-scene completions only — NOT SceneManager.sceneUnloaded, + // which also fires for additive sub-zone unloads from RegionLoader. + SceneRouter.OnSceneLoadComplete += OnFullSceneTransitionComplete; } private void OnDisable() { - SceneManager.sceneUnloaded -= OnSceneUnloaded; + SceneRouter.OnSceneLoadComplete -= OnFullSceneTransitionComplete; } /// - /// Clear event bus on every scene unload to prevent stale MonoBehaviour - /// callbacks from destroyed scene objects firing during the next scene. - /// Bootstrap (DontDestroyOnLoad) resubscribes its own handlers after load. + /// Called after every full SceneRouter navigation. + /// Clears stale scene-object handlers from the destroyed scene. + /// Bootstrap (DontDestroyOnLoad) re-subscribes the TraitAccumulator immediately after. /// - private static void OnSceneUnloaded(Scene _) + private static void OnFullSceneTransitionComplete() { BehaviorEventBus.Clear(); - Debug.Log("[GameLoop] BehaviorEventBus cleared on scene unload."); + Debug.Log("[GameLoop] BehaviorEventBus cleared after full scene transition."); } // ── Pause / Resume ──────────────────────────────────────────────────── @@ -53,7 +54,6 @@ public void Pause() if (IsPaused) return; IsPaused = true; Time.timeScale = 0f; - // Use the router's internal setter so CurrentAppState stays accurate SceneRouter.SetPaused(true); Debug.Log("[GameLoop] Paused"); } @@ -67,34 +67,19 @@ public void Resume() Debug.Log("[GameLoop] Resumed"); } - public void TogglePause() - { - if (IsPaused) Resume(); else Pause(); - } + public void TogglePause() { if (IsPaused) Resume(); else Pause(); } // ── Application lifecycle ───────────────────────────────────────────── - private void OnApplicationPause(bool paused) - { - if (paused) RequestSave(); - } - - private void OnApplicationFocus(bool focused) - { - if (!focused) RequestSave(); - } - - private void OnApplicationQuit() - { - // Synchronous path on quit — fire-and-forget with error logging - _ = TrySaveAsync(); - } + private void OnApplicationPause(bool paused) { if (paused) RequestSave(); } + private void OnApplicationFocus(bool focused) { if (!focused) RequestSave(); } + private void OnApplicationQuit() { _ = TrySaveAsync(); } // ── Debounced save ──────────────────────────────────────────────────── private void RequestSave() { - if (_savePending) return; // de-duplicate the double-fire on iOS background + if (_savePending) return; _savePending = true; _ = TrySaveAsync(); } diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Input/InputHandler.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Input/InputHandler.cs index 7098c7b..b215d23 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Input/InputHandler.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Input/InputHandler.cs @@ -5,7 +5,8 @@ namespace Fenrir.Input { /// /// Raw input layer using Unity Input System (new). - /// Forwards to GestureRecognizer (touch) or processes keyboard directly (Editor). + /// On iOS/Android: forwards touch to GestureRecognizer. + /// In Editor/PC: processes keyboard directly. /// public class InputHandler : MonoBehaviour { @@ -14,7 +15,6 @@ public class InputHandler : MonoBehaviour private void Awake() { - // Auto-find on same GameObject if not wired via Inspector if (_gesture == null) _gesture = GetComponent(); if (_mapper == null) _mapper = GetComponent(); } @@ -22,23 +22,22 @@ private void Awake() private void Update() { if (_mapper == null) return; - if (Keyboard.current == null) return; #if UNITY_IOS || UNITY_ANDROID + // Touch path — Keyboard.current is null on device; guard must NOT block this ProcessTouches(); #else - ProcessKeyboard(); + // Editor / PC — keyboard may still be null if Input System isn't configured + if (Keyboard.current != null) + ProcessKeyboard(); #endif } - private void ProcessTouches() - { - _gesture?.Tick(); - } + private void ProcessTouches() => _gesture?.Tick(); private void ProcessKeyboard() { - var kb = Keyboard.current; + Keyboard kb = Keyboard.current; float h = 0f, v = 0f; if (kb.dKey.isPressed || kb.rightArrowKey.isPressed) h = 1f; diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/UI/JournalController.cs b/src/ProjectFenrir/Assets/_Project/Scripts/UI/JournalController.cs index 1da80c3..390b1dd 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/UI/JournalController.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/UI/JournalController.cs @@ -23,11 +23,12 @@ public class JournalController : MonoBehaviour private bool _isOpen; // ── Pre-authored vague flavour lines keyed by evolution ID ──────────── + // Keys must match EvolutionChecker signature IDs exactly (EvolutionSignatures.json) private static readonly Dictionary EvolutionEntries = new() { - ["inferno_form"] = "The heat no longer frightens you. It feels like a memory.", + ["inferno"] = "The heat no longer frightens you. It feels like a memory.", ["abyssal_current"] = "You move through water as though it always knew you were coming.", - ["bedrock_stance"] = "Something in your chest has settled. You are harder to move.", + ["bedrock"] = "Something in your chest has settled. You are harder to move.", ["galeform"] = "The air parts for you now. Or perhaps it always did.", }; From 14f69a3061c37cfefcee813011130de2907cb08d Mon Sep 17 00:00:00 2001 From: Seni Date: Wed, 3 Jun 2026 08:51:09 -0700 Subject: [PATCH 14/27] fix(compile): ISaveManager.IsDirty missing from interface, FindObjectsSortMode obsolete, _shrineId wired to WorldManager --- src/Assets/_Project/Scripts/Combat/CombatContext.cs | 2 +- src/Assets/_Project/Scripts/Evolution/ShrineController.cs | 5 +++++ src/Assets/_Project/Scripts/Save/ISaveManager.cs | 1 + .../Assets/_Project/Editor/FenrirBootstrapSetup.cs.meta | 2 ++ .../Assets/_Project/Scripts/Combat/CombatContext.cs | 2 +- .../_Project/Scripts/Entities/Player/PlayerDeathType.cs.meta | 2 ++ .../Assets/_Project/Scripts/Evolution/ShrineController.cs | 5 +++++ .../Assets/_Project/Scripts/Save/ISaveManager.cs | 1 + .../Assets/_Project/Scripts/UI/DeathMessageProvider.cs.meta | 2 ++ 9 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 src/ProjectFenrir/Assets/_Project/Editor/FenrirBootstrapSetup.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerDeathType.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Scripts/UI/DeathMessageProvider.cs.meta diff --git a/src/Assets/_Project/Scripts/Combat/CombatContext.cs b/src/Assets/_Project/Scripts/Combat/CombatContext.cs index e79c85e..a44d028 100644 --- a/src/Assets/_Project/Scripts/Combat/CombatContext.cs +++ b/src/Assets/_Project/Scripts/Combat/CombatContext.cs @@ -35,7 +35,7 @@ public int GetAwareEnemyCount() { int count = 0; foreach (Entities.Enemies.EnemyAI ai in - FindObjectsByType(FindObjectsSortMode.None)) + FindObjectsByType(FindObjectsInactive.Exclude, FindObjectsSortMode.None)) { if (ai.IsAwareOfPlayer) count++; } diff --git a/src/Assets/_Project/Scripts/Evolution/ShrineController.cs b/src/Assets/_Project/Scripts/Evolution/ShrineController.cs index fdb227e..630f5d0 100644 --- a/src/Assets/_Project/Scripts/Evolution/ShrineController.cs +++ b/src/Assets/_Project/Scripts/Evolution/ShrineController.cs @@ -98,6 +98,11 @@ private void OnTriggerExit(Collider other) public void TryInteract() { if (!_playerInRange || State != ShrineState.Active) return; + + // Persist shrine activation to save before starting the sequence + if (Core.ServiceLocator.TryGet(out World.WorldManager wm)) + wm.MarkShrineActivated(_shrineId); + _sequencer?.Begin(); } } diff --git a/src/Assets/_Project/Scripts/Save/ISaveManager.cs b/src/Assets/_Project/Scripts/Save/ISaveManager.cs index fd27d9b..9742a1f 100644 --- a/src/Assets/_Project/Scripts/Save/ISaveManager.cs +++ b/src/Assets/_Project/Scripts/Save/ISaveManager.cs @@ -8,5 +8,6 @@ public interface ISaveManager Task SaveAsync(); Task LoadAsync(); void MarkDirty(); // flags that a save is needed on next checkpoint + bool IsDirty { get; } // true when unsaved changes exist } } diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirBootstrapSetup.cs.meta b/src/ProjectFenrir/Assets/_Project/Editor/FenrirBootstrapSetup.cs.meta new file mode 100644 index 0000000..7d34c1c --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Editor/FenrirBootstrapSetup.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 23efdd2d6daf941eda2db49ad2fa1654 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatContext.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatContext.cs index e79c85e..a44d028 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatContext.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatContext.cs @@ -35,7 +35,7 @@ public int GetAwareEnemyCount() { int count = 0; foreach (Entities.Enemies.EnemyAI ai in - FindObjectsByType(FindObjectsSortMode.None)) + FindObjectsByType(FindObjectsInactive.Exclude, FindObjectsSortMode.None)) { if (ai.IsAwareOfPlayer) count++; } diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerDeathType.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerDeathType.cs.meta new file mode 100644 index 0000000..ba565af --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Entities/Player/PlayerDeathType.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: dbfc4ef0df3d14fccaea898238ef22de \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/ShrineController.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/ShrineController.cs index fdb227e..630f5d0 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/ShrineController.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Evolution/ShrineController.cs @@ -98,6 +98,11 @@ private void OnTriggerExit(Collider other) public void TryInteract() { if (!_playerInRange || State != ShrineState.Active) return; + + // Persist shrine activation to save before starting the sequence + if (Core.ServiceLocator.TryGet(out World.WorldManager wm)) + wm.MarkShrineActivated(_shrineId); + _sequencer?.Begin(); } } diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Save/ISaveManager.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Save/ISaveManager.cs index fd27d9b..9742a1f 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Save/ISaveManager.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Save/ISaveManager.cs @@ -8,5 +8,6 @@ public interface ISaveManager Task SaveAsync(); Task LoadAsync(); void MarkDirty(); // flags that a save is needed on next checkpoint + bool IsDirty { get; } // true when unsaved changes exist } } diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/UI/DeathMessageProvider.cs.meta b/src/ProjectFenrir/Assets/_Project/Scripts/UI/DeathMessageProvider.cs.meta new file mode 100644 index 0000000..2e5e444 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Scripts/UI/DeathMessageProvider.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 9b7efd7c4026c4fe0b85e3e75d549aa3 \ No newline at end of file From 577348ca71af1b0c04973eb1269163f95e223e9d Mon Sep 17 00:00:00 2001 From: Seni Date: Wed, 3 Jun 2026 08:58:58 -0700 Subject: [PATCH 15/27] =?UTF-8?q?fix(compile):=20clear=20all=20editor=20er?= =?UTF-8?q?rors=20and=20warnings=20=E2=80=94=20IsDirty=20interface,=20Find?= =?UTF-8?q?ObjectsSortMode,=20Finalize=20name,=20ShrineId=20wired?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Assets/_Project/Scripts/Combat/CombatContext.cs | 2 +- src/ProjectFenrir/Assets/_Project/Editor/FenrirSceneFinalize.cs | 2 +- .../Assets/_Project/Scripts/Combat/CombatContext.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Assets/_Project/Scripts/Combat/CombatContext.cs b/src/Assets/_Project/Scripts/Combat/CombatContext.cs index a44d028..ec2a0cb 100644 --- a/src/Assets/_Project/Scripts/Combat/CombatContext.cs +++ b/src/Assets/_Project/Scripts/Combat/CombatContext.cs @@ -35,7 +35,7 @@ public int GetAwareEnemyCount() { int count = 0; foreach (Entities.Enemies.EnemyAI ai in - FindObjectsByType(FindObjectsInactive.Exclude, FindObjectsSortMode.None)) + FindObjectsByType(FindObjectsInactive.Exclude)) { if (ai.IsAwareOfPlayer) count++; } diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirSceneFinalize.cs b/src/ProjectFenrir/Assets/_Project/Editor/FenrirSceneFinalize.cs index c7b0b9e..c453947 100644 --- a/src/ProjectFenrir/Assets/_Project/Editor/FenrirSceneFinalize.cs +++ b/src/ProjectFenrir/Assets/_Project/Editor/FenrirSceneFinalize.cs @@ -15,7 +15,7 @@ namespace Fenrir.Editor public static class FenrirSceneFinalize { [MenuItem("Fenrir/Finalize EmberForest Scene")] - public static void Finalize() + public static void FinalizeScene() { const string path = "Assets/_Project/Scenes/EmberForest.unity"; var scene = EditorSceneManager.OpenScene(path, OpenSceneMode.Single); diff --git a/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatContext.cs b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatContext.cs index a44d028..ec2a0cb 100644 --- a/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatContext.cs +++ b/src/ProjectFenrir/Assets/_Project/Scripts/Combat/CombatContext.cs @@ -35,7 +35,7 @@ public int GetAwareEnemyCount() { int count = 0; foreach (Entities.Enemies.EnemyAI ai in - FindObjectsByType(FindObjectsInactive.Exclude, FindObjectsSortMode.None)) + FindObjectsByType(FindObjectsInactive.Exclude)) { if (ai.IsAwareOfPlayer) count++; } From bc7d945e1ebdc5a58d7a34a1957f7a0daa6465e1 Mon Sep 17 00:00:00 2001 From: Seni Date: Wed, 3 Jun 2026 09:05:17 -0700 Subject: [PATCH 16/27] fix(editor): auto-register tags in TagManager before assignment, fix field names (_maxHp, _attackDamage), extract shared EnsureTag utility --- .../_Project/Editor/FenrirBootstrapSetup.cs | 6 ++- .../_Project/Editor/FenrirEditorUtils.cs | 35 ++++++++++++ .../_Project/Editor/FenrirEnemySetup.cs | 54 +++++++++---------- 3 files changed, 67 insertions(+), 28 deletions(-) create mode 100644 src/ProjectFenrir/Assets/_Project/Editor/FenrirEditorUtils.cs diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirBootstrapSetup.cs b/src/ProjectFenrir/Assets/_Project/Editor/FenrirBootstrapSetup.cs index 99ce1e9..3fbceaa 100644 --- a/src/ProjectFenrir/Assets/_Project/Editor/FenrirBootstrapSetup.cs +++ b/src/ProjectFenrir/Assets/_Project/Editor/FenrirBootstrapSetup.cs @@ -21,13 +21,17 @@ public static class FenrirBootstrapSetup [MenuItem("Fenrir/Setup/Setup Bootstrap Scene")] public static void SetupBootstrapScene() { + // Register all tags the game needs before assigning any + FenrirEditorUtils.EnsureTag("Player"); + FenrirEditorUtils.EnsureTag("Enemy"); + FenrirEditorUtils.EnsureTag("GameController"); + GameObject manager = GetOrCreate(ManagerName); EnsureComponent(manager); EnsureComponent(manager); EnsureComponent(manager); - // Tag so SceneValidator can find it manager.tag = "GameController"; // Build Settings: ensure Bootstrap is scene 0 diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirEditorUtils.cs b/src/ProjectFenrir/Assets/_Project/Editor/FenrirEditorUtils.cs new file mode 100644 index 0000000..dfbe1f8 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Editor/FenrirEditorUtils.cs @@ -0,0 +1,35 @@ +using UnityEditor; +using UnityEngine; + +namespace Fenrir.Editor +{ + /// + /// Shared utilities used by all Fenrir editor setup scripts. + /// + internal static class FenrirEditorUtils + { + /// + /// Adds to TagManager.asset if not already registered. + /// Unity throws UnityException on go.tag = "X" when "X" is not in TagManager. + /// + internal static void EnsureTag(string tag) + { + SerializedObject tagManager = new SerializedObject( + AssetDatabase.LoadAllAssetsAtPath("ProjectSettings/TagManager.asset")[0]); + + SerializedProperty tagsProp = tagManager.FindProperty("tags"); + + for (int i = 0; i < tagsProp.arraySize; i++) + { + if (tagsProp.GetArrayElementAtIndex(i).stringValue == tag) + return; + } + + tagsProp.InsertArrayElementAtIndex(tagsProp.arraySize); + tagsProp.GetArrayElementAtIndex(tagsProp.arraySize - 1).stringValue = tag; + tagManager.ApplyModifiedProperties(); + + Debug.Log($"[FenrirEditor] Registered tag '{tag}' in TagManager."); + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirEnemySetup.cs b/src/ProjectFenrir/Assets/_Project/Editor/FenrirEnemySetup.cs index 8981e9b..546b145 100644 --- a/src/ProjectFenrir/Assets/_Project/Editor/FenrirEnemySetup.cs +++ b/src/ProjectFenrir/Assets/_Project/Editor/FenrirEnemySetup.cs @@ -7,21 +7,19 @@ namespace Fenrir.Editor { /// /// Fenrir → Setup → Spawn Ash Wolf / Flame Sprite - /// Creates a fully-wired enemy in the active scene: - /// NavMeshAgent, EnemyBase, EnemyHealth, EnemyAI, EnemyCombat, EnemyTraitEmitter. - /// + /// Creates a fully-wired enemy in the active scene. + /// Automatically registers required tags in TagManager if missing. /// Bake NavMesh after spawning: Window → AI → Navigation → Bake. - /// Ensure "Enemy" tag exists: Edit → Project Settings → Tags and Layers. /// public static class FenrirEnemySetup { [MenuItem("Fenrir/Setup/Spawn Ash Wolf")] public static GameObject SpawnAshWolf() - => SpawnEnemy("AshWolf", new Vector3( 5f, 0f, 5f), maxHp: 80f, atk: 12f, speed: 4.5f, aggro: 8f, atkRange: 1.8f); + => SpawnEnemy("AshWolf", new Vector3( 5f, 0f, 5f), maxHp: 80f, atk: 12f, speed: 4.5f, aggro: 8f, atkRange: 1.8f); [MenuItem("Fenrir/Setup/Spawn Flame Sprite")] public static GameObject SpawnFlameSprite() - => SpawnEnemy("FlameSprite", new Vector3(-5f, 0f, 5f), maxHp: 45f, atk: 8f, speed: 6f, aggro: 10f, atkRange: 5f); + => SpawnEnemy("FlameSprite", new Vector3(-5f, 0f, 5f), maxHp: 45f, atk: 8f, speed: 6f, aggro: 10f, atkRange: 5f); // ── Internal ────────────────────────────────────────────────────────── @@ -29,15 +27,16 @@ private static GameObject SpawnEnemy( string name, Vector3 pos, float maxHp, float atk, float speed, float aggro, float atkRange) { + // Ensure "Enemy" tag exists before assigning — Unity throws if the tag + // is not registered in TagManager.asset. + FenrirEditorUtils.EnsureTag("Enemy"); + var go = GameObject.CreatePrimitive(PrimitiveType.Capsule); go.name = name; go.transform.position = pos; + go.tag = "Enemy"; - // Safe tag assignment — tag must exist in Project Settings - try { go.tag = "Enemy"; } - catch { Debug.LogWarning("[FenrirEnemySetup] 'Enemy' tag not found — add it in Edit → Project Settings → Tags and Layers."); } - - // Material tint (URP Lit) — with null-safe shader lookup + // Material tint (URP Lit) Renderer rend = go.GetComponent(); if (rend != null) { @@ -49,25 +48,24 @@ private static GameObject SpawnEnemy( } } - // NavMeshAgent — owns locomotion; Rigidbody NOT added (conflicts with NavMesh). - NavMeshAgent agent = go.AddComponent(); - agent.speed = speed; - agent.stoppingDistance = atkRange * 0.8f; - agent.radius = 0.4f; - agent.height = 2f; + // NavMeshAgent — owns locomotion + NavMeshAgent agent = go.AddComponent(); + agent.speed = speed; + agent.stoppingDistance = atkRange * 0.8f; + agent.radius = 0.4f; + agent.height = 2f; // Enemy component stack - EnemyHealth health = go.AddComponent(); - EnemyCombat combat = go.AddComponent(); - EnemyAI ai = go.AddComponent(); + EnemyHealth health = go.AddComponent(); + EnemyCombat combat = go.AddComponent(); + EnemyAI ai = go.AddComponent(); go.AddComponent(); go.AddComponent(); - // Write serialised fields via SerializedObject (Undo-safe, domain-reload-safe) - WriteFloat(health, "_maxHealth", maxHp); - WriteFloat(combat, "_baseAttack", atk); + WriteFloat(health, "_maxHp", maxHp); + WriteFloat(combat, "_attackDamage", atk); WriteFloat(ai, "_detectionRange", aggro); - WriteFloat(ai, "_attackRange", atkRange); + WriteFloat(ai, "_attackRange", atkRange); Undo.RegisterCreatedObjectUndo(go, $"Spawn {name}"); Selection.activeGameObject = go; @@ -77,14 +75,16 @@ private static GameObject SpawnEnemy( return go; } + // ── Field writer ────────────────────────────────────────────────────── + private static void WriteFloat(Component target, string fieldName, float value) { - SerializedObject so = new SerializedObject(target); + SerializedObject so = new SerializedObject(target); SerializedProperty sp = so.FindProperty(fieldName); if (sp == null) { - Debug.LogWarning($"[FenrirEnemySetup] Field '{fieldName}' not found on {target.GetType().Name}. " + - "Check that the field is [SerializeField] and the name matches."); + Debug.LogWarning($"[FenrirEnemySetup] Field '{fieldName}' not found on " + + $"{target.GetType().Name} — check [SerializeField] and name."); return; } sp.floatValue = value; From e912c28282400bb797b5dbf2ccc888d567f8b7e3 Mon Sep 17 00:00:00 2001 From: Seni Date: Wed, 3 Jun 2026 09:07:12 -0700 Subject: [PATCH 17/27] =?UTF-8?q?feat(editor):=20FenrirNavMeshSetup=20?= =?UTF-8?q?=E2=80=94=20one-click=20NavMeshSurface=20bake=20for=20com.unity?= =?UTF-8?q?.ai.navigation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_Project/Editor/FenrirEditorUtils.cs.meta | 2 + .../_Project/Editor/FenrirNavMeshSetup.cs | 50 +++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 src/ProjectFenrir/Assets/_Project/Editor/FenrirEditorUtils.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Editor/FenrirNavMeshSetup.cs diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirEditorUtils.cs.meta b/src/ProjectFenrir/Assets/_Project/Editor/FenrirEditorUtils.cs.meta new file mode 100644 index 0000000..a7a236e --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Editor/FenrirEditorUtils.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 37ad19e153aaf4d8f94f5bb1ac96ffda \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirNavMeshSetup.cs b/src/ProjectFenrir/Assets/_Project/Editor/FenrirNavMeshSetup.cs new file mode 100644 index 0000000..779315c --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Editor/FenrirNavMeshSetup.cs @@ -0,0 +1,50 @@ +using Unity.AI.Navigation; +using UnityEditor; +using UnityEngine; + +namespace Fenrir.Editor +{ + /// + /// Fenrir → Setup → Bake NavMesh + /// + /// The project uses com.unity.ai.navigation (NavMeshSurface), not the legacy + /// global bake. This script finds or creates a NavMeshSurface on the ground + /// plane and bakes it so NavMeshAgents (enemies) can navigate. + /// + /// Run this in EmberForest.unity after spawning enemies. + /// Re-run any time the ground geometry changes. + /// + public static class FenrirNavMeshSetup + { + [MenuItem("Fenrir/Setup/Bake NavMesh")] + public static void BakeNavMesh() + { + // Find the ground plane. FenrirSceneFinalize names it "Ground". + GameObject ground = GameObject.Find("Ground"); + if (ground == null) + { + Debug.LogError("[FenrirNavMeshSetup] 'Ground' GameObject not found in scene. " + + "Run Fenrir → Finalize EmberForest Scene first."); + return; + } + + // Get or add NavMeshSurface on the ground + NavMeshSurface surface = ground.GetComponent(); + if (surface == null) + { + surface = Undo.AddComponent(ground); + surface.collectObjects = CollectObjects.All; // bake entire scene geometry + surface.useGeometry = NavMeshCollectGeometry.PhysicsColliders; + Debug.Log("[FenrirNavMeshSetup] NavMeshSurface added to Ground."); + } + + // Bake synchronously in the Editor + surface.BuildNavMesh(); + + EditorUtility.SetDirty(ground); + UnityEditor.SceneManagement.EditorSceneManager.MarkSceneDirty(ground.scene); + + Debug.Log("[FenrirNavMeshSetup] NavMesh baked. Save the scene (Ctrl+S) before Play."); + } + } +} From 147ac7d3a08228cc777ff5fe40c3879d66cecd62 Mon Sep 17 00:00:00 2001 From: Seni Date: Wed, 3 Jun 2026 09:08:38 -0700 Subject: [PATCH 18/27] fix(asmdef): add Unity.AI.Navigation reference to Fenrir.Editor assembly --- src/ProjectFenrir/Assets/_Project/Editor/Fenrir.Editor.asmdef | 1 + .../Assets/_Project/Editor/FenrirNavMeshSetup.cs.meta | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 src/ProjectFenrir/Assets/_Project/Editor/FenrirNavMeshSetup.cs.meta diff --git a/src/ProjectFenrir/Assets/_Project/Editor/Fenrir.Editor.asmdef b/src/ProjectFenrir/Assets/_Project/Editor/Fenrir.Editor.asmdef index 636ff88..989d3fc 100644 --- a/src/ProjectFenrir/Assets/_Project/Editor/Fenrir.Editor.asmdef +++ b/src/ProjectFenrir/Assets/_Project/Editor/Fenrir.Editor.asmdef @@ -3,6 +3,7 @@ "rootNamespace": "Fenrir.Editor", "references": [ "Fenrir.Runtime", + "Unity.AI.Navigation", "Unity.Cinemachine", "Unity.InputSystem" ], diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirNavMeshSetup.cs.meta b/src/ProjectFenrir/Assets/_Project/Editor/FenrirNavMeshSetup.cs.meta new file mode 100644 index 0000000..9d95ec9 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Editor/FenrirNavMeshSetup.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 14ce773f9da734f419942b8b11b7fb19 \ No newline at end of file From 94fb0f5047c32934d149b37c720e7bd76ebe5fa2 Mon Sep 17 00:00:00 2001 From: Seni Date: Wed, 3 Jun 2026 09:12:39 -0700 Subject: [PATCH 19/27] =?UTF-8?q?refactor(editor):=20merge=207=20setup=20s?= =?UTF-8?q?cripts=20into=20single=20FenrirSetup.cs=20=E2=80=94=20Fenrir=20?= =?UTF-8?q?=E2=86=92=20Setup=20Project?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_Project/Editor/FenrirBootstrapSetup.cs | 89 ---- .../Editor/FenrirBootstrapSetup.cs.meta | 2 - .../_Project/Editor/FenrirEnemySetup.cs | 94 ---- .../_Project/Editor/FenrirEnemySetup.cs.meta | 2 - .../_Project/Editor/FenrirNavMeshSetup.cs | 50 -- .../Editor/FenrirNavMeshSetup.cs.meta | 2 - .../_Project/Editor/FenrirPlayerSetup.cs | 94 ---- .../_Project/Editor/FenrirPlayerSetup.cs.meta | 2 - .../_Project/Editor/FenrirSceneFinalize.cs | 185 ------- .../Editor/FenrirSceneFinalize.cs.meta | 2 - .../_Project/Editor/FenrirSceneSetup.cs | 160 ------ .../_Project/Editor/FenrirSceneSetup.cs.meta | 2 - .../Assets/_Project/Editor/FenrirSetup.cs | 464 ++++++++++++++++++ .../_Project/Editor/FenrirWireReferences.cs | 141 ------ .../Editor/FenrirWireReferences.cs.meta | 2 - 15 files changed, 464 insertions(+), 827 deletions(-) delete mode 100644 src/ProjectFenrir/Assets/_Project/Editor/FenrirBootstrapSetup.cs delete mode 100644 src/ProjectFenrir/Assets/_Project/Editor/FenrirBootstrapSetup.cs.meta delete mode 100644 src/ProjectFenrir/Assets/_Project/Editor/FenrirEnemySetup.cs delete mode 100644 src/ProjectFenrir/Assets/_Project/Editor/FenrirEnemySetup.cs.meta delete mode 100644 src/ProjectFenrir/Assets/_Project/Editor/FenrirNavMeshSetup.cs delete mode 100644 src/ProjectFenrir/Assets/_Project/Editor/FenrirNavMeshSetup.cs.meta delete mode 100644 src/ProjectFenrir/Assets/_Project/Editor/FenrirPlayerSetup.cs delete mode 100644 src/ProjectFenrir/Assets/_Project/Editor/FenrirPlayerSetup.cs.meta delete mode 100644 src/ProjectFenrir/Assets/_Project/Editor/FenrirSceneFinalize.cs delete mode 100644 src/ProjectFenrir/Assets/_Project/Editor/FenrirSceneFinalize.cs.meta delete mode 100644 src/ProjectFenrir/Assets/_Project/Editor/FenrirSceneSetup.cs delete mode 100644 src/ProjectFenrir/Assets/_Project/Editor/FenrirSceneSetup.cs.meta create mode 100644 src/ProjectFenrir/Assets/_Project/Editor/FenrirSetup.cs delete mode 100644 src/ProjectFenrir/Assets/_Project/Editor/FenrirWireReferences.cs delete mode 100644 src/ProjectFenrir/Assets/_Project/Editor/FenrirWireReferences.cs.meta diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirBootstrapSetup.cs b/src/ProjectFenrir/Assets/_Project/Editor/FenrirBootstrapSetup.cs deleted file mode 100644 index 3fbceaa..0000000 --- a/src/ProjectFenrir/Assets/_Project/Editor/FenrirBootstrapSetup.cs +++ /dev/null @@ -1,89 +0,0 @@ -using Fenrir.Analytics; -using Fenrir.Core; -using Fenrir.StateMachine; -using UnityEditor; -using UnityEngine; - -namespace Fenrir.Editor -{ - /// - /// Fenrir → Setup → Setup Bootstrap Scene - /// Idempotent — safe to run multiple times. - /// Creates or repairs the Bootstrap scene's manager GameObject with all - /// required components: Bootstrap, AppStateMachine, GameLoop, EventLogger wire. - /// - /// Run this once after creating Bootstrap.unity in the Unity Editor. - /// - public static class FenrirBootstrapSetup - { - private const string ManagerName = "FenrirManager"; - - [MenuItem("Fenrir/Setup/Setup Bootstrap Scene")] - public static void SetupBootstrapScene() - { - // Register all tags the game needs before assigning any - FenrirEditorUtils.EnsureTag("Player"); - FenrirEditorUtils.EnsureTag("Enemy"); - FenrirEditorUtils.EnsureTag("GameController"); - - GameObject manager = GetOrCreate(ManagerName); - - EnsureComponent(manager); - EnsureComponent(manager); - EnsureComponent(manager); - - manager.tag = "GameController"; - - // Build Settings: ensure Bootstrap is scene 0 - EnsureSceneInBuildSettings("Assets/_Project/Scenes/Bootstrap.unity", 0); - EnsureSceneInBuildSettings("Assets/_Project/Scenes/Awakening.unity", 1); - EnsureSceneInBuildSettings("Assets/_Project/Scenes/EmberForest.unity", 2); - - EditorUtility.SetDirty(manager); - UnityEditor.SceneManagement.EditorSceneManager.MarkSceneDirty( - manager.scene); - - Debug.Log("[FenrirBootstrapSetup] Bootstrap scene configured. " + - "Save the scene (Ctrl+S) before entering Play mode."); - - Selection.activeGameObject = manager; - } - - // ── Helpers ─────────────────────────────────────────────────────────── - - private static GameObject GetOrCreate(string name) - { - GameObject go = GameObject.Find(name); - if (go == null) - { - go = new GameObject(name); - Undo.RegisterCreatedObjectUndo(go, $"Create {name}"); - } - return go; - } - - private static T EnsureComponent(GameObject go) where T : Component - { - T existing = go.GetComponent(); - if (existing != null) return existing; - - T added = Undo.AddComponent(go); - Debug.Log($"[FenrirBootstrapSetup] Added {typeof(T).Name} to {go.name}"); - return added; - } - - private static void EnsureSceneInBuildSettings(string scenePath, int desiredIndex) - { - var scenes = new System.Collections.Generic.List( - EditorBuildSettings.scenes); - - // Check if already present at any index - foreach (var s in scenes) - if (s.path == scenePath) return; - - scenes.Insert(desiredIndex, new EditorBuildSettingsScene(scenePath, true)); - EditorBuildSettings.scenes = scenes.ToArray(); - Debug.Log($"[FenrirBootstrapSetup] Added '{scenePath}' to Build Settings at index {desiredIndex}"); - } - } -} diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirBootstrapSetup.cs.meta b/src/ProjectFenrir/Assets/_Project/Editor/FenrirBootstrapSetup.cs.meta deleted file mode 100644 index 7d34c1c..0000000 --- a/src/ProjectFenrir/Assets/_Project/Editor/FenrirBootstrapSetup.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 23efdd2d6daf941eda2db49ad2fa1654 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirEnemySetup.cs b/src/ProjectFenrir/Assets/_Project/Editor/FenrirEnemySetup.cs deleted file mode 100644 index 546b145..0000000 --- a/src/ProjectFenrir/Assets/_Project/Editor/FenrirEnemySetup.cs +++ /dev/null @@ -1,94 +0,0 @@ -using Fenrir.Entities.Enemies; -using UnityEditor; -using UnityEngine; -using UnityEngine.AI; - -namespace Fenrir.Editor -{ - /// - /// Fenrir → Setup → Spawn Ash Wolf / Flame Sprite - /// Creates a fully-wired enemy in the active scene. - /// Automatically registers required tags in TagManager if missing. - /// Bake NavMesh after spawning: Window → AI → Navigation → Bake. - /// - public static class FenrirEnemySetup - { - [MenuItem("Fenrir/Setup/Spawn Ash Wolf")] - public static GameObject SpawnAshWolf() - => SpawnEnemy("AshWolf", new Vector3( 5f, 0f, 5f), maxHp: 80f, atk: 12f, speed: 4.5f, aggro: 8f, atkRange: 1.8f); - - [MenuItem("Fenrir/Setup/Spawn Flame Sprite")] - public static GameObject SpawnFlameSprite() - => SpawnEnemy("FlameSprite", new Vector3(-5f, 0f, 5f), maxHp: 45f, atk: 8f, speed: 6f, aggro: 10f, atkRange: 5f); - - // ── Internal ────────────────────────────────────────────────────────── - - private static GameObject SpawnEnemy( - string name, Vector3 pos, - float maxHp, float atk, float speed, float aggro, float atkRange) - { - // Ensure "Enemy" tag exists before assigning — Unity throws if the tag - // is not registered in TagManager.asset. - FenrirEditorUtils.EnsureTag("Enemy"); - - var go = GameObject.CreatePrimitive(PrimitiveType.Capsule); - go.name = name; - go.transform.position = pos; - go.tag = "Enemy"; - - // Material tint (URP Lit) - Renderer rend = go.GetComponent(); - if (rend != null) - { - Shader urpLit = Shader.Find("Universal Render Pipeline/Lit"); - if (urpLit != null) - { - rend.sharedMaterial = new Material(urpLit); - rend.sharedMaterial.color = new Color(0.8f, 0.2f, 0.1f); - } - } - - // NavMeshAgent — owns locomotion - NavMeshAgent agent = go.AddComponent(); - agent.speed = speed; - agent.stoppingDistance = atkRange * 0.8f; - agent.radius = 0.4f; - agent.height = 2f; - - // Enemy component stack - EnemyHealth health = go.AddComponent(); - EnemyCombat combat = go.AddComponent(); - EnemyAI ai = go.AddComponent(); - go.AddComponent(); - go.AddComponent(); - - WriteFloat(health, "_maxHp", maxHp); - WriteFloat(combat, "_attackDamage", atk); - WriteFloat(ai, "_detectionRange", aggro); - WriteFloat(ai, "_attackRange", atkRange); - - Undo.RegisterCreatedObjectUndo(go, $"Spawn {name}"); - Selection.activeGameObject = go; - - Debug.Log($"[FenrirEnemySetup] '{name}' spawned at {pos}. " + - "Bake NavMesh: Window → AI → Navigation → Bake."); - return go; - } - - // ── Field writer ────────────────────────────────────────────────────── - - private static void WriteFloat(Component target, string fieldName, float value) - { - SerializedObject so = new SerializedObject(target); - SerializedProperty sp = so.FindProperty(fieldName); - if (sp == null) - { - Debug.LogWarning($"[FenrirEnemySetup] Field '{fieldName}' not found on " + - $"{target.GetType().Name} — check [SerializeField] and name."); - return; - } - sp.floatValue = value; - so.ApplyModifiedPropertiesWithoutUndo(); - } - } -} diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirEnemySetup.cs.meta b/src/ProjectFenrir/Assets/_Project/Editor/FenrirEnemySetup.cs.meta deleted file mode 100644 index 94ac134..0000000 --- a/src/ProjectFenrir/Assets/_Project/Editor/FenrirEnemySetup.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 419865f0e0c2f413ca86f221c1bd4f2c \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirNavMeshSetup.cs b/src/ProjectFenrir/Assets/_Project/Editor/FenrirNavMeshSetup.cs deleted file mode 100644 index 779315c..0000000 --- a/src/ProjectFenrir/Assets/_Project/Editor/FenrirNavMeshSetup.cs +++ /dev/null @@ -1,50 +0,0 @@ -using Unity.AI.Navigation; -using UnityEditor; -using UnityEngine; - -namespace Fenrir.Editor -{ - /// - /// Fenrir → Setup → Bake NavMesh - /// - /// The project uses com.unity.ai.navigation (NavMeshSurface), not the legacy - /// global bake. This script finds or creates a NavMeshSurface on the ground - /// plane and bakes it so NavMeshAgents (enemies) can navigate. - /// - /// Run this in EmberForest.unity after spawning enemies. - /// Re-run any time the ground geometry changes. - /// - public static class FenrirNavMeshSetup - { - [MenuItem("Fenrir/Setup/Bake NavMesh")] - public static void BakeNavMesh() - { - // Find the ground plane. FenrirSceneFinalize names it "Ground". - GameObject ground = GameObject.Find("Ground"); - if (ground == null) - { - Debug.LogError("[FenrirNavMeshSetup] 'Ground' GameObject not found in scene. " + - "Run Fenrir → Finalize EmberForest Scene first."); - return; - } - - // Get or add NavMeshSurface on the ground - NavMeshSurface surface = ground.GetComponent(); - if (surface == null) - { - surface = Undo.AddComponent(ground); - surface.collectObjects = CollectObjects.All; // bake entire scene geometry - surface.useGeometry = NavMeshCollectGeometry.PhysicsColliders; - Debug.Log("[FenrirNavMeshSetup] NavMeshSurface added to Ground."); - } - - // Bake synchronously in the Editor - surface.BuildNavMesh(); - - EditorUtility.SetDirty(ground); - UnityEditor.SceneManagement.EditorSceneManager.MarkSceneDirty(ground.scene); - - Debug.Log("[FenrirNavMeshSetup] NavMesh baked. Save the scene (Ctrl+S) before Play."); - } - } -} diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirNavMeshSetup.cs.meta b/src/ProjectFenrir/Assets/_Project/Editor/FenrirNavMeshSetup.cs.meta deleted file mode 100644 index 9d95ec9..0000000 --- a/src/ProjectFenrir/Assets/_Project/Editor/FenrirNavMeshSetup.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 14ce773f9da734f419942b8b11b7fb19 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirPlayerSetup.cs b/src/ProjectFenrir/Assets/_Project/Editor/FenrirPlayerSetup.cs deleted file mode 100644 index 7e5e3c1..0000000 --- a/src/ProjectFenrir/Assets/_Project/Editor/FenrirPlayerSetup.cs +++ /dev/null @@ -1,94 +0,0 @@ -#if UNITY_EDITOR -// Editor/FenrirPlayerSetup.cs -// Run via: Fenrir → Setup Player & Camera -// Adds a visible capsule mesh to the Player and a follow target for Cinemachine. -// Cinemachine camera is added manually via Component menu after this runs. - -using UnityEditor; -using UnityEditor.SceneManagement; -using UnityEngine; - -namespace Fenrir.Editor -{ - public static class FenrirPlayerSetup - { - [MenuItem("Fenrir/Setup Player & Camera")] - public static void Setup() - { - const string scenePath = "Assets/_Project/Scenes/EmberForest.unity"; - var scene = EditorSceneManager.OpenScene(scenePath, OpenSceneMode.Single); - - SetupPlayerMesh(); - SetupFollowTarget(); - AddGroundPlane(); - - EditorSceneManager.SaveScene(scene); - Debug.Log("[FenrirPlayerSetup] ✓ Player mesh and follow target set up. " + - "Add a CinemachineCamera via Component menu and set Follow/LookAt to CameraFollowTarget."); - } - - // ── Player capsule ──────────────────────────────────────────────────── - - private static void SetupPlayerMesh() - { - var player = GameObject.Find("Player"); - if (player == null) { Debug.LogError("[FenrirPlayerSetup] Player not found."); return; } - - if (player.GetComponentInChildren() != null) - { - Debug.Log("[FenrirPlayerSetup] Player mesh already exists — skipping."); - return; - } - - // Capsule body - var body = GameObject.CreatePrimitive(PrimitiveType.Capsule); - body.name = "Mesh"; - body.transform.SetParent(player.transform); - body.transform.localPosition = new Vector3(0f, 1f, 0f); - body.transform.localScale = Vector3.one; - Object.DestroyImmediate(body.GetComponent()); - - // Forward indicator - var arrow = GameObject.CreatePrimitive(PrimitiveType.Cube); - arrow.name = "ForwardArrow"; - arrow.transform.SetParent(player.transform); - arrow.transform.localPosition = new Vector3(0f, 1f, 0.65f); - arrow.transform.localScale = new Vector3(0.15f, 0.15f, 0.4f); - Object.DestroyImmediate(arrow.GetComponent()); - - player.transform.position = Vector3.zero; - Debug.Log("[FenrirPlayerSetup] ✓ Player capsule mesh added."); - } - - // ── Camera follow target ────────────────────────────────────────────── - - private static void SetupFollowTarget() - { - var player = GameObject.Find("Player"); - if (player == null) return; - - if (player.transform.Find("CameraFollowTarget") != null) return; - - var target = new GameObject("CameraFollowTarget"); - target.transform.SetParent(player.transform); - target.transform.localPosition = new Vector3(0f, 1.6f, 0f); // eye height - - Debug.Log("[FenrirPlayerSetup] ✓ CameraFollowTarget created on Player."); - } - - // ── Ground plane ────────────────────────────────────────────────────── - - private static void AddGroundPlane() - { - if (GameObject.Find("Ground") != null) return; - - var ground = GameObject.CreatePrimitive(PrimitiveType.Plane); - ground.name = "Ground"; - ground.transform.position = Vector3.zero; - ground.transform.localScale = new Vector3(10f, 1f, 10f); - - Debug.Log("[FenrirPlayerSetup] ✓ Ground plane added."); - } - } -} -#endif diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirPlayerSetup.cs.meta b/src/ProjectFenrir/Assets/_Project/Editor/FenrirPlayerSetup.cs.meta deleted file mode 100644 index 29265b3..0000000 --- a/src/ProjectFenrir/Assets/_Project/Editor/FenrirPlayerSetup.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 8738f499cd193442e84e6d49f46b659b \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirSceneFinalize.cs b/src/ProjectFenrir/Assets/_Project/Editor/FenrirSceneFinalize.cs deleted file mode 100644 index c453947..0000000 --- a/src/ProjectFenrir/Assets/_Project/Editor/FenrirSceneFinalize.cs +++ /dev/null @@ -1,185 +0,0 @@ -#if UNITY_EDITOR -// Editor/FenrirSceneFinalize.cs -// Run via: Fenrir → Finalize EmberForest Scene -// Adds ground plane, SceneValidator, fixes EventSystem, positions Player correctly. -// Safe to run multiple times — all ops are idempotent. - -using UnityEditor; -using UnityEditor.SceneManagement; -using UnityEngine; -using UnityEngine.InputSystem.UI; -using Unity.Cinemachine; - -namespace Fenrir.Editor -{ - public static class FenrirSceneFinalize - { - [MenuItem("Fenrir/Finalize EmberForest Scene")] - public static void FinalizeScene() - { - const string path = "Assets/_Project/Scenes/EmberForest.unity"; - var scene = EditorSceneManager.OpenScene(path, OpenSceneMode.Single); - - FixEventSystem(); - EnsureGroundPlane(); - EnsurePlayerMesh(); - PositionPlayer(); - EnsureCinemachineCamera(); - AddSceneValidator(); - EnsurePlayerTag(); - - EditorSceneManager.SaveScene(scene); - Debug.Log("[FenrirSceneFinalize] ✓ EmberForest finalized."); - } - - // ── EventSystem: replace StandaloneInputModule with InputSystemUIInputModule ── - - private static void FixEventSystem() - { - var es = GameObject.Find("EventSystem"); - if (es == null) return; - - var old = es.GetComponent(); - if (old != null) - { - Object.DestroyImmediate(old); - Debug.Log("[FenrirSceneFinalize] ✓ Removed StandaloneInputModule."); - } - - if (es.GetComponent() == null) - { - es.AddComponent(); - Debug.Log("[FenrirSceneFinalize] ✓ Added InputSystemUIInputModule."); - } - } - - // ── Ground plane ────────────────────────────────────────────────────── - - private static void EnsureGroundPlane() - { - if (GameObject.Find("Ground") != null) - { - Debug.Log("[FenrirSceneFinalize] Ground plane already exists."); - return; - } - - var ground = GameObject.CreatePrimitive(PrimitiveType.Plane); - ground.name = "Ground"; - ground.transform.position = Vector3.zero; - ground.transform.localScale = new Vector3(20f, 1f, 20f); - Debug.Log("[FenrirSceneFinalize] ✓ Ground plane added (200x200 units)."); - } - - // ── Player positioning ──────────────────────────────────────────────── - - private static void PositionPlayer() - { - var player = GameObject.Find("Player"); - if (player == null) return; - - // Only reposition if at origin or underground - if (player.transform.position.y < 0f || player.transform.position == Vector3.zero) - { - player.transform.position = new Vector3(0f, 0.1f, 0f); - Debug.Log("[FenrirSceneFinalize] ✓ Player positioned above ground."); - } - } - - // ── SceneValidator ──────────────────────────────────────────────────── - - private static void AddSceneValidator() - { - var wm = GameObject.Find("WorldManager"); - if (wm == null) return; - - if (wm.GetComponent() == null) - { - wm.AddComponent(); - Debug.Log("[FenrirSceneFinalize] ✓ SceneValidator added to WorldManager."); - } - } - - // ── Player capsule mesh ─────────────────────────────────────────────── - - private static void EnsurePlayerMesh() - { - var player = GameObject.Find("Player"); - if (player == null) return; - if (player.GetComponentInChildren() != null) return; - - var body = GameObject.CreatePrimitive(PrimitiveType.Capsule); - body.name = "Mesh"; - body.transform.SetParent(player.transform); - body.transform.localPosition = new Vector3(0f, 1f, 0f); - Object.DestroyImmediate(body.GetComponent()); - - var arrow = GameObject.CreatePrimitive(PrimitiveType.Cube); - arrow.name = "ForwardArrow"; - arrow.transform.SetParent(player.transform); - arrow.transform.localPosition = new Vector3(0f, 1f, 0.65f); - arrow.transform.localScale = new Vector3(0.15f, 0.15f, 0.4f); - Object.DestroyImmediate(arrow.GetComponent()); - - // Camera follow target at eye height - if (player.transform.Find("CameraFollowTarget") == null) - { - var t = new GameObject("CameraFollowTarget"); - t.transform.SetParent(player.transform); - t.transform.localPosition = new Vector3(0f, 1.6f, 0f); - } - - Debug.Log("[FenrirSceneFinalize] ✓ Player mesh added."); - } - - // ── Cinemachine camera ──────────────────────────────────────────────── - - private static void EnsureCinemachineCamera() - { - if (GameObject.Find("CM FreeLook") != null) return; - - var player = GameObject.Find("Player"); - if (player == null) return; - - var followTarget = player.transform.Find("CameraFollowTarget"); - if (followTarget == null) return; - - // Ensure Main Camera has CinemachineBrain - var mainCam = Camera.main; - if (mainCam != null && mainCam.GetComponent() == null) - mainCam.gameObject.AddComponent(); - - // Create Cinemachine camera - var camGo = new GameObject("CM FreeLook"); - camGo.transform.position = new Vector3(0f, 3f, -6f); - - var vcam = camGo.AddComponent(); - vcam.Follow = followTarget; - vcam.LookAt = followTarget; - vcam.Priority = new PrioritySettings { Value = 10 }; - - var follow = camGo.AddComponent(); - follow.OrbitStyle = CinemachineOrbitalFollow.OrbitStyles.Sphere; - follow.Radius = 5f; - follow.VerticalAxis.Value = 15f; - - camGo.AddComponent(); - - Debug.Log("[FenrirSceneFinalize] ✓ CinemachineCamera created."); - } - - // ── Player tag ──────────────────────────────────────────────────────── - - private static void EnsurePlayerTag() - { - var player = GameObject.Find("Player"); - if (player == null) return; - - if (player.tag != "Player") - { - player.tag = "Player"; - Debug.Log("[FenrirSceneFinalize] ✓ Player tag set."); - } - } - } -} -#endif diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirSceneFinalize.cs.meta b/src/ProjectFenrir/Assets/_Project/Editor/FenrirSceneFinalize.cs.meta deleted file mode 100644 index ac1f769..0000000 --- a/src/ProjectFenrir/Assets/_Project/Editor/FenrirSceneFinalize.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: c968532f3b41747f8a715d81894cc586 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirSceneSetup.cs b/src/ProjectFenrir/Assets/_Project/Editor/FenrirSceneSetup.cs deleted file mode 100644 index f1af19f..0000000 --- a/src/ProjectFenrir/Assets/_Project/Editor/FenrirSceneSetup.cs +++ /dev/null @@ -1,160 +0,0 @@ -// Editor/FenrirSceneSetup.cs -// Run once via: Fenrir → Setup Scenes -// Creates Bootstrap, Awakening, and EmberForest scenes with correct GameObjects, -// adds them to Build Settings, and saves everything. - -#if UNITY_EDITOR -using UnityEditor; -using UnityEditor.SceneManagement; -using UnityEngine; -using UnityEngine.SceneManagement; -using System.IO; -using System.Collections.Generic; - -namespace Fenrir.Editor -{ - public static class FenrirSceneSetup - { - private const string ScenePath = "Assets/_Project/Scenes/"; - - [MenuItem("Fenrir/Setup Scenes")] - public static void SetupScenes() - { - Directory.CreateDirectory(Application.dataPath + "/_Project/Scenes"); - AssetDatabase.Refresh(); - - CreateBootstrapScene(); - CreateAwakeningScene(); - CreateEmberForestScene(); - AddScenesToBuildSettings(); - - Debug.Log("[FenrirSceneSetup] ✓ All scenes created and added to Build Settings."); - } - - // ── Bootstrap ───────────────────────────────────────────────────────── - - private static void CreateBootstrapScene() - { - var scene = EditorSceneManager.NewScene(NewSceneSetup.EmptyScene, NewSceneMode.Single); - - // Bootstrap GameObject - var go = new GameObject("Bootstrap"); - go.AddComponent(); - - // EventSystem (needed for UI) - CreateEventSystem(); - - EditorSceneManager.SaveScene(scene, ScenePath + "Bootstrap.unity"); - Debug.Log("[FenrirSceneSetup] ✓ Bootstrap scene created."); - } - - // ── Awakening ───────────────────────────────────────────────────────── - - private static void CreateAwakeningScene() - { - var scene = EditorSceneManager.NewScene(NewSceneSetup.DefaultGameObjects, NewSceneMode.Single); - - // AwakeningSequencer - var sequencer = new GameObject("AwakeningSequencer"); - sequencer.AddComponent(); - - // Placeholder UI panels (empty GameObjects — designer fills in) - CreateUIPanel("CharacterCreationPanel", sequencer.transform); - CreateUIPanel("ElementRevealPanel", sequencer.transform); - CreateUIPanel("LoadingPanel", sequencer.transform); - - EditorSceneManager.SaveScene(scene, ScenePath + "Awakening.unity"); - Debug.Log("[FenrirSceneSetup] ✓ Awakening scene created."); - } - - // ── EmberForest ─────────────────────────────────────────────────────── - - private static void CreateEmberForestScene() - { - var scene = EditorSceneManager.NewScene(NewSceneSetup.DefaultGameObjects, NewSceneMode.Single); - - // ── Player ──────────────────────────────────────────────────────── - var player = new GameObject("Player"); - player.tag = "Player"; - player.AddComponent(); - player.AddComponent(); - player.AddComponent(); - player.AddComponent(); - player.AddComponent(); - var combat = player.AddComponent(); - var emitter = player.AddComponent(); - - // ── Input ───────────────────────────────────────────────────────── - var inputGo = new GameObject("InputSystem"); - var mapper = inputGo.AddComponent(); - var gesture = inputGo.AddComponent(); - var inputHandler = inputGo.AddComponent(); - - // ── World ───────────────────────────────────────────────────────── - var worldGo = new GameObject("WorldManager"); - worldGo.AddComponent(); - - // DayNightCycle — wire directional light in Inspector - var dnGo = new GameObject("DayNightCycle"); - dnGo.AddComponent(); - - // ── Combat System ───────────────────────────────────────────────── - var csGo = new GameObject("CombatSystem"); - csGo.AddComponent(); - - // ── Audio ───────────────────────────────────────────────────────── - var audioGo = new GameObject("AudioManager"); - audioGo.AddComponent(); - audioGo.AddComponent(); - audioGo.AddComponent(); - - // ── HUD (Canvas) ────────────────────────────────────────────────── - var hudCanvas = new GameObject("HUD"); - var canvas = hudCanvas.AddComponent(); - canvas.renderMode = RenderMode.ScreenSpaceOverlay; - hudCanvas.AddComponent(); - hudCanvas.AddComponent(); - hudCanvas.AddComponent(); - hudCanvas.AddComponent(); - hudCanvas.AddComponent(); - - CreateEventSystem(); - - EditorSceneManager.SaveScene(scene, ScenePath + "EmberForest.unity"); - Debug.Log("[FenrirSceneSetup] ✓ EmberForest scene created."); - } - - // ── Build Settings ──────────────────────────────────────────────────── - - private static void AddScenesToBuildSettings() - { - var scenes = new List - { - new EditorBuildSettingsScene(ScenePath + "Bootstrap.unity", true), - new EditorBuildSettingsScene(ScenePath + "Awakening.unity", true), - new EditorBuildSettingsScene(ScenePath + "EmberForest.unity", true), - }; - EditorBuildSettings.scenes = scenes.ToArray(); - } - - // ── Helpers ─────────────────────────────────────────────────────────── - - private static void CreateEventSystem() - { - var es = new GameObject("EventSystem"); - es.AddComponent(); - // Use new Input System module — StandaloneInputModule causes errors when - // Active Input Handling is set to "Input System Package (New)" - es.AddComponent(); - } - - private static GameObject CreateUIPanel(string name, Transform parent) - { - var go = new GameObject(name); - go.transform.SetParent(parent); - go.SetActive(false); - return go; - } - } -} -#endif diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirSceneSetup.cs.meta b/src/ProjectFenrir/Assets/_Project/Editor/FenrirSceneSetup.cs.meta deleted file mode 100644 index 9455f46..0000000 --- a/src/ProjectFenrir/Assets/_Project/Editor/FenrirSceneSetup.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: b0e951d1a1e9b4516bf49715843179a5 \ No newline at end of file diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirSetup.cs b/src/ProjectFenrir/Assets/_Project/Editor/FenrirSetup.cs new file mode 100644 index 0000000..c9f0552 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Editor/FenrirSetup.cs @@ -0,0 +1,464 @@ +using System.Collections.Generic; +using System.IO; +using Unity.AI.Navigation; +using Unity.Cinemachine; +using UnityEditor; +using UnityEditor.SceneManagement; +using UnityEngine; +using UnityEngine.InputSystem.UI; + +using Fenrir.Audio; +using Fenrir.Awakening; +using Fenrir.Combat; +using Fenrir.Core; +using Fenrir.Entities.Player; +using Fenrir.Input; +using Fenrir.UI; +using Fenrir.World; + +namespace Fenrir.Editor +{ + /// + /// Fenrir → Setup Project + /// + /// Single-click full project setup. Idempotent — safe to run multiple times. + /// + /// Order of operations: + /// 1. Register tags (Player, Enemy, GameController) + /// 2. Create / configure Bootstrap scene + /// 3. Create / configure Awakening scene + /// 4. Create / configure EmberForest scene + /// 5. Finalize EmberForest (ground, mesh, Cinemachine, EventSystem) + /// 6. Wire all serialized references + /// 7. Spawn Ash Wolf enemy + /// 8. Bake NavMesh + /// 9. Set Build Settings (Bootstrap=0, Awakening=1, EmberForest=2) + /// 10. Save all scenes + /// + public static class FenrirSetup + { + private const string ScenePath = "Assets/_Project/Scenes/"; + private const string BootstrapScene = ScenePath + "Bootstrap.unity"; + private const string AwakeningScene = ScenePath + "Awakening.unity"; + private const string GameScene = ScenePath + "EmberForest.unity"; + + [MenuItem("Fenrir/Setup Project")] + public static void SetupProject() + { + // ── 1. Tags ─────────────────────────────────────────────────────── + FenrirEditorUtils.EnsureTag("Player"); + FenrirEditorUtils.EnsureTag("Enemy"); + FenrirEditorUtils.EnsureTag("GameController"); + + // ── 2. Bootstrap ────────────────────────────────────────────────── + SetupBootstrap(); + + // ── 3. Awakening ────────────────────────────────────────────────── + SetupAwakening(); + + // ── 4–8. EmberForest (all steps in one scene open) ──────────────── + SetupEmberForest(); + + // ── 9. Build Settings ───────────────────────────────────────────── + SetBuildSettings(); + + Debug.Log("[FenrirSetup] ✓ Project setup complete. Press Play in EmberForest."); + } + + // ═════════════════════════════════════════════════════════════════════ + // Bootstrap + // ═════════════════════════════════════════════════════════════════════ + + private static void SetupBootstrap() + { + Directory.CreateDirectory(Application.dataPath + "/_Project/Scenes"); + AssetDatabase.Refresh(); + + var scene = EditorSceneManager.OpenScene(BootstrapScene, OpenSceneMode.Single); + + // If no scene existed yet, NewScene creates it; otherwise OpenScene loaded it + if (!File.Exists(Path.GetFullPath(BootstrapScene))) + scene = EditorSceneManager.NewScene(NewSceneSetup.EmptyScene, NewSceneMode.Single); + + // FenrirManager — Bootstrap + AppStateMachine + GameLoop + GameObject mgr = GetOrCreate("FenrirManager"); + mgr.tag = "GameController"; + EnsureComponent(mgr); + EnsureComponent(mgr); + EnsureComponent(mgr); + + // EventSystem + CreateEventSystem(); + + EditorSceneManager.SaveScene(scene, BootstrapScene); + Debug.Log("[FenrirSetup] ✓ Bootstrap scene ready."); + } + + // ═════════════════════════════════════════════════════════════════════ + // Awakening + // ═════════════════════════════════════════════════════════════════════ + + private static void SetupAwakening() + { + var scene = File.Exists(Path.GetFullPath(AwakeningScene)) + ? EditorSceneManager.OpenScene(AwakeningScene, OpenSceneMode.Single) + : EditorSceneManager.NewScene(NewSceneSetup.DefaultGameObjects, NewSceneMode.Single); + + GameObject seq = GetOrCreate("AwakeningSequencer"); + EnsureComponent(seq); + + EnsureChild(seq, "CharacterCreationPanel"); + EnsureChild(seq, "ElementRevealPanel"); + EnsureChild(seq, "LoadingPanel"); + + EditorSceneManager.SaveScene(scene, AwakeningScene); + Debug.Log("[FenrirSetup] ✓ Awakening scene ready."); + } + + // ═════════════════════════════════════════════════════════════════════ + // EmberForest — all steps while scene is open + // ═════════════════════════════════════════════════════════════════════ + + private static void SetupEmberForest() + { + var scene = File.Exists(Path.GetFullPath(GameScene)) + ? EditorSceneManager.OpenScene(GameScene, OpenSceneMode.Single) + : EditorSceneManager.NewScene(NewSceneSetup.DefaultGameObjects, NewSceneMode.Single); + + // ── Step 4: Create GameObjects ──────────────────────────────────── + CreatePlayer(); + CreateInputSystem(); + CreateWorldManager(); + CreateDayNightCycle(); + CreateCombatSystem(); + CreateAudio(); + CreateHUD(); + CreateEventSystem(); + + // ── Step 5: Finalize ────────────────────────────────────────────── + FixEventSystem(); + EnsureGround(); + EnsurePlayerMesh(); + EnsureCinemachineCamera(); + PositionPlayer(); + + // ── Step 6: Wire references ─────────────────────────────────────── + WireReferences(); + + // ── Step 7: Enemy ───────────────────────────────────────────────── + SpawnAshWolf(); + + // ── Step 8: NavMesh ─────────────────────────────────────────────── + BakeNavMesh(); + + EditorSceneManager.SaveScene(scene, GameScene); + Debug.Log("[FenrirSetup] ✓ EmberForest scene ready."); + } + + // ── Create GameObjects ──────────────────────────────────────────────── + + private static void CreatePlayer() + { + GameObject p = GetOrCreate("Player"); + p.tag = "Player"; + EnsureComponent(p); + EnsureComponent(p); + EnsureComponent(p); + EnsureComponent(p); + EnsureComponent(p); + EnsureComponent(p); + EnsureComponent(p); + } + + private static void CreateInputSystem() + { + GameObject go = GetOrCreate("InputSystem"); + EnsureComponent(go); + EnsureComponent(go); + EnsureComponent(go); + } + + private static void CreateWorldManager() + { + GameObject go = GetOrCreate("WorldManager"); + EnsureComponent(go); + EnsureComponent(go); + } + + private static void CreateDayNightCycle() + { + GameObject go = GetOrCreate("DayNightCycle"); + EnsureComponent(go); + } + + private static void CreateCombatSystem() + { + GameObject go = GetOrCreate("CombatSystem"); + EnsureComponent(go); + EnsureComponent(go); + } + + private static void CreateAudio() + { + GameObject go = GetOrCreate("AudioManager"); + EnsureComponent(go); + EnsureComponent(go); + EnsureComponent(go); + } + + private static void CreateHUD() + { + GameObject go = GetOrCreate("HUD"); + if (go.GetComponent() == null) + { + Canvas c = go.AddComponent(); + c.renderMode = RenderMode.ScreenSpaceOverlay; + go.AddComponent(); + go.AddComponent(); + } + EnsureComponent(go); + EnsureComponent(go); + EnsureComponent(go); + } + + // ── Finalize ────────────────────────────────────────────────────────── + + private static void FixEventSystem() + { + GameObject es = GameObject.Find("EventSystem"); + if (es == null) return; + var old = es.GetComponent(); + if (old != null) Object.DestroyImmediate(old); + EnsureComponent(es); + } + + private static void EnsureGround() + { + if (GameObject.Find("Ground") != null) return; + GameObject g = GameObject.CreatePrimitive(PrimitiveType.Plane); + g.name = "Ground"; + g.transform.localScale = new Vector3(20f, 1f, 20f); + } + + private static void EnsurePlayerMesh() + { + GameObject player = GameObject.Find("Player"); + if (player == null || player.GetComponentInChildren() != null) return; + + GameObject body = GameObject.CreatePrimitive(PrimitiveType.Capsule); + body.name = "Mesh"; + body.transform.SetParent(player.transform); + body.transform.localPosition = new Vector3(0f, 1f, 0f); + Object.DestroyImmediate(body.GetComponent()); + + GameObject arrow = GameObject.CreatePrimitive(PrimitiveType.Cube); + arrow.name = "ForwardArrow"; + arrow.transform.SetParent(player.transform); + arrow.transform.localPosition = new Vector3(0f, 1f, 0.65f); + arrow.transform.localScale = new Vector3(0.15f, 0.15f, 0.4f); + Object.DestroyImmediate(arrow.GetComponent()); + + if (player.transform.Find("CameraFollowTarget") == null) + { + GameObject t = new("CameraFollowTarget"); + t.transform.SetParent(player.transform); + t.transform.localPosition = new Vector3(0f, 1.6f, 0f); + } + } + + private static void EnsureCinemachineCamera() + { + if (GameObject.Find("CM FreeLook") != null) return; + + GameObject player = GameObject.Find("Player"); + if (player == null) return; + Transform follow = player.transform.Find("CameraFollowTarget"); + if (follow == null) return; + + Camera mainCam = Camera.main; + if (mainCam != null) EnsureComponent(mainCam.gameObject); + + GameObject camGo = new("CM FreeLook"); + camGo.transform.position = new Vector3(0f, 3f, -6f); + + CinemachineCamera vcam = camGo.AddComponent(); + vcam.Follow = follow; + vcam.LookAt = follow; + vcam.Priority = new PrioritySettings { Value = 10 }; + + CinemachineOrbitalFollow orb = camGo.AddComponent(); + orb.OrbitStyle = CinemachineOrbitalFollow.OrbitStyles.Sphere; + orb.Radius = 5f; + orb.VerticalAxis.Value = 15f; + + camGo.AddComponent(); + } + + private static void PositionPlayer() + { + GameObject player = GameObject.Find("Player"); + if (player != null && player.transform.position.y <= 0f) + player.transform.position = new Vector3(0f, 0.1f, 0f); + } + + // ── Wire references ─────────────────────────────────────────────────── + + private static void WireReferences() + { + GameObject playerGo = GameObject.Find("Player"); + GameObject inputGo = GameObject.Find("InputSystem"); + GameObject worldGo = GameObject.Find("WorldManager"); + GameObject dnGo = GameObject.Find("DayNightCycle"); + GameObject audioGo = GameObject.Find("AudioManager"); + GameObject hudGo = GameObject.Find("HUD"); + GameObject lightGo = GameObject.Find("Directional Light"); + + if (playerGo == null || inputGo == null) return; + + TouchMapper mapper = inputGo.GetComponent(); + GestureRecognizer gesture = inputGo.GetComponent(); + InputHandler handler = inputGo.GetComponent(); + DayNightCycle dn = dnGo?.GetComponent(); + WorldManager wm = worldGo?.GetComponent(); + AudioManager audio = audioGo?.GetComponent(); + MusicLayer music = audioGo?.GetComponent(); + SFXPool sfx = audioGo?.GetComponent(); + HUD hud = hudGo?.GetComponent(); + EnergyBar bar = hudGo?.GetComponent(); + JournalController journal = hudGo?.GetComponent(); + Light light = lightGo?.GetComponent(); + + SetRef(mapper, "_controller", playerGo.GetComponent()); + SetRef(mapper, "_combat", playerGo.GetComponent()); + SetRef(gesture, "_mapper", mapper); + SetRef(handler, "_gesture", gesture); + SetRef(handler, "_mapper", mapper); + SetRef(dn, "_directionalLight", light); + SetRef(wm, "_dayNight", dn); + SetRef(audio, "_musicLayer", music); + SetRef(audio, "_sfxPool", sfx); + SetRef(hud, "_health", playerGo.GetComponent()); + SetRef(bar, "_energy", playerGo.GetComponent()); + SetRef(journal, "_hud", hud); + } + + // ── Enemy spawn ─────────────────────────────────────────────────────── + + private static void SpawnAshWolf() + { + // Skip if already spawned + if (GameObject.Find("AshWolf") != null) return; + + FenrirEditorUtils.EnsureTag("Enemy"); + + GameObject go = GameObject.CreatePrimitive(PrimitiveType.Capsule); + go.name = "AshWolf"; + go.tag = "Enemy"; + go.transform.position = new Vector3(5f, 0.1f, 5f); + + Shader urpLit = Shader.Find("Universal Render Pipeline/Lit"); + if (urpLit != null) + { + var mat = new Material(urpLit) { color = new Color(0.8f, 0.2f, 0.1f) }; + go.GetComponent().sharedMaterial = mat; + } + + UnityEngine.AI.NavMeshAgent agent = go.AddComponent(); + agent.speed = 4.5f; + agent.stoppingDistance = 1.4f; + agent.radius = 0.4f; + agent.height = 2f; + + Fenrir.Entities.Enemies.EnemyHealth health = go.AddComponent(); + Fenrir.Entities.Enemies.EnemyCombat combat = go.AddComponent(); + Fenrir.Entities.Enemies.EnemyAI ai = go.AddComponent(); + go.AddComponent(); + go.AddComponent(); + + WriteFloat(health, "_maxHp", 80f); + WriteFloat(combat, "_attackDamage", 12f); + WriteFloat(ai, "_detectionRange", 8f); + WriteFloat(ai, "_attackRange", 1.8f); + + Debug.Log("[FenrirSetup] ✓ Ash Wolf spawned."); + } + + // ── NavMesh ─────────────────────────────────────────────────────────── + + private static void BakeNavMesh() + { + GameObject ground = GameObject.Find("Ground"); + if (ground == null) { Debug.LogWarning("[FenrirSetup] Ground not found — NavMesh skipped."); return; } + + NavMeshSurface surface = ground.GetComponent() + ?? ground.AddComponent(); + + surface.collectObjects = CollectObjects.All; + surface.useGeometry = NavMeshCollectGeometry.PhysicsColliders; + surface.BuildNavMesh(); + + Debug.Log("[FenrirSetup] ✓ NavMesh baked."); + } + + // ── Build Settings ──────────────────────────────────────────────────── + + private static void SetBuildSettings() + { + EditorBuildSettings.scenes = new[] + { + new EditorBuildSettingsScene(BootstrapScene, true), + new EditorBuildSettingsScene(AwakeningScene, true), + new EditorBuildSettingsScene(GameScene, true), + }; + } + + // ═════════════════════════════════════════════════════════════════════ + // Shared helpers + // ═════════════════════════════════════════════════════════════════════ + + private static GameObject GetOrCreate(string name) + { + return GameObject.Find(name) ?? new GameObject(name); + } + + private static T EnsureComponent(GameObject go) where T : Component + { + return go.GetComponent() ?? go.AddComponent(); + } + + private static void EnsureChild(GameObject parent, string childName) + { + if (parent.transform.Find(childName) != null) return; + GameObject child = new(childName); + child.transform.SetParent(parent.transform); + child.SetActive(false); + } + + private static void CreateEventSystem() + { + if (GameObject.Find("EventSystem") != null) return; + GameObject es = new("EventSystem"); + es.AddComponent(); + es.AddComponent(); + } + + private static void SetRef(Object target, string field, Object value) + { + if (target == null || value == null) return; + SerializedObject so = new(target); + SerializedProperty sp = so.FindProperty(field); + if (sp == null) { Debug.LogWarning($"[FenrirSetup] Field '{field}' not found on {target.GetType().Name}"); return; } + sp.objectReferenceValue = value; + so.ApplyModifiedPropertiesWithoutUndo(); + } + + private static void WriteFloat(Component target, string field, float value) + { + SerializedObject so = new(target); + SerializedProperty sp = so.FindProperty(field); + if (sp == null) { Debug.LogWarning($"[FenrirSetup] Field '{field}' not found on {target.GetType().Name}"); return; } + sp.floatValue = value; + so.ApplyModifiedPropertiesWithoutUndo(); + } + } +} diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirWireReferences.cs b/src/ProjectFenrir/Assets/_Project/Editor/FenrirWireReferences.cs deleted file mode 100644 index bd2ebd2..0000000 --- a/src/ProjectFenrir/Assets/_Project/Editor/FenrirWireReferences.cs +++ /dev/null @@ -1,141 +0,0 @@ -#if UNITY_EDITOR -// Editor/FenrirWireReferences.cs -// Run once via: Fenrir → Wire Scene References -// Opens EmberForest, wires all serialized cross-component references, saves. - -using UnityEditor; -using UnityEditor.SceneManagement; -using UnityEngine; -using UnityEngine.Rendering; - -using Fenrir.Audio; -using Fenrir.Combat; -using Fenrir.Entities.Player; -using Fenrir.Input; -using Fenrir.UI; -using Fenrir.World; - -namespace Fenrir.Editor -{ - public static class FenrirWireReferences - { - [MenuItem("Fenrir/Wire Scene References")] - public static void WireAll() - { - WireEmberForest(); - Debug.Log("[FenrirWireReferences] ✓ All references wired."); - } - - private static void WireEmberForest() - { - const string scenePath = "Assets/_Project/Scenes/EmberForest.unity"; - var scene = EditorSceneManager.OpenScene(scenePath, OpenSceneMode.Single); - - // ── Find GameObjects ────────────────────────────────────────────── - var playerGo = GameObject.Find("Player"); - var inputGo = GameObject.Find("InputSystem"); - var worldGo = GameObject.Find("WorldManager"); - var dnGo = GameObject.Find("DayNightCycle"); - var audioGo = GameObject.Find("AudioManager"); - var hudGo = GameObject.Find("HUD"); - var dirLight = GameObject.Find("Directional Light"); - - if (playerGo == null || inputGo == null || dnGo == null) - { - Debug.LogError("[FenrirWireReferences] Could not find required GameObjects. Run Setup Scenes first."); - return; - } - - // ── Get Components ──────────────────────────────────────────────── - var playerController = playerGo.GetComponent(); - var playerCombat = playerGo.GetComponent(); - var playerHealth = playerGo.GetComponent(); - var playerEnergy = playerGo.GetComponent(); - - var touchMapper = inputGo.GetComponent(); - var gestureRecog = inputGo.GetComponent(); - var inputHandler = inputGo.GetComponent(); - - var worldManager = worldGo?.GetComponent(); - var dayNight = dnGo.GetComponent(); - - var audioManager = audioGo?.GetComponent(); - var musicLayer = audioGo?.GetComponent(); - var sfxPool = audioGo?.GetComponent(); - - var hud = hudGo?.GetComponent(); - var energyBar = hudGo?.GetComponent(); - var journal = hudGo?.GetComponent(); - - var light = dirLight?.GetComponent(); - - // ── Wire References ─────────────────────────────────────────────── - - // TouchMapper → Player - if (touchMapper != null) - { - SetField(touchMapper, "_controller", playerController); - SetField(touchMapper, "_combat", playerCombat); - } - - // GestureRecognizer → TouchMapper - if (gestureRecog != null) - SetField(gestureRecog, "_mapper", touchMapper); - - // InputHandler → GestureRecognizer + TouchMapper - if (inputHandler != null) - { - SetField(inputHandler, "_gesture", gestureRecog); - SetField(inputHandler, "_mapper", touchMapper); - } - - // DayNightCycle → Directional Light - if (dayNight != null && light != null) - SetField(dayNight, "_directionalLight", light); - - // WorldManager → DayNightCycle - if (worldManager != null) - SetField(worldManager, "_dayNight", dayNight); - - // AudioManager → MusicLayer + SFXPool - if (audioManager != null) - { - SetField(audioManager, "_musicLayer", musicLayer); - SetField(audioManager, "_sfxPool", sfxPool); - } - - // HUD → PlayerHealth - if (hud != null) - SetField(hud, "_health", playerHealth); - - // EnergyBar → PlayerEnergy - if (energyBar != null) - SetField(energyBar, "_energy", playerEnergy); - - // JournalController → HUD - if (journal != null) - SetField(journal, "_hud", hud); - - EditorSceneManager.SaveScene(scene); - Debug.Log("[FenrirWireReferences] ✓ EmberForest references wired and saved."); - } - - // ── Helper ──────────────────────────────────────────────────────────── - - private static void SetField(Object target, string fieldName, Object value) - { - var so = new SerializedObject(target); - var prop = so.FindProperty(fieldName); - if (prop != null) - { - prop.objectReferenceValue = value; - so.ApplyModifiedPropertiesWithoutUndo(); - } - else - { - Debug.LogWarning($"[FenrirWireReferences] Field '{fieldName}' not found on {target.GetType().Name}"); - } - } - } -} -#endif diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirWireReferences.cs.meta b/src/ProjectFenrir/Assets/_Project/Editor/FenrirWireReferences.cs.meta deleted file mode 100644 index edb6699..0000000 --- a/src/ProjectFenrir/Assets/_Project/Editor/FenrirWireReferences.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 5c647960f00e44ccf81afb45683bbcc2 \ No newline at end of file From b777fb2c90b2e88b005d4b8c3b521245e95d42dd Mon Sep 17 00:00:00 2001 From: Seni Date: Wed, 3 Jun 2026 09:22:06 -0700 Subject: [PATCH 20/27] fix(ci): skip Unity build gracefully when license secrets missing, fix Unity version 6000.4.9f1 --- .github/workflows/ci.yml | 72 ++++++++++++++++++++++++++++------------ 1 file changed, 50 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3bab1ba..af00198 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ on: branches: [main, develop] jobs: - # ── Markdown lint ──────────────────────────────────────────────────────────── + # ── Markdown lint (always runs, no secrets required) ───────────────────────── lint-docs: name: Lint docs runs-on: ubuntu-latest @@ -20,6 +20,15 @@ jobs: - run: markdownlint "**/*.md" --ignore node_modules # ── Unity build + EditMode tests ───────────────────────────────────────────── + # + # Requires three GitHub secrets (Settings → Secrets → Actions): + # UNITY_LICENSE — contents of your Unity_v6.x.alf license file + # UNITY_EMAIL — Unity account email + # UNITY_PASSWORD — Unity account password + # + # When secrets are not configured the job emits a notice and exits 0 + # so the PR is not blocked. Set the secrets to enable full CI. + # ───────────────────────────────────────────────────────────────────────────── unity-build: name: Unity build & tests (Unity 6 LTS) runs-on: ubuntu-latest @@ -30,43 +39,62 @@ jobs: with: lfs: true + # ── Gate: skip remaining steps when license is not configured ───────────── + - name: Check Unity license secret + id: license + env: + UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} + run: | + if [ -z "$UNITY_LICENSE" ]; then + echo "configured=false" >> "$GITHUB_OUTPUT" + echo "::notice title=Unity CI skipped::Add UNITY_LICENSE, UNITY_EMAIL and UNITY_PASSWORD secrets to enable the Unity build. See docs/CI.md." + else + echo "configured=true" >> "$GITHUB_OUTPUT" + fi + + # ── Cache (only useful when license is configured) ──────────────────────── - name: Cache Unity Library + if: steps.license.outputs.configured == 'true' uses: actions/cache@v4 with: path: src/ProjectFenrir/Library - key: ${{ runner.os }}-unity-library-${{ hashFiles('src/ProjectFenrir/Packages/packages-lock.json') }} + key: ${{ runner.os }}-unity-${{ hashFiles('src/ProjectFenrir/Packages/packages-lock.json') }} restore-keys: | - ${{ runner.os }}-unity-library- + ${{ runner.os }}-unity- - - name: Activate & build + # ── Build ───────────────────────────────────────────────────────────────── + - name: Activate & build (iOS) + if: steps.license.outputs.configured == 'true' uses: game-ci/unity-builder@v4 env: - UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} - UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }} - UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} + UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} + UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }} + UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} with: - projectPath: src/ProjectFenrir - unityVersion: 6000.0.40f1 - targetPlatform: iOS - buildName: ProjectFenrir - buildsPath: build + projectPath: src/ProjectFenrir + unityVersion: 6000.4.9f1 + targetPlatform: iOS + buildName: ProjectFenrir + buildsPath: build + # ── EditMode tests ──────────────────────────────────────────────────────── - name: Run EditMode tests + if: steps.license.outputs.configured == 'true' uses: game-ci/unity-test-runner@v4 env: - UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} - UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }} - UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} + UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} + UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }} + UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} with: - projectPath: src/ProjectFenrir - unityVersion: 6000.0.40f1 - testMode: editmode - artifactsPath: test-results + projectPath: src/ProjectFenrir + unityVersion: 6000.4.9f1 + testMode: editmode + artifactsPath: test-results - name: Upload test results + if: steps.license.outputs.configured == 'true' && always() uses: actions/upload-artifact@v4 - if: always() with: - name: test-results - path: test-results + name: test-results + path: test-results retention-days: 14 From 51afaf0dfb68e40829ed7eda75d7451e6ee58a50 Mon Sep 17 00:00:00 2001 From: Seni Date: Wed, 3 Jun 2026 09:53:48 -0700 Subject: [PATCH 21/27] =?UTF-8?q?chore(ci):=20remove=20Unity=20build=20job?= =?UTF-8?q?=20=E2=80=94=20Personal=20license=20activation=20unsupported=20?= =?UTF-8?q?in=20CI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Unity 6 Personal dropped .ulf manual activation and Hub OAuth cannot be scripted. Unity build + EditMode tests run locally via Test Runner. Lint-docs gate remains. Job skeleton preserved in comments for future Pro/serial upgrade path. --- .github/workflows/ci.yml | 84 ++----------------- .gitignore | 1 + .../_Project/Editor/FenrirSetup.cs.meta | 2 + 3 files changed, 11 insertions(+), 76 deletions(-) create mode 100644 src/ProjectFenrir/Assets/_Project/Editor/FenrirSetup.cs.meta diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index af00198..620f1c2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ on: branches: [main, develop] jobs: - # ── Markdown lint (always runs, no secrets required) ───────────────────────── + # ── Markdown lint (always runs) ─────────────────────────────────────────────── lint-docs: name: Lint docs runs-on: ubuntu-latest @@ -21,80 +21,12 @@ jobs: # ── Unity build + EditMode tests ───────────────────────────────────────────── # - # Requires three GitHub secrets (Settings → Secrets → Actions): - # UNITY_LICENSE — contents of your Unity_v6.x.alf license file - # UNITY_EMAIL — Unity account email - # UNITY_PASSWORD — Unity account password + # NOTE: Unity 6 Personal licenses no longer support automated activation. + # Unity dropped the .ulf manual activation and Hub OAuth cannot be scripted. + # Unity build + tests run locally via Window → General → Test Runner → EditMode. # - # When secrets are not configured the job emits a notice and exits 0 - # so the PR is not blocked. Set the secrets to enable full CI. + # To re-enable this job in future (Unity Pro serial or Unity Build Automation): + # 1. Obtain a Unity Pro serial or configure Unity Build Automation + # 2. Add UNITY_LICENSE / UNITY_EMAIL / UNITY_PASSWORD secrets + # 3. Uncomment the unity-build job below # ───────────────────────────────────────────────────────────────────────────── - unity-build: - name: Unity build & tests (Unity 6 LTS) - runs-on: ubuntu-latest - needs: lint-docs - - steps: - - uses: actions/checkout@v4 - with: - lfs: true - - # ── Gate: skip remaining steps when license is not configured ───────────── - - name: Check Unity license secret - id: license - env: - UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} - run: | - if [ -z "$UNITY_LICENSE" ]; then - echo "configured=false" >> "$GITHUB_OUTPUT" - echo "::notice title=Unity CI skipped::Add UNITY_LICENSE, UNITY_EMAIL and UNITY_PASSWORD secrets to enable the Unity build. See docs/CI.md." - else - echo "configured=true" >> "$GITHUB_OUTPUT" - fi - - # ── Cache (only useful when license is configured) ──────────────────────── - - name: Cache Unity Library - if: steps.license.outputs.configured == 'true' - uses: actions/cache@v4 - with: - path: src/ProjectFenrir/Library - key: ${{ runner.os }}-unity-${{ hashFiles('src/ProjectFenrir/Packages/packages-lock.json') }} - restore-keys: | - ${{ runner.os }}-unity- - - # ── Build ───────────────────────────────────────────────────────────────── - - name: Activate & build (iOS) - if: steps.license.outputs.configured == 'true' - uses: game-ci/unity-builder@v4 - env: - UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} - UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }} - UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} - with: - projectPath: src/ProjectFenrir - unityVersion: 6000.4.9f1 - targetPlatform: iOS - buildName: ProjectFenrir - buildsPath: build - - # ── EditMode tests ──────────────────────────────────────────────────────── - - name: Run EditMode tests - if: steps.license.outputs.configured == 'true' - uses: game-ci/unity-test-runner@v4 - env: - UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} - UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }} - UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} - with: - projectPath: src/ProjectFenrir - unityVersion: 6000.4.9f1 - testMode: editmode - artifactsPath: test-results - - - name: Upload test results - if: steps.license.outputs.configured == 'true' && always() - uses: actions/upload-artifact@v4 - with: - name: test-results - path: test-results - retention-days: 14 diff --git a/.gitignore b/.gitignore index 72e1712..8d85189 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,4 @@ DerivedData/ # ─────────────────────────────────────── *.local.json .env +Unity_v6000.4.9f1.alf diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirSetup.cs.meta b/src/ProjectFenrir/Assets/_Project/Editor/FenrirSetup.cs.meta new file mode 100644 index 0000000..f7789c4 --- /dev/null +++ b/src/ProjectFenrir/Assets/_Project/Editor/FenrirSetup.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: deb0c68b053c14c548bb73f6717ce00f \ No newline at end of file From 0507d75701888ea80f3b9016e206ffff75e098e0 Mon Sep 17 00:00:00 2001 From: Seni Date: Wed, 3 Jun 2026 10:08:10 -0700 Subject: [PATCH 22/27] =?UTF-8?q?fix(editor):=20spawn=20AshWolf=20at=2014u?= =?UTF-8?q?=20=E2=80=94=20outside=208f=20detection=20range,=20fix=20NavMes?= =?UTF-8?q?hAgent=20push?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Enemy was spawning at (5,5) — 7.07u from player, inside 8f detection radius. Immediate aggro on frame 1 caused the enemy to run into the player's CharacterController. Moved to (0,0,14) so the player can move freely before engaging. Added LowQuality obstacle avoidance to prevent agent from physically pushing the CharacterController. --- src/ProjectFenrir/Assets/_Project/Editor/FenrirSetup.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirSetup.cs b/src/ProjectFenrir/Assets/_Project/Editor/FenrirSetup.cs index c9f0552..9b00129 100644 --- a/src/ProjectFenrir/Assets/_Project/Editor/FenrirSetup.cs +++ b/src/ProjectFenrir/Assets/_Project/Editor/FenrirSetup.cs @@ -3,6 +3,7 @@ using Unity.AI.Navigation; using Unity.Cinemachine; using UnityEditor; +using UnityEngine.AI; using UnityEditor.SceneManagement; using UnityEngine; using UnityEngine.InputSystem.UI; @@ -354,7 +355,7 @@ private static void SpawnAshWolf() GameObject go = GameObject.CreatePrimitive(PrimitiveType.Capsule); go.name = "AshWolf"; go.tag = "Enemy"; - go.transform.position = new Vector3(5f, 0.1f, 5f); + go.transform.position = new Vector3(0f, 0.1f, 14f); // 14 units away — outside 8f detection range Shader urpLit = Shader.Find("Universal Render Pipeline/Lit"); if (urpLit != null) @@ -368,6 +369,11 @@ private static void SpawnAshWolf() agent.stoppingDistance = 1.4f; agent.radius = 0.4f; agent.height = 2f; + agent.avoidancePriority = 50; + agent.obstacleAvoidanceType = UnityEngine.AI.ObstacleAvoidanceType.LowQualityObstacleAvoidance; + // Prevent the NavMeshAgent from physically pushing the player's CharacterController + agent.updatePosition = true; + agent.updateRotation = true; Fenrir.Entities.Enemies.EnemyHealth health = go.AddComponent(); Fenrir.Entities.Enemies.EnemyCombat combat = go.AddComponent(); From 71f4c258a22f29b3cec008209706c563bada6ef8 Mon Sep 17 00:00:00 2001 From: Seni Date: Wed, 3 Jun 2026 10:23:08 -0700 Subject: [PATCH 23/27] fix(editor): destroy-recreate AshWolf on setup, add Player/Enemy physics layers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit SpawnAshWolf early-return guard was keeping the old (5,5) position across re-runs. Now destroys and recreates every run so position stays in sync. Added EnsureLayer + SetLayerCollision to FenrirEditorUtils. Player and Enemy are on separate physics layers with collision ignored — prevents the NavMeshAgent CapsuleCollider from pushing the CharacterController. --- .../_Project/Editor/FenrirEditorUtils.cs | 53 +++++++++++++++++++ .../Assets/_Project/Editor/FenrirSetup.cs | 27 ++++++---- 2 files changed, 70 insertions(+), 10 deletions(-) diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirEditorUtils.cs b/src/ProjectFenrir/Assets/_Project/Editor/FenrirEditorUtils.cs index dfbe1f8..5d2c31c 100644 --- a/src/ProjectFenrir/Assets/_Project/Editor/FenrirEditorUtils.cs +++ b/src/ProjectFenrir/Assets/_Project/Editor/FenrirEditorUtils.cs @@ -31,5 +31,58 @@ internal static void EnsureTag(string tag) Debug.Log($"[FenrirEditor] Registered tag '{tag}' in TagManager."); } + + /// + /// Adds a user layer to TagManager.asset if not already present. + /// Unity has 32 layers; user layers start at index 8. + /// + internal static void EnsureLayer(string layerName) + { + SerializedObject tagManager = new SerializedObject( + AssetDatabase.LoadAllAssetsAtPath("ProjectSettings/TagManager.asset")[0]); + + // User layers are stored as "User Layer 8" … "User Layer 31" + for (int i = 8; i <= 31; i++) + { + SerializedProperty sp = tagManager.FindProperty($"layers.Array.data[{i}]"); + if (sp == null) continue; + if (sp.stringValue == layerName) return; // already exists + } + + // Find first empty slot + for (int i = 8; i <= 31; i++) + { + SerializedProperty sp = tagManager.FindProperty($"layers.Array.data[{i}]"); + if (sp == null) continue; + if (string.IsNullOrEmpty(sp.stringValue)) + { + sp.stringValue = layerName; + tagManager.ApplyModifiedProperties(); + Debug.Log($"[FenrirEditor] Registered layer '{layerName}' at index {i}."); + return; + } + } + + Debug.LogWarning($"[FenrirEditor] No free layer slot for '{layerName}' — all 32 layers in use."); + } + + /// + /// Sets whether two named layers ignore each other in the Physics collision matrix. + /// Call after EnsureLayer so both layers are registered before reading their indices. + /// + internal static void SetLayerCollision(string layerA, string layerB, bool ignore) + { + int a = LayerMask.NameToLayer(layerA); + int b = LayerMask.NameToLayer(layerB); + + if (a < 0 || b < 0) + { + Debug.LogWarning($"[FenrirEditor] SetLayerCollision: layer '{layerA}' or '{layerB}' not found. Run EnsureLayer first."); + return; + } + + Physics.IgnoreLayerCollision(a, b, ignore); + Debug.Log($"[FenrirEditor] Layer collision {layerA}↔{layerB} ignore={ignore}."); + } } } diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirSetup.cs b/src/ProjectFenrir/Assets/_Project/Editor/FenrirSetup.cs index 9b00129..46db407 100644 --- a/src/ProjectFenrir/Assets/_Project/Editor/FenrirSetup.cs +++ b/src/ProjectFenrir/Assets/_Project/Editor/FenrirSetup.cs @@ -46,10 +46,14 @@ public static class FenrirSetup [MenuItem("Fenrir/Setup Project")] public static void SetupProject() { - // ── 1. Tags ─────────────────────────────────────────────────────── + // ── 1. Tags & Layers ───────────────────────────────────────────── FenrirEditorUtils.EnsureTag("Player"); FenrirEditorUtils.EnsureTag("Enemy"); FenrirEditorUtils.EnsureTag("GameController"); + FenrirEditorUtils.EnsureLayer("Player"); + FenrirEditorUtils.EnsureLayer("Enemy"); + // Player and Enemy layers do not collide — NavMeshAgent must not push CharacterController + FenrirEditorUtils.SetLayerCollision("Player", "Enemy", ignore: true); // ── 2. Bootstrap ────────────────────────────────────────────────── SetupBootstrap(); @@ -162,6 +166,8 @@ private static void CreatePlayer() { GameObject p = GetOrCreate("Player"); p.tag = "Player"; + int playerLayer = LayerMask.NameToLayer("Player"); + if (playerLayer >= 0) p.layer = playerLayer; EnsureComponent(p); EnsureComponent(p); EnsureComponent(p); @@ -347,16 +353,22 @@ private static void WireReferences() private static void SpawnAshWolf() { - // Skip if already spawned - if (GameObject.Find("AshWolf") != null) return; - FenrirEditorUtils.EnsureTag("Enemy"); + // Always destroy and recreate so position/stats stay in sync with this script + GameObject existing = GameObject.Find("AshWolf"); + if (existing != null) + Object.DestroyImmediate(existing); + GameObject go = GameObject.CreatePrimitive(PrimitiveType.Capsule); go.name = "AshWolf"; go.tag = "Enemy"; go.transform.position = new Vector3(0f, 0.1f, 14f); // 14 units away — outside 8f detection range + // Enemy layer — prevents CapsuleCollider from physically pushing player's CharacterController + int enemyLayer = LayerMask.NameToLayer("Enemy"); + if (enemyLayer >= 0) go.layer = enemyLayer; + Shader urpLit = Shader.Find("Universal Render Pipeline/Lit"); if (urpLit != null) { @@ -369,11 +381,6 @@ private static void SpawnAshWolf() agent.stoppingDistance = 1.4f; agent.radius = 0.4f; agent.height = 2f; - agent.avoidancePriority = 50; - agent.obstacleAvoidanceType = UnityEngine.AI.ObstacleAvoidanceType.LowQualityObstacleAvoidance; - // Prevent the NavMeshAgent from physically pushing the player's CharacterController - agent.updatePosition = true; - agent.updateRotation = true; Fenrir.Entities.Enemies.EnemyHealth health = go.AddComponent(); Fenrir.Entities.Enemies.EnemyCombat combat = go.AddComponent(); @@ -386,7 +393,7 @@ private static void SpawnAshWolf() WriteFloat(ai, "_detectionRange", 8f); WriteFloat(ai, "_attackRange", 1.8f); - Debug.Log("[FenrirSetup] ✓ Ash Wolf spawned."); + Debug.Log("[FenrirSetup] ✓ Ash Wolf spawned at (0, 14)."); } // ── NavMesh ─────────────────────────────────────────────────────────── From a3b0764f69462e80df33e92111317c3595ccf8be Mon Sep 17 00:00:00 2001 From: Seni Date: Wed, 3 Jun 2026 10:31:00 -0700 Subject: [PATCH 24/27] fix(editor): revert broken layer setup, fix push via trigger collider Physics.IgnoreLayerCollision called before TagManager refreshes returns layer index -1, throwing ArgumentException. Removed layer machinery. Instead mark the enemy CapsuleCollider as isTrigger=true so the NavMeshAgent never physically pushes the player CharacterController. Hit detection works via trigger overlap, not solid collision. --- .../_Project/Editor/FenrirEditorUtils.cs | 52 ------------------- .../Assets/_Project/Editor/FenrirSetup.cs | 15 ++---- 2 files changed, 5 insertions(+), 62 deletions(-) diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirEditorUtils.cs b/src/ProjectFenrir/Assets/_Project/Editor/FenrirEditorUtils.cs index 5d2c31c..0de96cc 100644 --- a/src/ProjectFenrir/Assets/_Project/Editor/FenrirEditorUtils.cs +++ b/src/ProjectFenrir/Assets/_Project/Editor/FenrirEditorUtils.cs @@ -32,57 +32,5 @@ internal static void EnsureTag(string tag) Debug.Log($"[FenrirEditor] Registered tag '{tag}' in TagManager."); } - /// - /// Adds a user layer to TagManager.asset if not already present. - /// Unity has 32 layers; user layers start at index 8. - /// - internal static void EnsureLayer(string layerName) - { - SerializedObject tagManager = new SerializedObject( - AssetDatabase.LoadAllAssetsAtPath("ProjectSettings/TagManager.asset")[0]); - - // User layers are stored as "User Layer 8" … "User Layer 31" - for (int i = 8; i <= 31; i++) - { - SerializedProperty sp = tagManager.FindProperty($"layers.Array.data[{i}]"); - if (sp == null) continue; - if (sp.stringValue == layerName) return; // already exists - } - - // Find first empty slot - for (int i = 8; i <= 31; i++) - { - SerializedProperty sp = tagManager.FindProperty($"layers.Array.data[{i}]"); - if (sp == null) continue; - if (string.IsNullOrEmpty(sp.stringValue)) - { - sp.stringValue = layerName; - tagManager.ApplyModifiedProperties(); - Debug.Log($"[FenrirEditor] Registered layer '{layerName}' at index {i}."); - return; - } - } - - Debug.LogWarning($"[FenrirEditor] No free layer slot for '{layerName}' — all 32 layers in use."); - } - - /// - /// Sets whether two named layers ignore each other in the Physics collision matrix. - /// Call after EnsureLayer so both layers are registered before reading their indices. - /// - internal static void SetLayerCollision(string layerA, string layerB, bool ignore) - { - int a = LayerMask.NameToLayer(layerA); - int b = LayerMask.NameToLayer(layerB); - - if (a < 0 || b < 0) - { - Debug.LogWarning($"[FenrirEditor] SetLayerCollision: layer '{layerA}' or '{layerB}' not found. Run EnsureLayer first."); - return; - } - - Physics.IgnoreLayerCollision(a, b, ignore); - Debug.Log($"[FenrirEditor] Layer collision {layerA}↔{layerB} ignore={ignore}."); - } } } diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirSetup.cs b/src/ProjectFenrir/Assets/_Project/Editor/FenrirSetup.cs index 46db407..740b399 100644 --- a/src/ProjectFenrir/Assets/_Project/Editor/FenrirSetup.cs +++ b/src/ProjectFenrir/Assets/_Project/Editor/FenrirSetup.cs @@ -46,14 +46,10 @@ public static class FenrirSetup [MenuItem("Fenrir/Setup Project")] public static void SetupProject() { - // ── 1. Tags & Layers ───────────────────────────────────────────── + // ── 1. Tags ─────────────────────────────────────────────────────── FenrirEditorUtils.EnsureTag("Player"); FenrirEditorUtils.EnsureTag("Enemy"); FenrirEditorUtils.EnsureTag("GameController"); - FenrirEditorUtils.EnsureLayer("Player"); - FenrirEditorUtils.EnsureLayer("Enemy"); - // Player and Enemy layers do not collide — NavMeshAgent must not push CharacterController - FenrirEditorUtils.SetLayerCollision("Player", "Enemy", ignore: true); // ── 2. Bootstrap ────────────────────────────────────────────────── SetupBootstrap(); @@ -166,8 +162,6 @@ private static void CreatePlayer() { GameObject p = GetOrCreate("Player"); p.tag = "Player"; - int playerLayer = LayerMask.NameToLayer("Player"); - if (playerLayer >= 0) p.layer = playerLayer; EnsureComponent(p); EnsureComponent(p); EnsureComponent(p); @@ -365,9 +359,10 @@ private static void SpawnAshWolf() go.tag = "Enemy"; go.transform.position = new Vector3(0f, 0.1f, 14f); // 14 units away — outside 8f detection range - // Enemy layer — prevents CapsuleCollider from physically pushing player's CharacterController - int enemyLayer = LayerMask.NameToLayer("Enemy"); - if (enemyLayer >= 0) go.layer = enemyLayer; + // Make the primitive collider a trigger so the NavMeshAgent never physically pushes + // the player's CharacterController. Hit detection uses trigger overlap, not solid collision. + CapsuleCollider col = go.GetComponent(); + if (col != null) col.isTrigger = true; Shader urpLit = Shader.Find("Universal Render Pipeline/Lit"); if (urpLit != null) From 50cea6198be0c2a4af3e494f3ff2c7d230db40ef Mon Sep 17 00:00:00 2001 From: Seni Date: Wed, 3 Jun 2026 10:38:26 -0700 Subject: [PATCH 25/27] fix(editor): auto-restore URP pipeline asset in Setup Project MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Library wipe disconnects Graphics Settings from Mobile_RPAsset, causing 999+ shader-not-found errors and a black scene. EnsureURPAsset() now reassigns it as step 0 of Setup Project so it self-heals without manual intervention in Project Settings → Graphics. --- .../Assets/_Project/Editor/FenrirSetup.cs | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/src/ProjectFenrir/Assets/_Project/Editor/FenrirSetup.cs b/src/ProjectFenrir/Assets/_Project/Editor/FenrirSetup.cs index 740b399..5605425 100644 --- a/src/ProjectFenrir/Assets/_Project/Editor/FenrirSetup.cs +++ b/src/ProjectFenrir/Assets/_Project/Editor/FenrirSetup.cs @@ -7,6 +7,7 @@ using UnityEditor.SceneManagement; using UnityEngine; using UnityEngine.InputSystem.UI; +using UnityEngine.Rendering; using Fenrir.Audio; using Fenrir.Awakening; @@ -46,6 +47,9 @@ public static class FenrirSetup [MenuItem("Fenrir/Setup Project")] public static void SetupProject() { + // ── 0. URP pipeline asset ───────────────────────────────────────── + EnsureURPAsset(); + // ── 1. Tags ─────────────────────────────────────────────────────── FenrirEditorUtils.EnsureTag("Player"); FenrirEditorUtils.EnsureTag("Enemy"); @@ -408,6 +412,31 @@ private static void BakeNavMesh() Debug.Log("[FenrirSetup] ✓ NavMesh baked."); } + // ── URP pipeline ────────────────────────────────────────────────────── + + /// + /// Ensures Graphics Settings points to Mobile_RPAsset. + /// After a Library wipe the Scriptable Render Pipeline field goes blank; + /// this repairs it so the scene renders correctly without manual steps. + /// + private static void EnsureURPAsset() + { + const string AssetPath = "Assets/Settings/Mobile_RPAsset.asset"; + RenderPipelineAsset rpa = AssetDatabase.LoadAssetAtPath(AssetPath); + if (rpa == null) + { + Debug.LogWarning($"[FenrirSetup] URP asset not found at {AssetPath} — skipping."); + return; + } + + if (GraphicsSettings.defaultRenderPipeline == rpa) return; + + GraphicsSettings.defaultRenderPipeline = rpa; + EditorUtility.SetDirty(GraphicsSettings.defaultRenderPipeline); + AssetDatabase.SaveAssets(); + Debug.Log("[FenrirSetup] ✓ URP pipeline asset assigned."); + } + // ── Build Settings ──────────────────────────────────────────────────── private static void SetBuildSettings() From 855b2a22055f8d9f49e425de0bd422ecd005780a Mon Sep 17 00:00:00 2001 From: Seni Date: Thu, 11 Jun 2026 18:18:26 -0700 Subject: [PATCH 26/27] chore(repo): gitignore Unity crash artifacts, remove recovery leftovers --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index 8d85189..2312c69 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,8 @@ DerivedData/ *.local.json .env Unity_v6000.4.9f1.alf + +# Unity crash artifacts +mono_crash.*.json +**/Assets/_Recovery/ +**/Assets/_Recovery.meta From 6f72b7f0d612ca17a0f6ad0a739cf7405ae6596f Mon Sep 17 00:00:00 2001 From: Seni Date: Thu, 11 Jun 2026 18:19:13 -0700 Subject: [PATCH 27/27] =?UTF-8?q?feat(scenes):=20save=20Setup=20Project=20?= =?UTF-8?q?output=20=E2=80=94=20wired=20scenes,=20Player/Enemy/GameControl?= =?UTF-8?q?ler=20tags?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/_Project/Scenes/Awakening.unity | 1 - .../Assets/_Project/Scenes/Bootstrap.unity | 100 +++++++++++++++++- .../Assets/_Project/Scenes/EmberForest.unity | Bin 48419 -> 127924 bytes .../ProjectSettings/TagManager.asset | 32 ++---- 4 files changed, 103 insertions(+), 30 deletions(-) diff --git a/src/ProjectFenrir/Assets/_Project/Scenes/Awakening.unity b/src/ProjectFenrir/Assets/_Project/Scenes/Awakening.unity index 88a1e90..b49de29 100644 --- a/src/ProjectFenrir/Assets/_Project/Scenes/Awakening.unity +++ b/src/ProjectFenrir/Assets/_Project/Scenes/Awakening.unity @@ -429,7 +429,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 45ba041f54cef4e708961f90b03e29ea, type: 3} m_Name: m_EditorClassIdentifier: Fenrir.Runtime::Fenrir.Awakening.AwakeningSequencer - _gameScene: EmberForest _characterCreationPanel: {fileID: 0} _elementRevealPanel: {fileID: 0} _loadingPanel: {fileID: 0} diff --git a/src/ProjectFenrir/Assets/_Project/Scenes/Bootstrap.unity b/src/ProjectFenrir/Assets/_Project/Scenes/Bootstrap.unity index 76c0e6c..19bfcea 100644 --- a/src/ProjectFenrir/Assets/_Project/Scenes/Bootstrap.unity +++ b/src/ProjectFenrir/Assets/_Project/Scenes/Bootstrap.unity @@ -119,6 +119,76 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &1054001086 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1054001090} + - component: {fileID: 1054001089} + - component: {fileID: 1054001088} + - component: {fileID: 1054001087} + m_Layer: 0 + m_Name: FenrirManager + m_TagString: GameController + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1054001087 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1054001086} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0370b35fac4624423839f6d8bf9ef882, type: 3} + m_Name: + m_EditorClassIdentifier: Fenrir.Runtime::Fenrir.Core.Bootstrap +--- !u!114 &1054001088 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1054001086} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b5b1474a1c6fa4a3785b77a68b50464d, type: 3} + m_Name: + m_EditorClassIdentifier: Fenrir.Runtime::Fenrir.Core.GameLoop +--- !u!114 &1054001089 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1054001086} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 25a3841cdf5d44debb5ce21706f17be7, type: 3} + m_Name: + m_EditorClassIdentifier: Fenrir.Runtime::Fenrir.StateMachine.AppStateMachine +--- !u!4 &1054001090 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1054001086} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1472117037 GameObject: m_ObjectHideFlags: 0 @@ -197,6 +267,8 @@ GameObject: m_Component: - component: {fileID: 1825290731} - component: {fileID: 1825290730} + - component: {fileID: 1825290733} + - component: {fileID: 1825290732} m_Layer: 0 m_Name: Bootstrap m_TagString: Untagged @@ -216,9 +288,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0370b35fac4624423839f6d8bf9ef882, type: 3} m_Name: m_EditorClassIdentifier: Fenrir.Runtime::Fenrir.Core.Bootstrap - _mainMenuScene: MainMenu - _awakeningScene: Awakening - _gameScene: EmberForest --- !u!4 &1825290731 Transform: m_ObjectHideFlags: 0 @@ -234,9 +303,34 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1825290732 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1825290729} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b5b1474a1c6fa4a3785b77a68b50464d, type: 3} + m_Name: + m_EditorClassIdentifier: Fenrir.Runtime::Fenrir.Core.GameLoop +--- !u!114 &1825290733 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1825290729} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 25a3841cdf5d44debb5ce21706f17be7, type: 3} + m_Name: + m_EditorClassIdentifier: Fenrir.Runtime::Fenrir.StateMachine.AppStateMachine --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 1825290731} - {fileID: 1472117040} + - {fileID: 1054001090} diff --git a/src/ProjectFenrir/Assets/_Project/Scenes/EmberForest.unity b/src/ProjectFenrir/Assets/_Project/Scenes/EmberForest.unity index 3d2031ef0d4be0cdb55c12331a68d2ccc1a95050..15b9fbe328fd299a7860d8362abb932cb17efa0c 100644 GIT binary patch literal 127924 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 D+-UoR literal 48419 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 NeFP+l;}M*6{vQoaWvKuF diff --git a/src/ProjectFenrir/ProjectSettings/TagManager.asset b/src/ProjectFenrir/ProjectSettings/TagManager.asset index 6413d11..a6039c7 100644 --- a/src/ProjectFenrir/ProjectSettings/TagManager.asset +++ b/src/ProjectFenrir/ProjectSettings/TagManager.asset @@ -2,8 +2,11 @@ %TAG !u! tag:unity3d.com,2011: --- !u!78 &1 TagManager: - serializedVersion: 2 - tags: [] + serializedVersion: 3 + tags: + - Player + - Enemy + - GameController layers: - Default - TransparentFX @@ -50,27 +53,4 @@ TagManager: - Light Layer 5 - Light Layer 6 - Light Layer 7 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + m_MigratedRenderPipelines: []