diff --git a/Bee.java b/Bee.java index 0ded865..352d57b 100755 --- a/Bee.java +++ b/Bee.java @@ -19,8 +19,9 @@ public void addedToWorld(World w) { @Override public void act() { - super.act(); + attack(); collision(); + super.act(); } } diff --git a/BlueBee.java b/BlueBee.java index a7bdcc5..fd31141 100755 --- a/BlueBee.java +++ b/BlueBee.java @@ -20,9 +20,10 @@ public void addedToWorld(World w) { } public void act() { - super.act(); + movement(); collision(); + super.act(); } private void movement() { diff --git a/Coin.java b/Coin.java index 2f8b261..ad6164d 100644 --- a/Coin.java +++ b/Coin.java @@ -7,13 +7,14 @@ * @author (your name) * @version (a version number or a date) */ -public class Coin extends Actor { +public class Coin extends Collection { private GreenfootImage image; - + public Coin(){ image = new GreenfootImage("coin.png"); - image.scale(45,55); + image.scale(45,45); setImage(image); + } /** @@ -25,9 +26,6 @@ public void act() { getWorld().removeObject(this); Level.addToTotalCoin(); } - } - - public boolean isBeingTouched() { - return isTouching(Player.class); + } } diff --git a/Level.java b/Level.java index 649e13b..f74cb8b 100755 --- a/Level.java +++ b/Level.java @@ -8,6 +8,7 @@ public class Level extends World { protected static int totalCoins = 0; + protected static int numOfCrown=0; private final int[] worldSize = {2560, 720}; private final String background = "2dPixelForestBackground.png"; private final Font font = new Font("Arial", 18); @@ -24,10 +25,12 @@ public Level() { public static void addToTotalCoin() { totalCoins++; } - + public static void addCrown(){ + numOfCrown++; + } public void spawnFloor(ImgScroll sc) { for (int j = 0; j < sc.getScrollHeight() - 100; j += 300) { - for (int i = 0; i < sc.getScrollWidth(); i += 63) { + for (int i = 0; i < sc.getScrollWidth()+64; i += 63) { addObject(new Brick(), i, 700); } } diff --git a/Mobs.java b/Mobs.java index 3050089..b4313ee 100755 --- a/Mobs.java +++ b/Mobs.java @@ -101,7 +101,7 @@ public Player getPlayer(int range) { return null; } public void stepped(){ - if(getOneObjectAtOffset(getX(), getY()-1, Player.class)!=null){ + if(getOneObjectAtOffset(getX(), -(getImage().getHeight()/2), Player.class)!=null){ getWorld().removeObject(this); } } diff --git a/RedBee.java b/RedBee.java index 9c7fbfe..f436261 100755 --- a/RedBee.java +++ b/RedBee.java @@ -18,14 +18,14 @@ public RedBee(int range) { @Override public void act() { - super.act(); + curSpeed = speed; if (getPlayer(range) != null) { sprint(); } else { idle(); } - + super.act(); } diff --git a/Spider.java b/Spider.java index aa9d418..b79cf42 100755 --- a/Spider.java +++ b/Spider.java @@ -69,7 +69,7 @@ public void timeout() { } if (oob) { long elapsedTime = System.currentTimeMillis() - startTime; - if (elapsedTime > 10 * 1000) { + if (elapsedTime > 10 * 1000 && getWorld() != null) { w.removeObject(this); } }