ignore
parent
7ee87d65eb
commit
d071e51c5b
|
@ -12,7 +12,7 @@ sssssssssssssssssd
|
||||||
sssssssssssssssssd zxc asd asd zxxxxxc zxxxxxxxllllxxxxxxxxc ad
|
sssssssssssssssssd zxc asd asd zxxxxxc zxxxxxxxllllxxxxxxxxc ad
|
||||||
sssssssssssssssssd 1 zxc zxc vvvvvvvvwwwwvvvvvvvvv ad
|
sssssssssssssssssd 1 zxc zxc vvvvvvvvwwwwvvvvvvvvv ad
|
||||||
sssssssssssssssssd qe vvvvvvvvvvvvvvvvvvvvv ad
|
sssssssssssssssssd qe vvvvvvvvvvvvvvvvvvvvv ad
|
||||||
sssssssssssssssssdlllllad 2 hqwwwwwwwwe vvvvvvvvvvvvvvvvvvvvv ad
|
sssssssssssssssssdlllllad 2 qwwwwwwwwe vvvvvvvvvvvvvvvvvvvvv ad
|
||||||
sssssssssssssssssdlllllad bbb s qrsssslssstwe vvvvvvvvvvvvvvvvvvvvv ad
|
sssssssssssssssssdlllllad bbb s qrsssslssstwe vvvvvvvvvvvvvvvvvvvvv ad
|
||||||
sssssssssssssssssdllllladbb s ooqwwrssssllssssstwe !!! qwe vvvvvvvvvvvvvvvvvvvvv + ad
|
sssssssssssssssssdllllladbb s ooqwwrssssllssssstwe ! b h !!! qwe vvvvvvvvvvvvvvvvvvvvv + ad
|
||||||
ssssssssssssssssstwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwrsssssssssssssssstwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwrstwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww3
|
ssssssssssssssssstwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwrsssssssssssssssstwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwrstwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww3
|
|
@ -6,7 +6,10 @@ public class FireBall extends GenericSprite{
|
||||||
private int realX;
|
private int realX;
|
||||||
|
|
||||||
public boolean dead;
|
public boolean dead;
|
||||||
public FireBall(int x, int y, int height, int width, int xv, int yv, String dir) {
|
|
||||||
|
public static final int height = 8;
|
||||||
|
public static final int width = 16;
|
||||||
|
public FireBall(int x, int y, int xv, int yv, String dir) {
|
||||||
super(x, y, height, width);
|
super(x, y, height, width);
|
||||||
xVelocity = xv;
|
xVelocity = xv;
|
||||||
yVelocity = yv;
|
yVelocity = yv;
|
||||||
|
@ -20,6 +23,13 @@ public class FireBall extends GenericSprite{
|
||||||
public void update(){
|
public void update(){
|
||||||
realX = x-GameFrame.game.camera.x;
|
realX = x-GameFrame.game.camera.x;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean collidePlayer(Player p){
|
||||||
|
if(realX+width>p.x&&realX<p.x+Player.PLAYER_WIDTH&&y-p.y<Player.PLAYER_HEIGHT&&p.y-y<height){
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
public void move(){
|
public void move(){
|
||||||
update();
|
update();
|
||||||
if(canUpdate(xVelocity,yVelocity)) {
|
if(canUpdate(xVelocity,yVelocity)) {
|
||||||
|
@ -28,6 +38,10 @@ public class FireBall extends GenericSprite{
|
||||||
} else {
|
} else {
|
||||||
dead = true;
|
dead = true;
|
||||||
}
|
}
|
||||||
|
if(collidePlayer(GameFrame.game.player)){
|
||||||
|
dead = true;
|
||||||
|
GameFrame.game.player.reset();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
public void draw(Graphics g) throws IOException {
|
public void draw(Graphics g) throws IOException {
|
||||||
g.drawImage(GamePanel.getImage(spritePath),x-GameFrame.game.camera.x,y,null);
|
g.drawImage(GamePanel.getImage(spritePath),x-GameFrame.game.camera.x,y,null);
|
||||||
|
|
|
@ -467,7 +467,7 @@ public class GamePanel extends JPanel implements Runnable, KeyListener, Serializ
|
||||||
public void updateShootingBlock(){
|
public void updateShootingBlock(){
|
||||||
for(Tile i: shootingTiles){
|
for(Tile i: shootingTiles){
|
||||||
if(i.shootingDir.equals("left")){
|
if(i.shootingDir.equals("left")){
|
||||||
fireballs.add(new FireBall(i.x-20,i.y+Tile.length/2,8,16,-fireballSpeed,0,"left"));
|
fireballs.add(new FireBall(i.x-20,i.y+Tile.length/2-FireBall.height/2,-fireballSpeed,0,"left"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -130,12 +130,7 @@ public class Player extends GenericSprite {
|
||||||
return canUpdate;
|
return canUpdate;
|
||||||
}
|
}
|
||||||
|
|
||||||
// public boolean SteelCollide(GenericSprite g, int x, int y){
|
|
||||||
// if(x+WIDTH>tile.realX&&x<tile.realX+Tile.length&&y-tile.y<Tile.length&&tile.y-y<HEIGHT){
|
|
||||||
// return true;
|
|
||||||
// }
|
|
||||||
// return false;
|
|
||||||
// }
|
|
||||||
public void updatePlaceSteel(int x, int y){
|
public void updatePlaceSteel(int x, int y){
|
||||||
if(this.y<0){
|
if(this.y<0){
|
||||||
canPlaceSteel = false;
|
canPlaceSteel = false;
|
||||||
|
|
Loading…
Reference in New Issue