Conjure/gather-and-defend
9
0
Fork 0
Code Issues Pull Requests 1 Projects Wiki Activity

Monster Core #21

Open
Ader_Alisma wants to merge 7 commits from feature/monsterCore into main
pull from: feature/monsterCore
merge into: Conjure:main
Conversation 0 Commits 7 Files Changed 19 +9
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e25d118287 - Show all commits

2
Assets/Scripts/LevelConfig/WaveConfig.cs
View File

@ -5,6 +5,7 @@ public class GroupList
{ {
public List<EnemyType> groupSpawn; public List<EnemyType> groupSpawn;
public float triggerTime; public float triggerTime;
public bool dropsMonsterCore;
} }
[CreateAssetMenu(menuName = "Gather And Defend/Levels/WaveConfig")] [CreateAssetMenu(menuName = "Gather And Defend/Levels/WaveConfig")]
public class WaveConfig : ScriptableObject public class WaveConfig : ScriptableObject
@ -45,6 +46,7 @@ public class WaveConfig : ScriptableObject
} }
} }
public float GameDuration { get { return _gameDuration; } } public float GameDuration { get { return _gameDuration; } }
/** /**
* Returns the updated game interval after adjusting to enemies spawned at the start * Returns the updated game interval after adjusting to enemies spawned at the start
*/ */

7
Assets/Scripts/LevelConfig/WaveObserver.cs
View File

@ -13,6 +13,7 @@ public class WaveObserver : Singleton<WaveObserver>
private List<int> _copyConstantSpawn; private List<int> _copyConstantSpawn;
private List<int> _intervalTiming = new List<int>(); private List<int> _intervalTiming = new List<int>();
private List<List<int>> _copyGroupSpawn; //Contains count of enemies per group private List<List<int>> _copyGroupSpawn; //Contains count of enemies per group
private List<bool> _monsterCoreGroups;
private WaveConfig _levelConfig; private WaveConfig _levelConfig;
private int _spawnerTiming = 0; private int _spawnerTiming = 0;
private int _currentGroupIndex = 0; private int _currentGroupIndex = 0;
@ -51,6 +52,7 @@ public class WaveObserver : Singleton<WaveObserver>
_copyGroupSpawn[index].Add(_levelConfig.NestedGroupSpawn[index].groupSpawn[nestedIndex].Count); _copyGroupSpawn[index].Add(_levelConfig.NestedGroupSpawn[index].groupSpawn[nestedIndex].Count);
} }
_groupSpawnTimers.Add(_levelConfig.NestedGroupSpawn[index].triggerTime); _groupSpawnTimers.Add(_levelConfig.NestedGroupSpawn[index].triggerTime);
_monsterCoreGroups.Add(_levelConfig.NestedGroupSpawn[index].dropsMonsterCore);
} }
// Start game timer, at the end, player wins. // Start game timer, at the end, player wins.
@ -262,4 +264,9 @@ public class WaveObserver : Singleton<WaveObserver>
} }
} }
} }
private void ChooseMonsterCore(List<EnemyType> currentGroup)
{
// Fetch the group's mosnter core bool attribute
}
} }