Merge remote-tracking branch 'origin/main'

SMIMS-Game/Player.ctxt

@@ -1,10 +1,11 @@
 #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\ player_movement()
+comment2.target=void\ moveLeftAndRight()
 comment3.params=
-comment3.target=boolean\ onGround()
+comment3.target=void\ jump()
-numComments=4
+comment4.params=
+comment4.target=void\ fall()
+numComments=5

SMIMS-Game/Player.java

@@ -1,38 +1,74 @@
-import greenfoot.*;  // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
+import greenfoot.*;
 
-/**
- * Write a description of class Player here.
- * 
- * @author (your name) 
- * @version (a version number or a date)
- */
 public class Player extends Actor
 {
-    int velocityY = 0;
+    private int speed = 4;
-    int speed = 5;
+    private int jumpStrength = 12;
+    private int gravity = 1;
+    
+    private int verticalSpeed = 0;
+    private boolean onGround = false;
+
     public void act()
     {
-        player_movement();
+        moveLeftAndRight();
+        jump();
+        fall();
     }
-    
+
-    public void player_movement(){
+    // Bewegung nach links und rechts
-        if (Greenfoot.isKeyDown("D")){
+    private void moveLeftAndRight()
-            setLocation(getX()+speed, getY());
+    {
+        if (Greenfoot.isKeyDown("a"))
+        {
+            setLocation(getX() - speed, getY());
         }
-        if (Greenfoot.isKeyDown("A")){
+
-            setLocation(getX()-speed, getY());
+        if (Greenfoot.isKeyDown("d"))
+        {
+            setLocation(getX() + speed, getY());
         }
     }
-    
+
-    public boolean onGround(){
+    // Springen
-        int height = getImage().getHeight();
+    private void jump()
-        
+    {
-        Actor floor = getOneObjectAtOffset(
+        if (Greenfoot.isKeyDown("space") && onGround)
-            0,
+        {
-            height / 2 + 1,
+            verticalSpeed = -jumpStrength;
-            Ground.class
+            onGround = false;
-        );
+        }
-        
+    }
-        return floor != null;
+
+    // Schwerkraft und Boden-Kollision
+    private void fall()
+    {
+        verticalSpeed += gravity;
+
+        int newY = getY() + verticalSpeed;
+
+        // Prüfen, ob wir auf Ground landen
+        setLocation(getX(), newY);
+
+        Actor ground = getOneIntersectingObject(Ground.class);
+
+        if (ground != null)
+        {
+            // Wenn wir fallen, stehen wir auf dem Ground
+            if (verticalSpeed >= 0)
+            {
+                int groundTop = ground.getY() - ground.getImage().getHeight() / 2;
+                int characterHalfHeight = getImage().getHeight() / 2;
+
+                setLocation(getX(), groundTop - characterHalfHeight);
+
+                verticalSpeed = 0;
+                onGround = true;
+            }
+        }
+        else
+        {
+            onGround = false;
+        }
     }
 }

SMIMS-Game/PlayerTestWorld.ctxt

@@ -0,0 +1,10 @@
+#BlueJ class context
+comment0.target=PlayerTestWorld
+comment0.text=\r\n\ Write\ a\ description\ of\ class\ PlayerTestWorld\ here.\r\n\ \r\n\ @author\ (your\ name)\ \r\n\ @version\ (a\ version\ number\ or\ a\ date)\r\n
+comment1.params=
+comment1.target=PlayerTestWorld()
+comment1.text=\r\n\ Constructor\ for\ objects\ of\ class\ PlayerTestWorld.\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

SMIMS-Game/PlayerTestWorld.java

@@ -0,0 +1,33 @@
+import greenfoot.*;  // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
+
+/**
+ * Write a description of class PlayerTestWorld here.
+ * 
+ * @author (your name) 
+ * @version (a version number or a date)
+ */
+public class PlayerTestWorld extends World
+{
+
+    /**
+     * Constructor for objects of class PlayerTestWorld.
+     * 
+     */
+    public PlayerTestWorld()
+    {    
+        // Create a new world with 600x400 cells with a cell size of 1x1 pixels.
+        super(600, 400, 1); 
+        prepare();
+    }
+    /**
+     * Prepare the world for the start of the program.
+     * That is: create the initial objects and add them to the world.
+     */
+    private void prepare()
+    {
+        Ground ground = new Ground();
+        addObject(ground,260,375);
+        Player player = new Player();
+        addObject(player,264,237);
+    }
+}

SMIMS-Game/project.greenfoot

@@ -1,19 +1,25 @@
 #Greenfoot project file
 class.Ground.image=weave.jpg
 class.Player.image=ppl2.png
-dependency1.from=MyWorld
+dependency1.from=PlayerTestWorld
-dependency1.to=Player
+dependency1.to=Ground
 dependency1.type=UsesDependency
-dependency2.from=Player
+dependency2.from=PlayerTestWorld
-dependency2.to=Ground
+dependency2.to=Player
 dependency2.type=UsesDependency
-editor.fx.0.height=0
+dependency3.from=MyWorld
-editor.fx.0.width=0
+dependency3.to=Player
-editor.fx.0.x=0
+dependency3.type=UsesDependency
-editor.fx.0.y=0
+dependency4.from=Player
-height=736
+dependency4.to=Ground
-package.numDependencies=2
+dependency4.type=UsesDependency
-package.numTargets=3
+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
 project.charset=UTF-8
 publish.hasSource=false
 publish.locked=true
@@ -43,14 +49,21 @@ target2.width=120
 target2.x=0
 target2.y=0
 target3.height=70
-target3.name=MyWorld
+target3.name=PlayerTestWorld
 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=856
+width=1550
-world.lastInstantiated=MyWorld
+world.lastInstantiated=PlayerTestWorld
-xPosition=652
+xPosition=0
-yPosition=76
+yPosition=0