mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-12 03:37:27 +07:00
Code Issues Packages Projects Releases Wiki Activity

Harder default waves

Browse Source
This commit is contained in:
Anuken 2019-05-04 17:14:47 -04:00
parent 8d6afbd80d
commit f137c11c6c
5 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/ai/WaveSpawner.java
View File

@ -95,7 +95,7 @@ public class WaveSpawner{
Time.run(Math.min(i * 5, 60 * 2), () -> shockwave(unit)); Time.run(Math.min(i * 5, 60 * 2), () -> shockwave(unit));
} }
Time.run(20f, () -> Effects.effect(Fx.spawnShockwave, spawn.x * tilesize, spawn.y * tilesize)); Time.run(20f, () -> Effects.effect(Fx.spawnShockwave, spawn.x * tilesize, spawn.y * tilesize, state.rules.dropZoneRadius));
//would be interesting to see player structures survive this without hacks //would be interesting to see player structures survive this without hacks
Time.run(40f, () -> Damage.damage(waveTeam, spawn.x * tilesize, spawn.y * tilesize, state.rules.dropZoneRadius, 99999999f, true)); Time.run(40f, () -> Damage.damage(waveTeam, spawn.x * tilesize, spawn.y * tilesize, state.rules.dropZoneRadius, 99999999f, true));
} }

2
core/src/io/anuke/mindustry/content/Fx.java
View File

@ -583,7 +583,7 @@ public class Fx implements ContentList{
spawnShockwave = new Effect(20f, 400f, e -> { spawnShockwave = new Effect(20f, 400f, e -> {
Draw.color(Color.WHITE, Color.LIGHT_GRAY, e.fin()); Draw.color(Color.WHITE, Color.LIGHT_GRAY, e.fin());
Lines.stroke(e.fout() * 3f + 0.5f); Lines.stroke(e.fout() * 3f + 0.5f);
Lines.poly(e.x, e.y, 60, e.fin() * 450f); Lines.poly(e.x, e.y, 60, e.fin() * (e.rotation + 50f));
Draw.reset(); Draw.reset();
}); });

5
core/src/io/anuke/mindustry/entities/units/UnitDrops.java
View File

@ -19,7 +19,7 @@ public class UnitDrops{
TileEntity core = unit.getClosestEnemyCore(); TileEntity core = unit.getClosestEnemyCore();
if(core == null){ if(core == null || core.dst(unit) > Vars.mineTransferRange){
return; return;
} }
@ -37,8 +37,9 @@ public class UnitDrops{
if(Mathf.chance(0.03)){ if(Mathf.chance(0.03)){
int amount = Mathf.random(20, 40); int amount = Mathf.random(20, 40);
amount = core.tile.block().acceptStack(item, amount, core.tile, null); amount = core.tile.block().acceptStack(item, amount, core.tile, null);
if(amount > 0) if(amount > 0){
Call.transferItemTo(item, amount, unit.x + Mathf.range(2f), unit.y + Mathf.range(2f), core.tile); Call.transferItemTo(item, amount, unit.x + Mathf.range(2f), unit.y + Mathf.range(2f), core.tile);
}
} }
} }
} }

10
core/src/io/anuke/mindustry/game/DefaultWaves.java
View File

@ -69,8 +69,6 @@ public class DefaultWaves{
begin = 16; begin = 16;
unitScaling = 1; unitScaling = 1;
spacing = 2; spacing = 2;
max = 12;
}}, }},
new SpawnGroup(UnitTypes.dagger){{ new SpawnGroup(UnitTypes.dagger){{
@ -119,8 +117,7 @@ public class DefaultWaves{
begin = 40; begin = 40;
unitAmount = 2; unitAmount = 2;
spacing = 2; spacing = 2;
unitScaling = 3; unitScaling = 2;
max = 8;
}}, }},
new SpawnGroup(UnitTypes.wraith){{ new SpawnGroup(UnitTypes.wraith){{
@ -129,7 +126,6 @@ public class DefaultWaves{
unitScaling = 3; unitScaling = 3;
spacing = 5; spacing = 5;
effect = StatusEffects.overdrive; effect = StatusEffects.overdrive;
max = 8;
}}, }},
new SpawnGroup(UnitTypes.revenant){{ new SpawnGroup(UnitTypes.revenant){{
@ -137,7 +133,7 @@ public class DefaultWaves{
unitAmount = 2; unitAmount = 2;
unitScaling = 3; unitScaling = 3;
spacing = 5; spacing = 5;
max = 8; max = 16;
}}, }},
new SpawnGroup(UnitTypes.ghoul){{ new SpawnGroup(UnitTypes.ghoul){{
@ -145,7 +141,6 @@ public class DefaultWaves{
unitAmount = 2; unitAmount = 2;
unitScaling = 3; unitScaling = 3;
spacing = 4; spacing = 4;
max = 8;
}}, }},
new SpawnGroup(UnitTypes.eruptor){{ new SpawnGroup(UnitTypes.eruptor){{
@ -181,7 +176,6 @@ public class DefaultWaves{
unitAmount = 2; unitAmount = 2;
unitScaling = 3; unitScaling = 3;
spacing = 4; spacing = 4;
max = 8;
}} }}
); );
} }

1
core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java
View File

@ -204,6 +204,7 @@ public class UnitFactory extends Block{
@Override @Override
public void read(DataInput stream) throws IOException{ public void read(DataInput stream) throws IOException{
buildTime = stream.readFloat(); buildTime = stream.readFloat();
stream.readFloat(); //unneeded information, will remove later
spawned = stream.readInt(); spawned = stream.readInt();
} }
} }