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

Bullet hit position snap

Browse Source
This commit is contained in:
Anuken
2022-04-21 23:22:32 -04:00
parent 2bed4b25eb
commit 1133283e0e
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,7 @@ import static mindustry.Vars.*;
abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Drawc, Shielderc, Ownerc, Velc, Bulletc, Timerc{ abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Drawc, Shielderc, Ownerc, Velc, Bulletc, Timerc{
@Import Team team; @Import Team team;
@Import Entityc owner; @Import Entityc owner;
@Import float x, y, damage; @Import float x, y, damage, lastX, lastY;
@Import Vec2 vel; @Import Vec2 vel;
IntSeq collided = new IntSeq(6); IntSeq collided = new IntSeq(6);
@@ -131,7 +131,7 @@ abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Draw
type.update(self()); type.update(self());
if(type.collidesTiles && type.collides && type.collidesGround){ if(type.collidesTiles && type.collides && type.collidesGround){
tileRaycast(World.toTile(lastX()), World.toTile(lastY()), tileX(), tileY()); tileRaycast(World.toTile(lastX), World.toTile(lastY), tileX(), tileY());
} }
if(type.removeAfterPierce && type.pierceCap != -1 && collided.size >= type.pierceCap){ if(type.removeAfterPierce && type.pierceCap != -1 && collided.size >= type.pierceCap){
@@ -197,6 +197,11 @@ abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Draw
} }
if(remove || type.collidesTeam){ if(remove || type.collidesTeam){
if(Mathf.dst2(lastX, lastY, x * tilesize, y * tilesize) < Mathf.dst2(lastX, lastY, this.x, this.y)){
this.x = x * tilesize;
this.y = y * tilesize;
}
if(!type.pierceBuilding){ if(!type.pierceBuilding){
hit = true; hit = true;
remove(); remove();