diff --git a/core/src/mindustry/entities/Damage.java b/core/src/mindustry/entities/Damage.java index 64c08f318c..f3f50d9107 100644 --- a/core/src/mindustry/entities/Damage.java +++ b/core/src/mindustry/entities/Damage.java @@ -131,7 +131,7 @@ public class Damage{ } //try to heal the tile - if(collide && hitter.type.collides(hitter, tile)){ + if(collide && hitter.type.testCollision(hitter, tile)){ hitter.type.hitTile(hitter, tile, tile.health, false); } } diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java index ddcab2e9d5..f0f682b8e0 100644 --- a/core/src/mindustry/entities/bullet/BulletType.java +++ b/core/src/mindustry/entities/bullet/BulletType.java @@ -157,7 +157,7 @@ public abstract class BulletType extends Content{ return Math.max(speed * lifetime * (1f - drag), maxRange); } - public boolean collides(Bullet bullet, Building tile){ + public boolean testCollision(Bullet bullet, Building tile){ return healPercent <= 0.001f || tile.team != bullet.team || tile.healthf() < 1f; } diff --git a/core/src/mindustry/entities/comp/BulletComp.java b/core/src/mindustry/entities/comp/BulletComp.java index 318f66facd..6a8ab4783a 100644 --- a/core/src/mindustry/entities/comp/BulletComp.java +++ b/core/src/mindustry/entities/comp/BulletComp.java @@ -125,7 +125,7 @@ abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Draw Building tile = world.build(x, y); if(tile == null || !isAdded()) return false; - if(tile.collide(self()) && type.collides(self(), tile) && !tile.dead() && (type.collidesTeam || tile.team != team) && !(type.pierceBuilding && collided.contains(tile.id))){ + if(tile.collide(self()) && type.testCollision(self(), tile) && !tile.dead() && (type.collidesTeam || tile.team != team) && !(type.pierceBuilding && collided.contains(tile.id))){ boolean remove = false; float health = tile.health; diff --git a/core/src/mindustry/ui/fragments/PlacementFragment.java b/core/src/mindustry/ui/fragments/PlacementFragment.java index 0ee6f0d614..7bb3e6be3c 100644 --- a/core/src/mindustry/ui/fragments/PlacementFragment.java +++ b/core/src/mindustry/ui/fragments/PlacementFragment.java @@ -145,7 +145,7 @@ public class PlacementFragment extends Fragment{ break; } } - }else if(blockSelectEnd || Time.timeSinceMillis(blockSelectSeqMillis) > 750){ //1st number of combo, select category + }else if(blockSelectEnd || Time.timeSinceMillis(blockSelectSeqMillis) > 400){ //1st number of combo, select category //select only visible categories if(!getUnlockedByCategory(Category.all[i]).isEmpty()){ currentCategory = Category.all[i];