Merge pull request #214 from Re-G3X/refactor/profile-analyst/move-scripts

Move scripts related to PlayerProfileAnalyst

Author: Tyago-Teoi

Assets/PlatformGameAssets/Scenes/PlatformMain.unity

@@ -3,14 +3,14 @@
 using Game.GameManager;
 using Game.GameManager.Player;
 using Game.LevelManager.DungeonManager;
-using Game.NarrativeGenerator;
 using Game.NarrativeGenerator.Quests;
 using Game.NarrativeGenerator.Quests.QuestGrammarTerminals;
 using Game.NPCs;
 using Game.Quests;
 using System;
 using UnityEngine;
 using Overlord.ProfileAnalyst;
+using Topdown.Overlord.NarrativeGenerator;
 
 namespace Game.DataCollection
 {
@@ -44,7 +44,7 @@ private void OnEnable()
             DungeonPlayer.ExitRoomEventHandler += OnRoomExit;
             QuestLine.QuestCompletedEventHandler += OnQuestEvent;
             // QuestLine.QuestLineOpenedEventHandler += OnQuestlineOpenedEvent;
-            QuestGeneratorManager.FixedLevelProfileEventHandler += OnLevelWithFixedProfileCreated;
+            TopdownQuestGeneratorManager.FixedLevelProfileEventHandler += OnLevelWithFixedProfileCreated;
         }
 
         private void OnDisable()
@@ -67,7 +67,7 @@ private void OnDisable()
             DungeonPlayer.ExitRoomEventHandler -= OnRoomExit;
             QuestLine.QuestCompletedEventHandler -= OnQuestEvent;
             // QuestLine.QuestLineOpenedEventHandler -= OnQuestlineOpenedEvent;
-            QuestGeneratorManager.FixedLevelProfileEventHandler -= OnLevelWithFixedProfileCreated;
+            TopdownQuestGeneratorManager.FixedLevelProfileEventHandler -= OnLevelWithFixedProfileCreated;
         }
 
         private void OnPlayerDamage(object sender, PlayerIsDamagedEventArgs eventArgs)

Assets/Prefabs/ContentGenerator.prefab

@@ -6,15 +6,15 @@
 using Game.LevelManager.DungeonManager;
 using Game.LevelSelection;
 using Game.MenuManager;
-using Game.NarrativeGenerator;
+using Topdown.Overlord.NarrativeGenerator;
 using Game.NarrativeGenerator.Quests;
 using Game.NarrativeGenerator.Quests.QuestGrammarTerminals;
 using Game.Quests;
 using Game.SaveLoadSystem;
 using Game.NPCs;
 using System;
 using UnityEngine;
-using Overlord.ProfileAnalyst;
+using Topdown.Overlord.ProfileAnalyst;
 
 namespace Game.DataCollection
 {
@@ -41,7 +41,7 @@ private void OnEnable()
             NpcController.KeyCollectEventHandler += OnGetKey;
             EnemyController.KillEnemyEventHandler += OnKillEnemy;
             NpcController.NpcInteraction += OnInteractNPC;
-            QuestGeneratorManager.ProfileSelectedEventHandler += OnProfileSelected;
+            TopdownQuestGeneratorManager.ProfileSelectedEventHandler += OnProfileSelected;
             ExperimentController.ProfileSelectedEventHandler += OnExperimentProfileSelected;
             FormBhv.PreTestFormQuestionAnsweredEventHandler += OnPreTestFormAnswered;
             RealTimeLevelSelectManager.PreTestFormQuestionAnsweredEventHandler += OnPreTestFormAnswered;
@@ -53,7 +53,7 @@ private void OnEnable()
             FormBhv.PostTestFormQuestionAnsweredEventHandler += OnPostTestFormAnswered;
             QuestLine.QuestCompletedEventHandler += OnQuestEvent;
             QuestLine.QuestLineOpenedEventHandler += OnQuestlineOpenedEvent;
-            PlayerProfileManager.GameplayProfileSelectedEventHandler += OnPlayerProfileUpdated;
+            TopdownPlayerProfileManager.GameplayProfileSelectedEventHandler += OnPlayerProfileUpdated;
         }
 
         private void OnDisable()
@@ -73,7 +73,7 @@ private void OnDisable()
             FormBhv.PreTestFormQuestionAnsweredEventHandler -= OnPreTestFormAnswered;
             RealTimeLevelSelectManager.PreTestFormQuestionAnsweredEventHandler -= OnPreTestFormAnswered;
             DoorBhv.KeyUsedEventHandler -= OnKeyUsed;
-            QuestGeneratorManager.ProfileSelectedEventHandler -= OnProfileSelected;
+            TopdownQuestGeneratorManager.ProfileSelectedEventHandler -= OnProfileSelected;
             ExperimentController.ProfileSelectedEventHandler -= OnExperimentProfileSelected;
             EnemyController.KillEnemyEventHandler -= OnKillEnemy;
             NpcController.NpcInteraction -= OnInteractNPC;
@@ -82,7 +82,7 @@ private void OnDisable()
             FormBhv.PostTestFormQuestionAnsweredEventHandler -= OnPostTestFormAnswered;
             QuestLine.QuestCompletedEventHandler -= OnQuestEvent;
             QuestLine.QuestLineOpenedEventHandler -= OnQuestlineOpenedEvent;
-            PlayerProfileManager.GameplayProfileSelectedEventHandler -= OnPlayerProfileUpdated;
+            TopdownPlayerProfileManager.GameplayProfileSelectedEventHandler -= OnPlayerProfileUpdated;
         }
 
         private void Awake()

Assets/Scenes/Main.unity

@@ -1,15 +1,13 @@
 using MyBox;
 using ScriptableObjects;
 using System.Collections.Generic;
-using UnityEngine;
-using Overlord.GenerationController.Facade;
-using System.Linq;
+using Overlord.RulesGenerator.EnemyGeneration;
 
-namespace Overlord.RulesGenerator.EnemyGeneration
+namespace Topdown.Overlord.RulesGenerator.EnemyGeneration
 {
     public class TopdownEnemyGeneratorManager : EnemyGeneratorManager
     {
-        public static TopdownEnemyGeneratorManager Instance { get; private set; } = null;
+        public static new TopdownEnemyGeneratorManager Instance { get; private set; } = null;
 
         private void Awake()
         {

Assets/Scripts/Game/DataCollection/DungeonDataController.cs

@@ -16,6 +16,7 @@
 using UnityEngine.SceneManagement;
 using Util;
 using Overlord.RulesGenerator.EnemyGeneration;
+using Topdown.Overlord.RulesGenerator.EnemyGeneration;
 
 namespace Game.ExperimentControllers
 {