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

Improved conduit interaction / Various messups

Browse Source
This commit is contained in:
Anuken
2018-04-18 15:23:20 -04:00
parent bfcce4f7ab
commit 1d8630dd7d
9 changed files with 186 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,8 +86,8 @@ public abstract class Unit extends SyncEntity implements SerializableEntity {
status.update(this);
if(isFlying()) {
x += velocity.x / getMass();
y += velocity.y / getMass();
x += velocity.x / getMass() * Timers.delta();
y += velocity.y / getMass() * Timers.delta();
}else{
boolean onLiquid = floor.liquid;
@@ -123,7 +123,7 @@ public abstract class Unit extends SyncEntity implements SerializableEntity {
damage(health + 1, false);
}
move(velocity.x / getMass() * floor.speedMultiplier, velocity.y / getMass() * floor.speedMultiplier);
move(velocity.x / getMass() * floor.speedMultiplier * Timers.delta(), velocity.y / getMass() * floor.speedMultiplier * Timers.delta());
}
velocity.scl(Mathf.clamp(1f-drag* floor.dragMultiplier* Timers.delta()));

2
core/src/io/anuke/mindustry/entities/effect/Puddle.java
View File

@@ -82,7 +82,7 @@ public class Puddle extends Entity implements SerializableEntity, Poolable{
private static void reactPuddle(Puddle p, Liquid liquid, float amount){
if((p.liquid.flammability > 0.3f && liquid.temperature > 0.7f) ||
liquid.flammability > 0.3f && p.liquid.temperature > 0.7f){ //flammable liquid + hot liquid
(liquid.flammability > 0.3f && p.liquid.temperature > 0.7f)){ //flammable liquid + hot liquid
Fire.create(p.tile);
if(Mathf.chance(0.006 * amount)){
new Fireball(p.x, p.y, p.liquid.flameColor, Mathf.random(360f)).add();