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

Code cleanup / Tainted water

Browse Source
This commit is contained in:
Anuken
2019-03-22 19:16:15 -04:00
parent e4f226a9c5
commit a4f558c77a
15 changed files with 1217 additions and 1129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/io/anuke/mindustry/entities/type/GroundUnit.java
View File

@@ -115,7 +115,7 @@ public abstract class GroundUnit extends BaseUnit{
Floor floor = getFloorOn();
if(floor.isLiquid){
Draw.color(Color.WHITE, floor.liquidColor, 0.5f);
Draw.color(Color.WHITE, floor.color, 0.5f);
}
for(int i : Mathf.signs){
@@ -126,7 +126,7 @@ public abstract class GroundUnit extends BaseUnit{
}
if(floor.isLiquid){
Draw.color(Color.WHITE, floor.liquidColor, drownTime * 0.4f);
Draw.color(Color.WHITE, floor.color, drownTime * 0.4f);
}else{
Draw.color(Color.WHITE);
}

6
core/src/io/anuke/mindustry/entities/type/Player.java
View File

@@ -292,7 +292,7 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{
if(!mech.flying){
if(floor.isLiquid){
Draw.color(Color.WHITE, floor.liquidColor, 0.5f);
Draw.color(Color.WHITE, floor.color, 0.5f);
}
float boostTrnsY = -boostHeat * 3f;
@@ -312,7 +312,7 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{
}
if(floor.isLiquid){
Draw.color(Color.WHITE, floor.liquidColor, drownTime);
Draw.color(Color.WHITE, floor.color, drownTime);
}else{
Draw.color(Color.WHITE);
}
@@ -524,7 +524,7 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{
if(mech.shake > 1f){
Effects.shake(mech.shake, mech.shake, this);
}
Effects.effect(Fx.unitLand, tile.floor().liquidColor == null ? tile.floor().color : tile.floor().color, x, y, tile.floor().isLiquid ? 1f : 0.5f);
Effects.effect(Fx.unitLand, tile.floor().color, x, y, tile.floor().isLiquid ? 1f : 0.5f);
}
mech.onLand(this);
achievedFlight = false;

4
core/src/io/anuke/mindustry/entities/type/Unit.java
View File

@@ -278,7 +278,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ
}
if(onLiquid && velocity.len() > 0.4f && Mathf.chance((velocity.len() * floor.speedMultiplier) * 0.06f * Time.delta())){
Effects.effect(floor.walkEffect, floor.liquidColor, x, y);
Effects.effect(floor.walkEffect, floor.color, x, y);
}
if(onLiquid){
@@ -292,7 +292,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ
if(onLiquid && floor.drownTime > 0){
drownTime += Time.delta() * 1f / floor.drownTime;
if(Mathf.chance(Time.delta() * 0.05f)){
Effects.effect(floor.drownUpdateEffect, floor.liquidColor, x, y);
Effects.effect(floor.drownUpdateEffect, floor.color, x, y);
}
}else{
drownTime = Mathf.lerpDelta(drownTime, 0f, 0.03f);