Merge branch 'main' into movingPlatformWork

This commit is contained in:
Aaron Kimbre
2024-02-17 03:28:33 -06:00
15 changed files with 124 additions and 176 deletions

View File

@@ -25,16 +25,6 @@ Spawner::Spawner(const SpawnerInfo info) {
m_Start = m_Info.noTimedSpawn;
//ssssh...
if (m_EntityInfo.lot == 14718) { //AG - MAELSTROM SAMPLE
m_Info.groups.emplace_back("MaelstromSamples");
}
if (m_EntityInfo.lot == 14375) //AG - SPIDER BOSS EGG
{
m_Info.groups.emplace_back("EGG");
}
int timerCount = m_Info.amountMaintained;
if (m_Info.amountMaintained > m_Info.nodes.size()) {