Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 68 additions & 0 deletions Assets/PlatformGameAssets/Scenes/PlatformMain.unity

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

51 changes: 27 additions & 24 deletions Assets/Prefabs/ContentGenerator.prefab

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

83 changes: 83 additions & 0 deletions Assets/Scenes/Main.unity

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Assets/Scripts/Game/DataCollection/DungeonDataController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down Expand Up @@ -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()
Expand All @@ -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)
Expand Down
12 changes: 6 additions & 6 deletions Assets/Scripts/Game/DataCollection/PlayerDataController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand All @@ -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;
Expand All @@ -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()
Expand All @@ -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;
Expand All @@ -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()
Expand Down
Original file line number Diff line number Diff line change
@@ -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()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
using UnityEngine.SceneManagement;
using Util;
using Overlord.RulesGenerator.EnemyGeneration;
using Topdown.Overlord.RulesGenerator.EnemyGeneration;

namespace Game.ExperimentControllers
{
Expand Down
Loading
Loading