diff --git a/core/src/com/dungeoncrawler/model/entities/Archer.java b/core/src/com/dungeoncrawler/model/entities/Archer.java index e24ca77..7c674ad 100644 --- a/core/src/com/dungeoncrawler/model/entities/Archer.java +++ b/core/src/com/dungeoncrawler/model/entities/Archer.java @@ -88,7 +88,7 @@ public class Archer extends Entity{ @Override public Entity shoot(int xPosPlayer, int yPosPlayer){ - Arrow a = null; + Projectile a = null; if(!isToDelete()){ float deltaX = xPosPlayer - (int) xPos; @@ -114,7 +114,7 @@ public class Archer extends Entity{ alpha = 2*Math.PI - alpha; } } - a = new Arrow(this.xPos + 32, this.yPos + 32, this.lvl, 0); + a = new Projectile(this.xPos + 32, this.yPos + 32, this.lvl, 2); movementX = (int) (6 * Math.cos(alpha)); movementY = (int) (6 * Math.sin(alpha)); diff --git a/core/src/com/dungeoncrawler/model/entities/Arrow.java b/core/src/com/dungeoncrawler/model/entities/Projectile.java similarity index 85% rename from core/src/com/dungeoncrawler/model/entities/Arrow.java rename to core/src/com/dungeoncrawler/model/entities/Projectile.java index 9374f04..aae0df4 100644 --- a/core/src/com/dungeoncrawler/model/entities/Arrow.java +++ b/core/src/com/dungeoncrawler/model/entities/Projectile.java @@ -8,19 +8,18 @@ package com.dungeoncrawler.model.entities; import com.dungeoncrawler.model.Entity; -public class Arrow extends Entity{ +public class Projectile extends Entity{ float xStart; float yStart; int direction; int lifetime; - public Arrow(float xPos, float yPos, int lvl, int direction){ + public Projectile(float xPos, float yPos, int lvl, int id){ super(xPos, yPos, lvl); xStart = xPos; yStart = yPos; - this.direction = direction; this.dmg = 3*lvl; - this.id = 2; + this.id = id; type = 2; this.lifetime = 0; } diff --git a/core/src/com/dungeoncrawler/model/entities/Wizard.java b/core/src/com/dungeoncrawler/model/entities/Wizard.java index 8fd9ca4..3abaf9f 100644 --- a/core/src/com/dungeoncrawler/model/entities/Wizard.java +++ b/core/src/com/dungeoncrawler/model/entities/Wizard.java @@ -96,7 +96,7 @@ public class Wizard extends Entity{ @Override public Entity shoot(int xPosPlayer, int yPosPlayer){ - Arrow a = null; + Projectile a = null; if(!isToDelete()){ float deltaX = xPosPlayer - (int) xPos; @@ -122,7 +122,7 @@ public class Wizard extends Entity{ alpha = 2*Math.PI - alpha; } } - a = new Arrow(this.xPos + 32, this.yPos + 32, this.lvl, 0); + a = new Projectile(this.xPos + 32, this.yPos + 32, this.lvl, 4); movementX = (int) (6 * Math.cos(alpha)); movementY = (int) (6 * Math.sin(alpha)); diff --git a/core/src/com/dungeoncrawler/view/GameScreen.java b/core/src/com/dungeoncrawler/view/GameScreen.java index 2ab3396..8b81528 100644 --- a/core/src/com/dungeoncrawler/view/GameScreen.java +++ b/core/src/com/dungeoncrawler/view/GameScreen.java @@ -271,11 +271,16 @@ public class GameScreen { tx[0] = new Texture("sprites/wizard.png"); entitySprites[i] = new EntitySprite(tx, 64, 64); break; + + case 4: + tx[0] = new Texture("sprites/spell.png"); + entitySprites[i] = new EntitySprite(tx, 32, 32); + break; } entitySprites[i].update((int) e.getxPos() + 32, (int) e.getyPos() + 32); - if(e.getId() == 2){ + if(e.getType() == 2){ entitySprites[i].getSprites()[0].setRotation((float) Math.toDegrees(e.getAngle())); }