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

Fixed laser underBullet

Browse Source
This commit is contained in:
Anuken
2022-04-11 16:32:37 -04:00
parent 0abed6f635
commit 5e65e250c3
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -158,7 +158,7 @@ public class Damage{
//add distance to list so it can be processed //add distance to list so it can be processed
var build = world.build(x, y); var build = world.build(x, y);
if(build != null && build.team != b.team){ if(build != null && build.team != b.team && b.checkUnderBuild(build, x * tilesize, y * tilesize)){
distances.add(b.dst(build)); distances.add(b.dst(build));
if(b.type.laserAbsorb && build.absorbLasers()){ if(b.type.laserAbsorb && build.absorbLasers()){
@@ -233,7 +233,7 @@ public class Damage{
Intc2 collider = (cx, cy) -> { Intc2 collider = (cx, cy) -> {
Building tile = world.build(cx, cy); Building tile = world.build(cx, cy);
boolean collide = tile != null && collidedBlocks.add(tile.pos()); boolean collide = tile != null && hitter.checkUnderBuild(tile, cx * tilesize, cy * tilesize) && collidedBlocks.add(tile.pos());
if(hitter.damage > 0){ if(hitter.damage > 0){
float health = !collide ? 0 : tile.health; float health = !collide ? 0 : tile.health;

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

@@ -151,6 +151,15 @@ abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Draw
vel.add(Angles.trnsx(ang, x * Time.delta, y * Time.delta), Angles.trnsy(ang, x * Time.delta, y * Time.delta)).limit(type.speed); vel.add(Angles.trnsx(ang, x * Time.delta, y * Time.delta), Angles.trnsy(ang, x * Time.delta, y * Time.delta)).limit(type.speed);
} }
public boolean checkUnderBuild(Building build, float x, float y){
return
(!build.block.underBullets ||
//direct hit on correct tile
(aimTile != null && aimTile.build == build) ||
//a piercing bullet overshot the aim tile, it's fine to hit things now
(type.pierce && aimTile != null && Mathf.dst(x, y, originX, originY) > aimTile.dst(originX, originY) + 2f));
}
//copy-paste of World#raycastEach, inlined for lambda capture performance. //copy-paste of World#raycastEach, inlined for lambda capture performance.
@Override @Override
public void tileRaycast(int x1, int y1, int x2, int y2){ public void tileRaycast(int x1, int y1, int x2, int y2){
@@ -175,15 +184,8 @@ abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Draw
} }
} }
if(build != null && isAdded() && if(build != null && isAdded()
//should underBullet detection be disabled for piercing bullets? && checkUnderBuild(build, x, y)
//|| type.pierceBuilding
(!build.block.underBullets ||
//direct hit on correct tile
(aimTile != null && aimTile.build == build) ||
//a piercing bullet overshot the aim tile, it's fine to hit things now
(type.pierce && aimTile != null && dst(originX, originY) > aimTile.dst(originX, originY) + 2f))
&& build.collide(self()) && type.testCollision(self(), build) && build.collide(self()) && type.testCollision(self(), build)
&& !build.dead() && (type.collidesTeam || build.team != team) && !(type.pierceBuilding && hasCollided(build.id))){ && !build.dead() && (type.collidesTeam || build.team != team) && !(type.pierceBuilding && hasCollided(build.id))){