update

Author: spynetS

src/com/javagamemaker/testing/spel2/Bullet.java

@@ -16,6 +16,7 @@ public Bullet(Vector2 startPos, Vector2 dir){
         add(p);
         Collider c = new Collider(true);
         c.setTrigger(true);
+        c.setTag("bullet");
         add(c);
         setPosition(startPos);
         setScale(new Vector2(20,20));

src/com/javagamemaker/testing/spel2/Enemy.java

@@ -14,6 +14,7 @@ public class Enemy extends Sprite {
     public Enemy(Vector2 pos){
         Collider c = new Collider(false);
         c.setTrigger(true);
+        c.setTag("enemy");
         add(c);
 
         setPosition(pos.subtract(new Vector2(50,0)));
@@ -56,8 +57,11 @@ public void animationDone() {
     @Override
     protected void onTriggerEnter(CollisionEvent collisionEvent) {
         super.onTriggerEnter(collisionEvent);
-        if(animationIndex == 0)
+        if(animationIndex == 0 && collisionEvent.getCollider2().getTag()=="bullet")
+        {
+            collisionEvent.getCollider2().getFirstParent().destroy();
             Scene.playSound("/spel2/sound/watersplash.wav");
+        }
         animationIndex = 1;
         setTimer(4);
     }

src/com/javagamemaker/testing/spel2/Level1.java

@@ -14,6 +14,8 @@
 public class Level1 extends Scene {
     public static JLabel coinsLabel = new JLabel("Coins: 0");
     public Level1(){
+        Main.player = new Player();
+        Main.player.setPosition(new Vector2(0,-200));
         // ui
         Debug.showWhere = true;
         LightManager.opacity = 0.99f;

src/com/javagamemaker/testing/spel2/Main.java

@@ -10,11 +10,10 @@
 
 /**TODO
  * Add shooting to cookie
- * make enemy dangerus to cookie (not its shooting)
- * count milk
- * count hight
- * save milk and hight
+ * count height
+ * save milk and height
  * pause menu (restart, main menu, toggle music)
+ * generate more enemies by height
  */
 public class Main extends JavaGameEngine {
     public static Player player;

src/com/javagamemaker/testing/spel2/Player.java

@@ -98,6 +98,14 @@ public void update() {
         JavaGameEngine.getSelectedScene().getCamera().setPosition(getPosition().removeX().subtract(JavaGameEngine.getWindowSize().divide(2)).multiply(-1));
     }
 
+    @Override
+    protected void onTriggerEnter(CollisionEvent collisionEvent) {
+        super.onTriggerEnter(collisionEvent);
+        if(collisionEvent.getCollider1().getTag() == "enemy"){
+            Main.setSelectedScene(new Splashscreen());
+        }
+    }
+
     @Override
     public void onCollisionEnter(CollisionEvent collisionEvent) {
         super.onCollisionEnter(collisionEvent);