Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed #2737

Browse Source
This commit is contained in:
Anuken
2020-09-26 11:59:14 -04:00
parent d4d3b71d7d
commit 0f420b625a
4 changed files with 47 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/mindustry/content/Weathers.java
View File

@@ -170,13 +170,13 @@ public class Weathers implements ContentList{
sandstorm = new Weather("sandstorm"){ sandstorm = new Weather("sandstorm"){
TextureRegion region; TextureRegion region;
float size = 140f, padding = size, invDensity = 1500f, baseSpeed = 6.1f; float size = 140f, padding = size, invDensity = 1500f, baseSpeed = 6.1f;
float force = 0.4f; float force = 0.4f * 0;
Color color = Color.valueOf("f7cba4"); Color color = Color.valueOf("f7cba4");
Texture noise; Texture noise;
{ {
attrs.set(Attribute.light, -0.1f); attrs.set(Attribute.light, -0.1f);
opacityMultiplier = 0.85f; opacityMultiplier = 0.8f;
} }
@Override @Override
@@ -251,7 +251,7 @@ public class Weathers implements ContentList{
sporestorm = new Weather("sporestorm"){ sporestorm = new Weather("sporestorm"){
TextureRegion region; TextureRegion region;
float size = 5f, padding = size, invDensity = 2000f, baseSpeed = 4.3f, force = 0.28f; float size = 5f, padding = size, invDensity = 2000f, baseSpeed = 4.3f, force = 0.28f * 0;
Color color = Color.valueOf("7457ce"); Color color = Color.valueOf("7457ce");
Texture noise; Texture noise;
@@ -260,6 +260,7 @@ public class Weathers implements ContentList{
attrs.set(Attribute.light, -0.15f); attrs.set(Attribute.light, -0.15f);
status = StatusEffects.sporeSlowed; status = StatusEffects.sporeSlowed;
statusGround = false; statusGround = false;
opacityMultiplier = 0.85f;
} }
@Override @Override

1
core/src/mindustry/editor/MapEditorDialog.java
View File

@@ -257,6 +257,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
player.set(world.width() * tilesize/2f, world.height() * tilesize/2f); player.set(world.width() * tilesize/2f, world.height() * tilesize/2f);
player.clearUnit(); player.clearUnit();
Groups.unit.clear(); Groups.unit.clear();
Groups.build.clear();
logic.play(); logic.play();
}); });
} }

69
core/src/mindustry/game/DefaultWaves.java
View File

@@ -1,47 +1,49 @@
package mindustry.game; package mindustry.game;
import arc.struct.Seq; import arc.struct.*;
import mindustry.content.*; import mindustry.content.*;
import mindustry.type.ItemStack; import mindustry.type.*;
import static mindustry.content.UnitTypes.*;
public class DefaultWaves{ public class DefaultWaves{
private Seq<SpawnGroup> spawns; private Seq<SpawnGroup> spawns;
public Seq<SpawnGroup> get(){ public Seq<SpawnGroup> get(){
if(spawns == null && UnitTypes.dagger != null){ if(spawns == null && dagger != null){
spawns = Seq.with( spawns = Seq.with(
new SpawnGroup(UnitTypes.dagger){{ new SpawnGroup(dagger){{
end = 10; end = 10;
unitScaling = 2f; unitScaling = 2f;
}}, }},
new SpawnGroup(UnitTypes.crawler){{ new SpawnGroup(crawler){{
begin = 4; begin = 4;
end = 13; end = 13;
unitAmount = 2; unitAmount = 2;
unitScaling = 1.5f; unitScaling = 1.5f;
}}, }},
new SpawnGroup(UnitTypes.flare){{ new SpawnGroup(flare){{
begin = 12; begin = 12;
end = 16; end = 16;
unitScaling = 1f; unitScaling = 1f;
}}, }},
new SpawnGroup(UnitTypes.dagger){{ new SpawnGroup(dagger){{
begin = 11; begin = 11;
unitScaling = 1.7f; unitScaling = 1.7f;
spacing = 2; spacing = 2;
max = 4; max = 4;
}}, }},
new SpawnGroup(UnitTypes.pulsar){{ new SpawnGroup(pulsar){{
begin = 13; begin = 13;
spacing = 3; spacing = 3;
unitScaling = 0.5f; unitScaling = 0.5f;
}}, }},
new SpawnGroup(UnitTypes.mace){{ new SpawnGroup(mace){{
begin = 7; begin = 7;
spacing = 3; spacing = 3;
unitScaling = 2; unitScaling = 2;
@@ -49,28 +51,28 @@ public class DefaultWaves{
end = 30; end = 30;
}}, }},
new SpawnGroup(UnitTypes.dagger){{ new SpawnGroup(dagger){{
begin = 8; begin = 8;
unitScaling = 1; unitScaling = 1;
unitAmount = 4; unitAmount = 4;
spacing = 2; spacing = 2;
}}, }},
new SpawnGroup(UnitTypes.mace){{ new SpawnGroup(mace){{
begin = 28; begin = 28;
spacing = 3; spacing = 3;
unitScaling = 1; unitScaling = 1;
end = 40; end = 40;
}}, }},
new SpawnGroup(UnitTypes.mace){{ new SpawnGroup(mace){{
begin = 45; begin = 45;
spacing = 3; spacing = 3;
unitScaling = 2; unitScaling = 2;
effect = StatusEffects.overdrive; effect = StatusEffects.overdrive;
}}, }},
new SpawnGroup(UnitTypes.mace){{ new SpawnGroup(mace){{
begin = 120; begin = 120;
spacing = 2; spacing = 2;
unitScaling = 3; unitScaling = 3;
@@ -78,13 +80,13 @@ public class DefaultWaves{
effect = StatusEffects.overdrive; effect = StatusEffects.overdrive;
}}, }},
new SpawnGroup(UnitTypes.flare){{ new SpawnGroup(flare){{
begin = 16; begin = 16;
unitScaling = 1; unitScaling = 1;
spacing = 2; spacing = 2;
}}, }},
new SpawnGroup(UnitTypes.dagger){{ new SpawnGroup(dagger){{
begin = 82; begin = 82;
spacing = 3; spacing = 3;
unitAmount = 4; unitAmount = 4;
@@ -92,7 +94,7 @@ public class DefaultWaves{
effect = StatusEffects.overdrive; effect = StatusEffects.overdrive;
}}, }},
new SpawnGroup(UnitTypes.dagger){{ new SpawnGroup(dagger){{
begin = 41; begin = 41;
spacing = 5; spacing = 5;
unitAmount = 1; unitAmount = 1;
@@ -100,7 +102,7 @@ public class DefaultWaves{
effect = StatusEffects.shielded; effect = StatusEffects.shielded;
}}, }},
new SpawnGroup(UnitTypes.fortress){{ new SpawnGroup(fortress){{
begin = 40; begin = 40;
spacing = 5; spacing = 5;
unitAmount = 2; unitAmount = 2;
@@ -108,7 +110,7 @@ public class DefaultWaves{
max = 20; max = 20;
}}, }},
new SpawnGroup(UnitTypes.dagger){{ new SpawnGroup(dagger){{
begin = 35; begin = 35;
spacing = 3; spacing = 3;
unitAmount = 4; unitAmount = 4;
@@ -117,7 +119,7 @@ public class DefaultWaves{
end = 60; end = 60;
}}, }},
new SpawnGroup(UnitTypes.dagger){{ new SpawnGroup(dagger){{
begin = 42; begin = 42;
spacing = 3; spacing = 3;
unitAmount = 4; unitAmount = 4;
@@ -126,14 +128,14 @@ public class DefaultWaves{
end = 130; end = 130;
}}, }},
new SpawnGroup(UnitTypes.horizon){{ new SpawnGroup(horizon){{
begin = 40; begin = 40;
unitAmount = 2; unitAmount = 2;
spacing = 2; spacing = 2;
unitScaling = 2; unitScaling = 2;
}}, }},
new SpawnGroup(UnitTypes.flare){{ new SpawnGroup(flare){{
begin = 50; begin = 50;
unitAmount = 4; unitAmount = 4;
unitScaling = 3; unitScaling = 3;
@@ -141,7 +143,7 @@ public class DefaultWaves{
effect = StatusEffects.overdrive; effect = StatusEffects.overdrive;
}}, }},
new SpawnGroup(UnitTypes.zenith){{ new SpawnGroup(zenith){{
begin = 50; begin = 50;
unitAmount = 2; unitAmount = 2;
unitScaling = 3; unitScaling = 3;
@@ -149,42 +151,42 @@ public class DefaultWaves{
max = 16; max = 16;
}}, }},
new SpawnGroup(UnitTypes.horizon){{ new SpawnGroup(horizon){{
begin = 53; begin = 53;
unitAmount = 2; unitAmount = 2;
unitScaling = 3; unitScaling = 3;
spacing = 4; spacing = 4;
}}, }},
new SpawnGroup(UnitTypes.atrax){{ new SpawnGroup(atrax){{
begin = 31; begin = 31;
unitAmount = 4; unitAmount = 4;
unitScaling = 1; unitScaling = 1;
spacing = 3; spacing = 3;
}}, }},
new SpawnGroup(UnitTypes.scepter){{ new SpawnGroup(scepter){{
begin = 41; begin = 41;
unitAmount = 1; unitAmount = 1;
unitScaling = 1; unitScaling = 1;
spacing = 30; spacing = 30;
}}, }},
new SpawnGroup(UnitTypes.reign){{ new SpawnGroup(reign){{
begin = 81; begin = 81;
unitAmount = 1; unitAmount = 1;
unitScaling = 1; unitScaling = 1;
spacing = 40; spacing = 40;
}}, }},
new SpawnGroup(UnitTypes.antumbra){{ new SpawnGroup(antumbra){{
begin = 131; begin = 131;
unitAmount = 1; unitAmount = 1;
unitScaling = 1; unitScaling = 1;
spacing = 40; spacing = 40;
}}, }},
new SpawnGroup(UnitTypes.horizon){{ new SpawnGroup(horizon){{
begin = 90; begin = 90;
unitAmount = 2; unitAmount = 2;
unitScaling = 3; unitScaling = 3;
@@ -194,4 +196,15 @@ public class DefaultWaves{
} }
return spawns == null ? new Seq<>() : spawns; return spawns == null ? new Seq<>() : spawns;
} }
private static void generate(){
UnitType[][] species = {
{dagger, mace, fortress, scepter, reign},
{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
{flare, horizon, zenith, antumbra, eclipse}
};
}
} }

2
gradle.properties
View File

@@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=fdd046b83d3c91a31d4f5cea94b01f2cf753c4d0 archash=f4e823e80a634226c617e30f2d67d61562b8faaa