Merge remote-tracking branch 'origin/main'

# Conflicts:
#	SMIMS-Game/Player.class
#	SMIMS-Game/Player.ctxt
#	SMIMS-Game/Player.java
#	SMIMS-Game/project.greenfoot

SMIMS-Game/GameOverWorld.ctxt

@@ -0,0 +1,7 @@
+#BlueJ class context
+comment0.target=GameOverWorld
+comment0.text=\r\n\ Write\ a\ description\ of\ class\ GameOverWorld\ here.\r\n\ \r\n\ @author\ (your\ name)\ \r\n\ @version\ (a\ version\ number\ or\ a\ date)\r\n
+comment1.params=
+comment1.target=GameOverWorld()
+comment1.text=\r\n\ Constructor\ for\ objects\ of\ class\ GameOverWorld.\r\n\ \r\n
+numComments=2

SMIMS-Game/GameOverWorld.java

@@ -0,0 +1,21 @@
+import greenfoot.*;  // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
+
+/**
+ * Write a description of class GameOverWorld here.
+ * 
+ * @author (your name) 
+ * @version (a version number or a date)
+ */
+public class GameOverWorld extends World
+{
+
+    /**
+     * Constructor for objects of class GameOverWorld.
+     * 
+     */
+    public GameOverWorld()
+    {    
+        // Create a new world with 600x400 cells with a cell size of 1x1 pixels.
+        super(400, 600, 1); 
+    }
+}

SMIMS-Game/MyWorld.ctxt

@@ -7,4 +7,6 @@ comment1.text=\r\n\ Constructor\ for\ objects\ of\ class\ MyWorld.\r\n\ \r\n
 comment2.params=
 comment2.target=void\ prepare()
 comment2.text=\r\n\ Prepare\ the\ world\ for\ the\ start\ of\ the\ program.\r\n\ That\ is\:\ create\ the\ initial\ objects\ and\ add\ them\ to\ the\ world.\r\n
-numComments=3
+comment3.params=
+comment3.target=void\ act()
+numComments=4

SMIMS-Game/MyWorld.java

@@ -8,7 +8,8 @@ import greenfoot.*;  // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
  */
 public class MyWorld extends World
 {
-
+    int timer = 200;
+    
     /**
      * Constructor for objects of class MyWorld.
      * 
@@ -28,4 +29,15 @@ public class MyWorld extends World
         Player player = new Player();
         addObject(player,302,320);
     }
+    
+    public void act(){
+        if(timer > 0){
+            timer = timer - 1;
+        }
+        else{
+            Projectile projectile = new Projectile();
+            addObject(projectile,Greenfoot.getRandomNumber(300)+50,0);
+            timer = 200;
+        }
+    }
 }

SMIMS-Game/Player.ctxt

@@ -1,11 +1,10 @@
 #BlueJ class context
 comment0.target=Player
+comment0.text=\r\n\ Write\ a\ description\ of\ class\ Player\ here.\r\n\ \r\n\ @author\ (your\ name)\ \r\n\ @version\ (a\ version\ number\ or\ a\ date)\r\n
 comment1.params=
 comment1.target=void\ act()
 comment2.params=
-comment2.target=void\ moveLeftAndRight()
+comment2.target=void\ player_movement()
 comment3.params=
-comment3.target=void\ jump()
-comment4.params=
-comment4.target=void\ fall()
-numComments=5
+comment3.target=boolean\ onGround()
+numComments=4

SMIMS-Game/Player.java

@@ -1,16 +1,24 @@
-import greenfoot.*;
+import greenfoot.*;  // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
 
+/**
+ * Write a description of class Player here.
+ * 
+ * @author (your name) 
+ * @version (a version number or a date)
+ */
 public class Player extends Actor
 {
     private int speed = 4;
     private int jumpStrength = 12;
     private int gravity = 1;
-    
+
     private int verticalSpeed = 0;
     private boolean onGround = false;
 
     public void act()
     {
+        player_movement();
+        collision();
         moveLeftAndRight();
         jump();
         fall();
@@ -71,4 +79,16 @@ public class Player extends Actor
             onGround = false;
         }
     }
+
+    public boolean collision(){
+        if (getIntersectingObjects(Projectile.class).size()>0)
+        {
+            Greenfoot.setWorld(new GameOverWorld());
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
 }

SMIMS-Game/Projectile.ctxt

@@ -0,0 +1,9 @@
+#BlueJ class context
+comment0.target=Projectile
+comment0.text=\r\n\ Write\ a\ description\ of\ class\ Projectile\ here.\r\n\ \r\n\ @author\ (your\ name)\ \r\n\ @version\ (a\ version\ number\ or\ a\ date)\r\n
+comment1.params=
+comment1.target=void\ act()
+comment1.text=\r\n\ Act\ -\ do\ whatever\ the\ Projectile\ wants\ to\ do.\ This\ method\ is\ called\ whenever\r\n\ the\ 'Act'\ or\ 'Run'\ button\ gets\ pressed\ in\ the\ environment.\r\n
+comment2.params=
+comment2.target=void\ falling()
+numComments=3

SMIMS-Game/Projectile.java

@@ -0,0 +1,26 @@
+import greenfoot.*;  // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
+
+/**
+ * Write a description of class Projectile here.
+ * 
+ * @author (your name) 
+ * @version (a version number or a date)
+ */
+public class Projectile extends Actor
+{
+    /**
+     * Act - do whatever the Projectile wants to do. This method is called whenever
+     * the 'Act' or 'Run' button gets pressed in the environment.
+     */
+    public void act()
+    {
+        falling();
+    }
+    
+    public void falling(){
+        setLocation(getX(), getY() + 5);
+        if(getY() > getWorld().getHeight() -5){
+            getWorld().removeObject(this);
+        }
+    }
+}

SMIMS-Game/project.greenfoot

@@ -1,25 +1,19 @@
 #Greenfoot project file
 class.Ground.image=weave.jpg
 class.Player.image=ppl2.png
-dependency1.from=PlayerTestWorld
-dependency1.to=Ground
+dependency1.from=MyWorld
+dependency1.to=Player
 dependency1.type=UsesDependency
-dependency2.from=PlayerTestWorld
-dependency2.to=Player
+dependency2.from=Player
+dependency2.to=Ground
 dependency2.type=UsesDependency
-dependency3.from=MyWorld
-dependency3.to=Player
-dependency3.type=UsesDependency
-dependency4.from=Player
-dependency4.to=Ground
-dependency4.type=UsesDependency
-editor.fx.0.height=737
-editor.fx.0.width=814
-editor.fx.0.x=360
-editor.fx.0.y=26
-height=830
-package.numDependencies=4
-package.numTargets=4
+editor.fx.0.height=0
+editor.fx.0.width=0
+editor.fx.0.x=0
+editor.fx.0.y=0
+height=736
+package.numDependencies=2
+package.numTargets=3
 project.charset=UTF-8
 publish.hasSource=false
 publish.locked=true
@@ -49,21 +43,14 @@ target2.width=120
 target2.x=0
 target2.y=0
 target3.height=70
-target3.name=PlayerTestWorld
+target3.name=MyWorld
 target3.showInterface=false
 target3.type=ClassTarget
 target3.width=120
 target3.x=0
 target3.y=0
-target4.height=70
-target4.name=MyWorld
-target4.showInterface=false
-target4.type=ClassTarget
-target4.width=120
-target4.x=0
-target4.y=0
 version=3.1.0
-width=1550
-world.lastInstantiated=PlayerTestWorld
-xPosition=0
-yPosition=0
+width=856
+world.lastInstantiated=MyWorld
+xPosition=652
+yPosition=76