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

Better payload construct/deconstruct effects

Browse Source
This commit is contained in:
Anuken
2021-09-20 10:09:00 -04:00
parent bd8b0c985a
commit e57087e891
5 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/mindustry/graphics/g3d/PlanetParams.java
View File

@@ -36,4 +36,5 @@ public class PlanetParams{
//TODO:
//- blur
//- darken
}

3
core/src/mindustry/maps/planet/AsteroidGenerator.java
View File

@@ -1,6 +1,7 @@
package mindustry.maps.planet;
import arc.math.*;
import arc.math.geom.*;
import arc.util.noise.*;
import mindustry.content.*;
import mindustry.game.*;
@@ -92,7 +93,6 @@ public class AsteroidGenerator extends BlankPlanetGenerator{
}
block = floor.asFloor().wall;
});
//random craters
@@ -135,6 +135,7 @@ public class AsteroidGenerator extends BlankPlanetGenerator{
state.rules.planetBackground = new PlanetParams(){{
planet = sector.planet;
zoom = 1f;
camPos = new Vec3(1.2388899f, 1.6047299f, 2.4758825f);
}};
//state.rules.backgroundTexture = "sprites/space.png";
state.rules.borderDarkness = false;

2
core/src/mindustry/world/blocks/environment/WobbleProp.java
View File

@@ -3,6 +3,7 @@ package mindustry.world.blocks.environment;
import arc.graphics.g2d.*;
import arc.math.*;
import arc.util.*;
import mindustry.gen.*;
import mindustry.world.*;
public class WobbleProp extends Prop{
@@ -10,6 +11,7 @@ public class WobbleProp extends Prop{
public WobbleProp(String name){
super(name);
breakSound = Sounds.plantBreak;
}
@Override

2
core/src/mindustry/world/blocks/payloads/BlockProducer.java
View File

@@ -5,6 +5,7 @@ import arc.math.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.*;
import mindustry.content.*;
import mindustry.entities.units.*;
import mindustry.gen.*;
import mindustry.graphics.*;
@@ -86,6 +87,7 @@ public abstract class BlockProducer extends PayloadBlock{
if(progress >= recipe.buildCost){
consume();
payload = new BuildPayload(recipe, team);
Fx.placeBlock.at(x, y, payload.size() / tilesize);
payVector.setZero();
progress %= 1f;
}

9
core/src/mindustry/world/blocks/payloads/PayloadDeconstructor.java
View File

@@ -4,11 +4,13 @@ import arc.graphics.g2d.*;
import arc.math.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.*;
import mindustry.content.*;
import mindustry.gen.*;
import mindustry.graphics.*;
import mindustry.ui.*;
import static mindustry.Vars.*;
public class PayloadDeconstructor extends PayloadBlock{
public float maxPayloadSize = 4;
public float deconstructSpeed = 2.5f;
@@ -74,7 +76,7 @@ public class PayloadDeconstructor extends PayloadBlock{
Draw.color(Pal.remove);
Draw.alpha(1f);
Lines.lineAngleCenter(x + Mathf.sin(time, 20f, Vars.tilesize / 2f * block.size - 3f), y, 90f, block.size * Vars.tilesize - 6f);
Lines.lineAngleCenter(x + Mathf.sin(time, 20f, tilesize / 2f * block.size - 3f), y, 90f, block.size * tilesize - 6f);
Draw.reset();
});
@@ -151,7 +153,8 @@ public class PayloadDeconstructor extends PayloadBlock{
//finish deconstruction, prepare for next payload.
if(progress >= 1f){
//TODO
Fx.breakBlock.at(x, y, deconstructing.size() / tilesize);
deconstructing = null;
accum = null;
}