Various tweaks

This commit is contained in:
Anuken
2020-10-16 20:09:48 -04:00
parent e00daffe6d
commit fc1b03f322
8 changed files with 42 additions and 24 deletions

View File

@@ -81,7 +81,7 @@ public class DefaultWaves{
effect = StatusEffects.overdrive;
}},
new SpawnGroup(mace){{
new SpawnGroup(pulsar){{
begin = 120;
spacing = 2;
unitScaling = 3;
@@ -122,7 +122,7 @@ public class DefaultWaves{
shieldScaling = 30;
}},
new SpawnGroup(dagger){{
new SpawnGroup(nova){{
begin = 35;
spacing = 3;
unitAmount = 4;
@@ -233,7 +233,7 @@ public class DefaultWaves{
shieldScaling = 20f;
}},
new SpawnGroup(atrax){{
new SpawnGroup(toxopid){{
begin = 210;
unitAmount = 1;
unitScaling = 1;
@@ -258,7 +258,7 @@ public class DefaultWaves{
{nova, pulsar, quasar, vela, corvus},
{crawler, atrax, spiroct, arkyid, toxopid},
//{risso, minke, bryde, sei, omura}, //questionable choices
//{mono, poly, mega, quad, oct}, //do not attack
{poly, poly, mega, quad, quad},
{flare, horizon, zenith, antumbra, eclipse}
};

View File

@@ -41,6 +41,8 @@ public class SectorInfo{
public Seq<UnlockableContent> resources = new Seq<>();
/** Whether waves are enabled here. */
public boolean waves = true;
/** Whether attack mode is enabled here. */
public boolean attack = false;
/** Wave # from state */
public int wave = 1, winWave = -1;
/** Time between waves. */
@@ -103,6 +105,7 @@ public class SectorInfo{
state.rules.waves = waves;
state.rules.waveSpacing = waveSpacing;
state.rules.winWave = winWave;
state.rules.attackMode = attack;
CoreBuild entity = state.rules.defaultTeam.core();
if(entity != null){
@@ -135,6 +138,7 @@ public class SectorInfo{
wave = state.wave;
winWave = state.rules.winWave;
waves = state.rules.waves;
attack = state.rules.attackMode;
hasCore = entity != null;
bestCoreType = !hasCore ? Blocks.air : state.rules.defaultTeam.cores().max(e -> e.block.size).block;
storageCapacity = entity != null ? entity.storageCapacity : 0;