This commit is contained in:
Anuken
2020-09-17 23:53:35 -04:00
parent f242a2b2cd
commit 4c241f9867
5 changed files with 20 additions and 4 deletions
@@ -100,7 +100,7 @@ public class Wall extends Block{
//deflect bullets if necessary
if(deflect){
//slow bullets are not deflected
if(bullet.vel().len() <= 0.2f || !bullet.type.reflectable) return true;
if(bullet.vel().len() <= 0.1f || !bullet.type.reflectable) return true;
//bullet reflection chance depends on bullet damage
if(!Mathf.chance(chanceDeflect / bullet.damage())) return true;
@@ -2,8 +2,10 @@ package mindustry.world.blocks.payloads;
import arc.graphics.g2d.*;
import arc.math.*;
import arc.math.geom.*;
import arc.util.io.*;
import mindustry.*;
import mindustry.entities.*;
import mindustry.gen.*;
import mindustry.graphics.*;
import mindustry.ui.*;
@@ -35,6 +37,18 @@ public class UnitPayload implements Payload{
@Override
public boolean dump(){
//naval units need water.
if(unit instanceof WaterMovec){
int tx = unit.tileX(), ty = unit.tileY();
boolean nearEmpty = !EntityCollisions.waterSolid(tx, ty);
for(Point2 p : Geometry.d4){
nearEmpty |= !EntityCollisions.waterSolid(tx + p.x, ty + p.y);
}
//cannot dump on dry land
if(!nearEmpty) return false;
}
//no client dumping
if(Vars.net.client()) return true;