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

#3830

Browse Source
This commit is contained in:
Anuken
2020-12-12 18:49:24 -05:00
parent d171048004
commit d6546a38c0
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/entities/Damage.java
View File

@@ -131,7 +131,7 @@ public class Damage{
} }
//try to heal the tile //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); hitter.type.hitTile(hitter, tile, tile.health, false);
} }
} }

2
core/src/mindustry/entities/bullet/BulletType.java
View File

@@ -157,7 +157,7 @@ public abstract class BulletType extends Content{
return Math.max(speed * lifetime * (1f - drag), maxRange); 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; return healPercent <= 0.001f || tile.team != bullet.team || tile.healthf() < 1f;
} }

2
core/src/mindustry/entities/comp/BulletComp.java
View File

@@ -125,7 +125,7 @@ abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Draw
Building tile = world.build(x, y); Building tile = world.build(x, y);
if(tile == null || !isAdded()) return false; 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; boolean remove = false;
float health = tile.health; float health = tile.health;

2
core/src/mindustry/ui/fragments/PlacementFragment.java
View File

@@ -145,7 +145,7 @@ public class PlacementFragment extends Fragment{
break; 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 //select only visible categories
if(!getUnlockedByCategory(Category.all[i]).isEmpty()){ if(!getUnlockedByCategory(Category.all[i]).isEmpty()){
currentCategory = Category.all[i]; currentCategory = Category.all[i];