mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-04-18 11:31:46 -07:00
Code Issues Projects Releases Wiki Activity

"grabage struct"

Browse source
This commit is contained in:
Anuken 2020-05-09 16:29:01 -04:00
parent bc658f9f45
commit f0d2f7b728
6 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/src/mindustry/core/Renderer.java
View file

@ -38,8 +38,6 @@ public class Renderer implements ApplicationListener{
public Renderer(){
camera = new Camera();
Shaders.init();
//fx.addEffect(new SnowFilter());
}
public void shake(float intensity, float duration){

7
core/src/mindustry/entities/bullet/BulletType.java
View file

@ -82,6 +82,9 @@ public abstract class BulletType extends Content{
public int lightining;
public int lightningLength = 5;
public float weaveScale = 1f;
public float weaveMag = -1f;
public float hitShake = 0f;
public BulletType(float speed, float damage){
@ -165,6 +168,10 @@ public abstract class BulletType extends Content{
b.vel().setAngle(Mathf.slerpDelta(b.rotation(), b.angleTo(target), 0.08f));
}
}
if(weaveMag > 0){
b.vel().rotate(Mathf.sin(Time.time() + b.id() * 3, weaveScale, weaveMag) * Time.delta());
}
}
@Override

7
core/src/mindustry/entities/bullet/MissileBulletType.java
View file

@ -10,9 +10,6 @@ import mindustry.graphics.Pal;
public class MissileBulletType extends BasicBulletType{
protected Color trailColor = Pal.missileYellowBack;
protected float weaveScale = 1f;
protected float weaveMag = -1f;
public MissileBulletType(float speed, float damage, String bulletSprite){
super(speed, damage, bulletSprite);
backColor = Pal.missileYellowBack;
@ -32,9 +29,5 @@ public class MissileBulletType extends BasicBulletType{
if(Mathf.chance(Time.delta() * 0.2)){
Fx.missileTrail.at(b.x(), b.y(), 2f, trailColor);
}
if(weaveMag > 0){
b.vel().rotate(Mathf.sin(Time.time() + b.id() * 3, weaveScale, weaveMag) * Time.delta());
}
}
}

2
core/src/mindustry/world/blocks/BuildBlock.java
View file

@ -60,7 +60,7 @@ public class BuildBlock extends Block{
public static void onConstructFinish(Tile tile, Block block, int builderID, byte rotation, Team team, boolean skipConfig){
if(tile == null) return;
float healthf = tile.entity.healthf();
tile.setBlock(block, team, (int)rotation);
tile.setBlock(block, team, rotation);
tile.entity.health(block.health * healthf);
//last builder was this local client player, call placed()
if(!headless && builderID == player.unit().id()){

2
core/src/mindustry/world/blocks/production/Incinerator.java
View file

@ -27,7 +27,7 @@ public class Incinerator extends Block{
@Override
public void updateTile(){
if(consValid()){
if(consValid() && efficiency() > 0.9f){
heat = Mathf.lerpDelta(heat, 1f, 0.04f);
}else{
heat = Mathf.lerpDelta(heat, 0f, 0.02f);

2
server/src/mindustry/server/ServerControl.java
View file

@ -822,7 +822,7 @@ public class ServerControl implements ApplicationListener{
}
});
handler.register("gc", "Trigger a grabage struct. Testing only.", arg -> {
handler.register("gc", "Trigger a garbage collection. Testing only.", arg -> {
int pre = (int)(Core.app.getJavaHeap() / 1024 / 1024);
System.gc();
int post = (int)(Core.app.getJavaHeap() / 1024 / 1024);