drunkendog
/
final
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

master
John 2022-06-17 13:33:04 -04:00
parent ed150b6629 4213b1f4c4
commit 1d13e661ad
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Player.java
View File

@ -149,14 +149,15 @@ public class Player extends GenericSprite {
for(NonPlayer e: GameFrame.game.enemy){
System.out.println((xx*Tile.length)+" "+(yy*Tile.length)+" ");
System.out.print(" "+ (e.x+GamePanel.GAME_WIDTH/2) + " "+e.y+" ");
// if(){
//
// } else {
// canPlaceSteel = false;
// return;
// }
int TileX = xx*Tile.length;
int TileY = yy*Tile.length;
int ex = (e.x+GamePanel.GAME_WIDTH/2);
//System.out.println((xx*Tile.length)+" "+(yy*Tile.length)+" ");
//System.out.print(" "+ (e.x+GamePanel.GAME_WIDTH/2) + " "+e.y+" ");
if(TileX<=ex+e.WIDTH&&ex<=TileX+Tile.length&&TileY<=e.y+e.HEIGHT&&e.y<=TileY+Tile.length){
canPlaceSteel = false;
return;
}
}
if(Math.abs(xDis)<(WIDTH+Tile.length)/2&&Math.abs(yDis)<(HEIGHT+Tile.length)/2){
canPlaceSteel = false; return;