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

Implemented conveyor physics

Browse Source
This commit is contained in:
Anuken
2018-04-08 12:02:42 -04:00
parent 00b78402eb
commit 6db1175c95
6 changed files with 52 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,6 +47,7 @@ public abstract class Unit extends SyncEntity {
public void updateVelocityStatus(float drag, float maxVelocity){
Floor floor = getFloorOn();
Tile tile = world.tileWorld(x, y);
velocity.limit(maxVelocity);
@@ -56,7 +57,16 @@ public abstract class Unit extends SyncEntity {
x += velocity.x / getMass();
y += velocity.y / getMass();
}else{
if(floor.liquid && velocity.len() > 0.4f && Timers.get(this, "flooreffect", 14 - (velocity.len() * floor.speedMultiplier)*2f)){
boolean onLiquid = floor.liquid;
if(tile != null){
tile.block().unitOn(tile, this);
if(tile.block() != Blocks.air){
onLiquid = false;
}
}
if(onLiquid && velocity.len() > 0.4f && Timers.get(this, "flooreffect", 14 - (velocity.len() * floor.speedMultiplier)*2f)){
Effects.effect(floor.walkEffect, floor.liquidColor, x, y);
}
@@ -66,7 +76,7 @@ public abstract class Unit extends SyncEntity {
damagePeriodic(floor.damageTaken);
}
if(floor.drownTime > 0){
if(onLiquid && floor.drownTime > 0){
drownTime += Timers.delta() * 1f/floor.drownTime;
if(Timers.get(this, "drowneffect", 15)){
Effects.effect(floor.drownUpdateEffect, floor.liquidColor, x, y);