Move Narrative and Quest Generation Scripts to Overlord Assembly

Assets/Scripts/Game/DataCollection/DungeonDataController.cs

@@ -11,6 +11,7 @@
 using UnityEngine;
 using Overlord.ProfileAnalyst;
 using Topdown.Overlord.NarrativeGenerator;
+using Overlord.NarrativeGenerator.Quests.QuestGrammarTerminals;
 
 namespace Game.DataCollection
 {

Assets/Scripts/Game/DataCollection/PlayerDataController.cs

@@ -1,4 +1,4 @@
-using Game.Dialogues;
+using Overlord.NarrativeGenerator.Quests;
 using Game.Events;
 using Game.GameManager;
 using Game.GameManager.Player;
@@ -15,6 +15,7 @@
 using System;
 using UnityEngine;
 using Topdown.Overlord.ProfileAnalyst;
+using Overlord.NarrativeGenerator.Quests.QuestGrammarTerminals;
 
 namespace Game.DataCollection
 {

Assets/Scripts/Game/DataCollection/RoomData.cs

@@ -1,4 +1,4 @@
-using Game.EnemyManager;
+using Overlord.NarrativeGenerator.EnemyRelatedNarrative;
 using Game.LevelManager;
 using System;
 using UnityEditor;

Assets/Scripts/Game/Dialogues/Quest/QuestDialogueInteraction.cs

@@ -8,6 +8,7 @@
 using Game.Quests;
 using UnityEngine;
 using ScriptableObjects;
+using Overlord.NarrativeGenerator.Quests;
 
 #if UNITY_EDITOR
 using MyBox;

Assets/Scripts/Game/Events/EnterRoomEvent.cs

@@ -1,5 +1,5 @@
 using Game.DataCollection;
-using Game.EnemyManager;
+using Overlord.NarrativeGenerator.EnemyRelatedNarrative;
 using Game.LevelManager;
 using System;
 using UnityEngine;

Assets/Scripts/Game/Events/NPCDialogue/ItemTradeEventArgs.cs

@@ -1,4 +1,4 @@
-using Game.NarrativeGenerator.ItemRelatedNarrative;
+using Overlord.NarrativeGenerator.ItemRelatedNarrative;
 using ScriptableObjects;
 
 namespace Game.Events

Assets/Scripts/Game/ExperimentControllers/ArenaController.cs

@@ -4,9 +4,9 @@
 using Game.LevelManager;
 using Game.LevelManager.DungeonLoader;
 using Game.LevelManager.DungeonManager;
-using Game.NarrativeGenerator.EnemyRelatedNarrative;
-using Game.NarrativeGenerator.ItemRelatedNarrative;
-using Game.NarrativeGenerator.Quests;
+using Overlord.NarrativeGenerator.EnemyRelatedNarrative;
+using Overlord.NarrativeGenerator.ItemRelatedNarrative;
+using Overlord.NarrativeGenerator.Quests;
 using Game.NPCs;
 using MyBox;
 using ScriptableObjects;

Assets/Scripts/Game/GameManager/EnemyLoader.cs

@@ -1,7 +1,8 @@
 using Game.EnemyManager;
 using Game.LevelManager.DungeonLoader;
 using Game.Maestro;
-using Game.NarrativeGenerator.EnemyRelatedNarrative;
+using Overlord.NarrativeGenerator.EnemyRelatedNarrative;
+using Overlord.RulesGenerator.EnemyGeneration;
 using Game.NarrativeGenerator.Quests;
 using ScriptableObjects;
 using System;
@@ -17,15 +18,12 @@ namespace Game.GameManager
     [Serializable]
     public class EnemyLoader : MonoBehaviour
     {
-        private static List<EnemySO> _enemyListForCurrentDungeon;
-
         [field: SerializeField] public GameObject EnemyPrefab { get; set; }
         [field: SerializeField] public GameObject BareHandEnemyPrefab { get; set; }
         [field: SerializeField] public GameObject ShooterEnemyPrefab { get; set; }
         [field: SerializeField] public GameObject BomberEnemyPrefab { get; set; }
         [field: SerializeField] public GameObject HealerEnemyPrefab { get; set; }
 
-
         public static void DistributeEnemiesInDungeon(Map map, QuestLineList questLines)
         {
             var enemiesInQuestByType = new EnemiesByType(questLines.EnemyParametersForQuestLines.TotalByType);
@@ -59,20 +57,13 @@ private static EnemiesByType SelectWeaponTypesForRoom(DungeonRoom dungeonRoom, E
 
         public static void LoadEnemies(List<EnemySO> enemyList)
         {
-            _enemyListForCurrentDungeon = EnemySelector.FilterEnemies(enemyList);
+            EnemiesForCurrentDungeon.UpdateEnemiesForCurrentDungeon(enemyList);
             ApplyDelegates();
         }
-
-        public static EnemySO GetRandomEnemyOfType(WeaponTypeSo enemyType)
-        {
-            List<EnemySO> currentEnemies = GetEnemiesFromType(enemyType);
-            Debug.Log("ENEMY COUNT: " + currentEnemies.Count);
-            return currentEnemies[RandomSingleton.GetInstance().Next(0, currentEnemies.Count)];
-        }
-
+
         public GameObject InstantiateEnemyWithType(Vector3 position, Quaternion rotation, WeaponTypeSo enemyType, int questId)
         {
-            EnemySO currentEnemy = GetRandomEnemyOfType(enemyType);
+            EnemySO currentEnemy = EnemiesForCurrentDungeon.GetRandomEnemyOfType(enemyType);
             GameObject enemy;
             if (currentEnemy.weapon.Type == WeaponTypeEnum.BareHand)
             {
@@ -125,18 +116,11 @@ public virtual GameObject InstantiateEnemyFromScriptableObject(Vector3 position,
             return enemy;
         }
 
-        private static List<EnemySO> GetEnemiesFromType(WeaponTypeSo weaponType)
-        {
-            Debug.Log(weaponType.ToString());
-            //TODO create these lists only once per type on dungeon load
-            return _enemyListForCurrentDungeon.Where(enemy => enemy.weapon == weaponType).ToList();
-        }
-
         private static void ApplyDelegates()
         {
-            if (_enemyListForCurrentDungeon != null)
+            if (EnemiesForCurrentDungeon.CurrentEnemies != null)
             {
-                foreach (var movement in _enemyListForCurrentDungeon.Select(x => x.movement))
+                foreach (var movement in EnemiesForCurrentDungeon.CurrentEnemies.Select(x => x.movement))
                 {
                     movement.movementType = GetMovementType(movement.enemyMovementIndex);
                 }

Assets/Scripts/Game/GameManager/Player/InventoryController.cs

@@ -1,6 +1,6 @@
 using Game.Events;
 using Game.LevelManager.DungeonManager;
-using Game.NarrativeGenerator.ItemRelatedNarrative;
+using Overlord.NarrativeGenerator.ItemRelatedNarrative;
 using Game.NPCs;
 using ScriptableObjects;
 using UnityEngine;

Assets/Scripts/Game/Items/ReadableItemController.cs

@@ -1,8 +1,10 @@
+using Fog.Dialogue;
+using Overlord.NarrativeGenerator;
 using ScriptableObjects;
 using System;
-using Fog.Dialogue;
-using Game.GameManager;
+using Topdown.Overlord.NarrativeGenerator;
 using UnityEngine;
+using static Util.Enums;
 
 namespace Game
 {
@@ -13,6 +15,15 @@ public class ReadableItemController : MonoBehaviour
 
         [SerializeField] private QuestDialogueInteraction _questDialogue;
         private ReadableItemSo itemSo;
+        private Language _language;
+
+        private void Awake()
+        {
+            var questGeneratorManager = FindObjectOfType<QuestGeneratorManager>();
+            if (questGeneratorManager == null)
+                questGeneratorManager = FindObjectOfType<TopdownQuestGeneratorManager>();
+            _language = questGeneratorManager.language;
+        }
 
         private void OnEnable()
         {
@@ -27,7 +38,7 @@ private void OnDisable()
         public void SetItemInfo(ReadableItemSo item, int questId)
         {
             _questDialogue.DialogueObj = item;
-            _questDialogue.DialogueLine = item.SetRandomText(GameManagerSingleton.Instance.IsInPortuguese);
+            _questDialogue.DialogueLine = item.SetRandomText(_language);
             _questDialogue.QuestId = questId;
 
             itemSprite.sprite = item.sprite;

Assets/Scripts/Game/LevelGenerator/EvolutionaryAlgorithm/IndividualJsonList.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Game.NarrativeGenerator.Quests.QuestGrammarTerminals;
+using Overlord.NarrativeGenerator.Quests.QuestGrammarTerminals;
 using UnityEngine;
 
 namespace Game.LevelGenerator.EvolutionaryAlgorithm

Assets/Scripts/Game/LevelManager/DungeonLoader/DungeonRoom.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
-using Game.NarrativeGenerator.EnemyRelatedNarrative;
-using Game.NarrativeGenerator.ItemRelatedNarrative;
+using Overlord.NarrativeGenerator.EnemyRelatedNarrative;
+using Overlord.NarrativeGenerator.ItemRelatedNarrative;
 using Game.NPCs;
 using UnityEngine;
 using Util;

Assets/Scripts/Game/LevelManager/DungeonLoader/ItemDispenser.cs

@@ -1,4 +1,4 @@
-using Game.NarrativeGenerator.ItemRelatedNarrative;
+using Overlord.NarrativeGenerator.ItemRelatedNarrative;
 using Unity.Mathematics;
 using Util;
 

Assets/Scripts/Game/LevelManager/DungeonLoader/Map.cs

@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using Game.ExperimentControllers;
 using Game.LevelGenerator.LevelSOs;
-using Game.NarrativeGenerator.ItemRelatedNarrative;
-using Game.NarrativeGenerator.EnemyRelatedNarrative;
+using Overlord.NarrativeGenerator.ItemRelatedNarrative;
+using Overlord.NarrativeGenerator.EnemyRelatedNarrative;
 using ScriptableObjects;
 using UnityEngine;
 using Util;

Assets/Scripts/Game/LevelManager/DungeonManager/RoomBhv.cs

@@ -5,14 +5,15 @@
 using Game.Events;
 using Game.GameManager;
 using Game.LevelManager.DungeonLoader;
-using Game.NarrativeGenerator.Quests;
+using Overlord.NarrativeGenerator.Quests;
 using Game.NPCs;
 using ScriptableObjects;
 using UnityEngine;
 using Util;
 using Game.Quests;
 using UnityEngine.Tilemaps;
 using PlatformGame.Player;
+using Overlord.NarrativeGenerator.EnemyRelatedNarrative;
 
 namespace Game.LevelManager.DungeonManager
 {

Assets/Scripts/Game/Maestro/EnemySelector.cs

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Game.NarrativeGenerator.EnemyRelatedNarrative;
+using Overlord.NarrativeGenerator.EnemyRelatedNarrative;
 using Game.LevelManager.DungeonLoader;
 using Game.GameManager;
 using ScriptableObjects;

Assets/Scripts/Game/NPCs/DialogueGenerator/DialogueQuestCheckpoint.cs

@@ -1,7 +1,5 @@
-using System.Text;
-using Game.NarrativeGenerator.Quests;
-using Game.NarrativeGenerator.Quests.QuestGrammarTerminals;
-using MyBox;
+using Overlord.NarrativeGenerator.Quests;
+using Overlord.NarrativeGenerator.Quests.QuestGrammarTerminals;
 using UnityEngine;
 
 namespace Game.NPCs

Assets/Scripts/Game/NPCs/DialogueGenerator/DialogueQuestCloser.cs

@@ -1,7 +1,6 @@
 using System.Text;
-using Game.NarrativeGenerator.Quests;
-using Game.NarrativeGenerator.Quests.QuestGrammarTerminals;
-using MyBox;
+using Overlord.NarrativeGenerator.Quests;
+using Overlord.NarrativeGenerator.Quests.QuestGrammarTerminals;
 using UnityEngine;
 
 namespace Game.NPCs

Assets/Scripts/Game/NPCs/DialogueGenerator/DialogueQuestOpener.cs

@@ -1,7 +1,5 @@
-using System.Text;
-using Game.NarrativeGenerator.Quests;
-using Game.NarrativeGenerator.Quests.QuestGrammarTerminals;
-using MyBox;
+using Overlord.NarrativeGenerator.Quests.QuestGrammarTerminals;
+using Overlord.NarrativeGenerator.Quests;
 using UnityEngine;
 
 namespace Game.NPCs

Assets/Scripts/Game/NPCs/DialogueGenerator/NpcDialogueGenerator.cs

@@ -2,7 +2,8 @@
 using Game.NarrativeGenerator.Quests;
 using Game.NarrativeGenerator.Quests.QuestGrammarTerminals;
 using MyBox;
-using UnityEngine;
+using Overlord.NarrativeGenerator.Quests;
+using Overlord.NarrativeGenerator.Quests.QuestGrammarTerminals;
 
 namespace Game.NPCs
 {

Assets/Scripts/Game/NPCs/DialogueGenerator/PTBR_NpcDialogueGenerator.cs

@@ -2,7 +2,7 @@
 using Game.NarrativeGenerator.Quests;
 using Game.NarrativeGenerator.Quests.QuestGrammarTerminals;
 using MyBox;
-using UnityEngine;
+using Overlord.NarrativeGenerator.Quests.QuestGrammarTerminals;
 
 namespace Game.NPCs.PTBR
 {

Assets/Scripts/Game/NPCs/DialogueGenerator/QuestCheckpoints/ExchangeQuestCheckpoint.cs

@@ -7,7 +7,7 @@ protected override string[] lowSocialDialogues
         {
             get
             {
-                if (GameManagerSingleton.Instance.IsInPortuguese)
+                if (_language == Util.Enums.Language.Portuguese)
                     return new string[] {
                     "Não quero nada que você tenha a oferecer. O quê? {questSo.GetOwnerNpc()} te enviou? Affe, ta bom então."
                     };
@@ -21,7 +21,7 @@ protected override string[] averageSocialDialogues
         {
             get
             {
-                if (GameManagerSingleton.Instance.IsInPortuguese)
+                if (_language == Util.Enums.Language.Portuguese)
                     return new string[] {
                     "{questSo.GetOwnerNpc()} te enviou aqui pra trocar alguns itens comigo?"
                     };
@@ -35,7 +35,7 @@ protected override string[] highSocialDialogues
         {
             get
             {
-                if (GameManagerSingleton.Instance.IsInPortuguese)
+                if (_language == Util.Enums.Language.Portuguese)
                     return new string[] {
                     "Uuuuuh, eu lembro sim do {questSo.GetOwnerNpc()} mencionando sobre uma troca. Eu fiquei tão animado que até esqueci o que ele ofereceu. Estou feliz que você está aqui pra ajudar c:"
                     };

Assets/Scripts/Game/NPCs/DialogueGenerator/QuestCheckpoints/ListenQuestCheckPoint.cs

@@ -8,7 +8,7 @@ protected override string[] lowSocialDialogues
         {
             get
             {
-                if (GameManagerSingleton.Instance.IsInPortuguese)
+                if (_language == Util.Enums.Language.Portuguese)
                     return new string[] {
                     "Não acredito que {questSo.GetOwnerNpc()} está mandando bobalhões que nem você virem aqui tirar a minha paz."
                     };
@@ -22,7 +22,7 @@ protected override string[] averageSocialDialogues
         {
             get
             {
-                if (GameManagerSingleton.Instance.IsInPortuguese)
+                if (_language == Util.Enums.Language.Portuguese)
                     return new string[] {
                     "{questSo.GetOwnerNpc()} te enviou aqui pra ouvir o que eu tenho a dizer?"
                     };
@@ -36,7 +36,7 @@ protected override string[] highSocialDialogues
         {
             get
             {
-                if (GameManagerSingleton.Instance.IsInPortuguese)
+                if (_language == Util.Enums.Language.Portuguese)
                     return new string[] {
                     "{questSo.GetOwnerNpc()} disse pra você vir aqui?! Estou tão feliz! Adoro poder conversar :)"
                     };

Assets/Scripts/Game/NPCs/DialogueGenerator/QuestCheckpoints/ReportQuestCheckpoint.cs

@@ -7,7 +7,7 @@ protected override string[] lowSocialDialogues
         {
             get
             {
-                if (GameManagerSingleton.Instance.IsInPortuguese)
+                if (_language == Util.Enums.Language.Portuguese)
                     return new string[] {
                     "Eu não ligo pro que {questSo.GetOwnerNpc()} tem a \"reportar\". Diga pra {questSo.GetOwnerNpc()} não falar mais comigo."
                     };
@@ -21,7 +21,7 @@ protected override string[] averageSocialDialogues
         {
             get
             {
-                if (GameManagerSingleton.Instance.IsInPortuguese)
+                if (_language == Util.Enums.Language.Portuguese)
                     return new string[] {
                     "Oh? Você está com informações vindas de {questSo.GetOwnerNpc()}? ... Entendo, muito bem. Você pode dizer que a mensagem foi recebida."
                     };
@@ -35,7 +35,7 @@ protected override string[] highSocialDialogues
         {
             get
             {
-                if (GameManagerSingleton.Instance.IsInPortuguese)
+                if (_language == Util.Enums.Language.Portuguese)
                     return new string[] {
                     "{questSo.GetOwnerNpc()} disse o queeeee? Muito obrigada por me avisar! Pode dizer um muito obrigado a {questSo.GetOwnerNpc()} também!"
                     };