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

Naval unit sprites complete

Browse Source
This commit is contained in:
Anuken
2020-07-17 16:41:46 -04:00
parent d02268d347
commit 60ce8ca935
18 changed files with 2246 additions and 2034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/mindustry/entities/bullet/ArtilleryBulletType.java
View File

@@ -6,6 +6,7 @@ import mindustry.gen.*;
//TODO scale velocity depending on fslope()
public class ArtilleryBulletType extends BasicBulletType{
public float trailMult = 1f, trailSize = 4f;
public ArtilleryBulletType(float speed, float damage, String bulletSprite){
super(speed, damage, bulletSprite);
@@ -19,6 +20,10 @@ public class ArtilleryBulletType extends BasicBulletType{
trailEffect = Fx.artilleryTrail;
}
public ArtilleryBulletType(float speed, float damage){
this(speed, damage, "shell");
}
public ArtilleryBulletType(){
this(1f, 1f, "shell");
}
@@ -27,8 +32,8 @@ public class ArtilleryBulletType extends BasicBulletType{
public void update(Bullet b){
super.update(b);
if(b.timer(0, 3 + b.fslope() * 2f)){
trailEffect.at(b.x, b.y, b.fslope() * 4f, backColor);
if(b.timer(0, (3 + b.fslope() * 2f) * trailMult)){
trailEffect.at(b.x, b.y, b.fslope() * trailSize, backColor);
}
}

2
core/src/mindustry/entities/comp/WaterMoveComp.java
View File

@@ -41,7 +41,7 @@ abstract class WaterMoveComp implements Posc, Velc, Hitboxc, Flyingc, Unitc{
Draw.z(Layer.debris);
Floor floor = floorOn();
Color color = Tmp.c1.set(floor.mapColor).mul(1.7f);
Color color = Tmp.c1.set(floor.mapColor).mul(1.5f);
trailColor.lerp(color, Mathf.clamp(Time.delta() * 0.04f));
tleft.draw(trailColor, type.trailScl);