Admin/SMIMS_2026_2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
Marlie
2026-09-17 11:55:57 +02:00
parent a7cfa6923a fe6d466cd6
commit 69e753d5a8
6 changed files with 86 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SMIMS-Game/MyWorld.class
BIN
View File
Binary file not shown.
SMIMS-Game/MyWorld.ctxt
+8 -6
View File
@@ -10,13 +10,15 @@ comment2.text=\r\n\ Prepare\ the\ world\ for\ the\ start\ of\ the\ program.\r\n\
comment3.params=
comment3.target=void\ act()
comment4.params=
comment4.target=void\ spawnItems()
comment4.target=void\ drawNewHearts()
comment5.params=
comment5.target=void\ spawnEnemies()
comment5.target=void\ spawnItems()
comment6.params=
comment6.target=void\ projectile()
comment6.target=void\ spawnEnemies()
comment7.params=
comment7.target=void\ targetingProjectile()
comment7.target=void\ projectile()
comment8.params=
comment8.target=void\ showScore()
numComments=9
comment8.target=void\ targetingProjectile()
comment9.params=
comment9.target=void\ showScore()
numComments=10
SMIMS-Game/MyWorld.java
+20
View File
@@ -84,6 +84,7 @@ public class MyWorld extends World
spawnEnemies();
targetingProjectile();
spawnItems();
drawNewHearts();
if(PlattformCountdown==0) //Damit in regelmäßigen Abständen auf jeden Fall eine Plattform auftaucht
{
addObject(new Plattform(), 1+Greenfoot.getRandomNumber(398), 5);
@@ -106,6 +107,25 @@ public class MyWorld extends World
{
addObject(new BreakingPlattform(50), 1+Greenfoot.getRandomNumber(398), 6); //Nach Links bewegende Plattform
}
if(Greenfoot.getRandomNumber(100000)>=99750)
{
addObject(new SpikedPlattform(100), 1+Greenfoot.getRandomNumber(398), 6); //Nach Links bewegende Plattform
}
}
public void drawNewHearts(){
Player player = getObjects(Player.class).get(0);
removeObjects(getObjects(Heart.class));
Heart heart = new Heart();
addObject(heart,371,27);
if (player.health >= 2){
Heart heart2 = new Heart();
addObject(heart2,343,27);
}
if (player.health == 3){
Heart heart3 = new Heart();
addObject(heart3,314,27);
}
}
public void spawnItems(){
SMIMS-Game/Player.class
BIN
View File
Binary file not shown.
SMIMS-Game/Player.java
+2 -14
View File
@@ -54,11 +54,13 @@ public class Player extends Actor
if (Greenfoot.isKeyDown("a"))
{
setLocation(getX() - speed, getY());
setImage("Player.png");
}
if (Greenfoot.isKeyDown("d"))
{
setLocation(getX() + speed, getY());
setImage("Player.png");
}
}
@@ -120,15 +122,6 @@ public class Player extends Actor
getWorld().removeObjects(getIntersectingObjects(Projectile.class));
getWorld().removeObjects(getIntersectingObjects(Enemy.class));
getWorld().removeObjects(getWorld().getObjects(Spike.class));
getWorld().removeObjects(getIntersectingObjects(Spike.class));
if (getWorld().getObjects(Heart.class) != null){
if (health == 2){
getWorld().getObjects(Heart.class).get(2).setImage("a.png");
} else if (health == 1){
getWorld().getObjects(Heart.class).get(1).setImage("a.png");
}
}
}
}
@@ -157,11 +150,6 @@ public class Player extends Actor
break;
case "Heal":
if (health < MAX_HEALTH){
if (health == 2){
getWorld().getObjects(Heart.class).get(2).setImage("Health.png");
} else if (health == 1){
getWorld().getObjects(Heart.class).get(1).setImage("Health.png");
}
health++;
}
break;
SMIMS-Game/project.greenfoot
+56 -51
View File
@@ -1,8 +1,7 @@
#Greenfoot project file
class.BreakingPlattform.image=Breaking1.png
class.Button.image=button-red.png
class.Enemy.image=Enemy.png
class.EnemyProjectile.image=EnemyProjectile.png
class.Enemy.image=bee.png
class.GameOverWorld.image=GameOverBackground.png
class.Ground.image=weave.jpg
class.Groundflower.image=flower2.png
@@ -13,13 +12,12 @@ class.MovingPlattform.image=Platform1.png
class.MyWorld.image=GameBackground.png
class.Plattform.image=Platform1.png
class.Player.image=Player.png
class.PlayerProjectile.image=PlayerProjectile.png
class.PlayerProjectile.image=beeper.png
class.Projectile.image=Projectile1.png
class.Spike.image=singleSpike.png
class.SpikedPlattform.image=Spikes2.png
class.StartWorld.image=StartBackground.png
class.TargetingProjectile.image=TargetProjectile.png
class.TemporaryGround.image=Ground.png
class.TargetingProjectile.image=blue-draught.png
class.UnactiveSpike.image=inactiveSpike.png
dependency1.from=PlayerTestWorld
dependency1.to=Ground
@@ -28,91 +26,91 @@ dependency10.from=MyWorld
dependency10.to=BreakingPlattform
dependency10.type=UsesDependency
dependency11.from=MyWorld
dependency11.to=Groundflower
dependency11.to=SpikedPlattform
dependency11.type=UsesDependency
dependency12.from=MyWorld
dependency12.to=HealthItem
dependency12.to=Groundflower
dependency12.type=UsesDependency
dependency13.from=MyWorld
dependency13.to=JumpBoostItem
dependency13.to=Enemy
dependency13.type=UsesDependency
dependency14.from=MyWorld
dependency14.to=Enemy
dependency14.to=Projectile
dependency14.type=UsesDependency
dependency15.from=MyWorld
dependency15.to=Projectile
dependency15.to=TargetingProjectile
dependency15.type=UsesDependency
dependency16.from=MyWorld
dependency16.to=TargetingProjectile
dependency16.from=GameOverWorld
dependency16.to=Button
dependency16.type=UsesDependency
dependency17.from=GameOverWorld
dependency17.from=StartWorld
dependency17.to=Button
dependency17.type=UsesDependency
dependency18.from=StartWorld
dependency18.to=Button
dependency18.from=UnactiveSpike
dependency18.to=SpikedPlattform
dependency18.type=UsesDependency
dependency19.from=UnactiveSpike
dependency19.to=SpikedPlattform
dependency19.to=MyWorld
dependency19.type=UsesDependency
dependency2.from=PlayerTestWorld
dependency2.to=Player
dependency2.type=UsesDependency
dependency20.from=UnactiveSpike
dependency20.to=MyWorld
dependency20.to=Spike
dependency20.type=UsesDependency
dependency21.from=UnactiveSpike
dependency21.to=Spike
dependency21.from=Button
dependency21.to=MyWorld
dependency21.type=UsesDependency
dependency22.from=Button
dependency22.to=MyWorld
dependency22.from=PowerUps
dependency22.to=Player
dependency22.type=UsesDependency
dependency23.from=PowerUps
dependency23.from=HealthItem
dependency23.to=Player
dependency23.type=UsesDependency
dependency24.from=HealthItem
dependency24.from=JumpBoostItem
dependency24.to=Player
dependency24.type=UsesDependency
dependency25.from=JumpBoostItem
dependency25.from=Groundflower
dependency25.to=Player
dependency25.type=UsesDependency
dependency26.from=Groundflower
dependency26.from=Enemy
dependency26.to=Player
dependency26.type=UsesDependency
dependency27.from=Enemy
dependency27.to=Player
dependency27.to=EnemyProjectile
dependency27.type=UsesDependency
dependency28.from=Enemy
dependency28.to=EnemyProjectile
dependency28.from=Spike
dependency28.to=MyWorld
dependency28.type=UsesDependency
dependency29.from=Spike
dependency29.to=MyWorld
dependency29.from=Player
dependency29.to=GameOverWorld
dependency29.type=UsesDependency
dependency3.from=PlayerTestWorld
dependency3.to=JumpBoostItem
dependency3.type=UsesDependency
dependency30.from=Player
dependency30.to=GameOverWorld
dependency30.to=Plattform
dependency30.type=UsesDependency
dependency31.from=Player
dependency31.to=Plattform
dependency31.to=PlayerProjectile
dependency31.type=UsesDependency
dependency32.from=Player
dependency32.to=PlayerProjectile
dependency32.to=TemporaryGround
dependency32.type=UsesDependency
dependency33.from=Player
dependency33.to=TemporaryGround
dependency33.to=Projectile
dependency33.type=UsesDependency
dependency34.from=Player
dependency34.to=Projectile
dependency34.to=Enemy
dependency34.type=UsesDependency
dependency35.from=Player
dependency35.to=Enemy
dependency35.to=Spike
dependency35.type=UsesDependency
dependency36.from=Player
dependency36.to=Spike
dependency36.to=Heart
dependency36.type=UsesDependency
dependency37.from=Player
dependency37.to=Heart
dependency37.from=Healthbar
dependency37.to=Player
dependency37.type=UsesDependency
dependency38.from=Plattform
dependency38.to=MyWorld
@@ -167,11 +165,11 @@ dependency9.to=MovingPlattform
dependency9.type=UsesDependency
editor.fx.0.height=737
editor.fx.0.width=814
editor.fx.0.x=204
editor.fx.0.y=64
editor.fx.0.x=386
editor.fx.0.y=48
height=830
package.numDependencies=48
package.numTargets=25
package.numTargets=26
project.charset=UTF-8
publish.hasSource=false
publish.locked=true
@@ -243,21 +241,21 @@ target16.width=120
target16.x=0
target16.y=0
target17.height=70
target17.name=BreakingPlattform
target17.name=Healthbar
target17.showInterface=false
target17.type=ClassTarget
target17.width=120
target17.x=0
target17.y=0
target18.height=70
target18.name=GameOverWorld
target18.name=BreakingPlattform
target18.showInterface=false
target18.type=ClassTarget
target18.width=120
target18.x=0
target18.y=0
target19.height=70
target19.name=StartWorld
target19.name=GameOverWorld
target19.showInterface=false
target19.type=ClassTarget
target19.width=120
@@ -271,47 +269,54 @@ target2.width=120
target2.x=0
target2.y=0
target20.height=70
target20.name=Plattform
target20.name=StartWorld
target20.showInterface=false
target20.type=ClassTarget
target20.width=120
target20.x=0
target20.y=0
target21.height=70
target21.name=Projectile
target21.name=Plattform
target21.showInterface=false
target21.type=ClassTarget
target21.width=120
target21.x=0
target21.y=0
target22.height=70
target22.name=Score
target22.name=Projectile
target22.showInterface=false
target22.type=ClassTarget
target22.width=120
target22.x=0
target22.y=0
target23.height=70
target23.name=EnemyProjectile
target23.name=Score
target23.showInterface=false
target23.type=ClassTarget
target23.width=120
target23.x=0
target23.y=0
target24.height=70
target24.name=PlayerProjectile
target24.name=EnemyProjectile
target24.showInterface=false
target24.type=ClassTarget
target24.width=120
target24.x=0
target24.y=0
target25.height=70
target25.name=SpikedPlattform
target25.name=PlayerProjectile
target25.showInterface=false
target25.type=ClassTarget
target25.width=120
target25.x=0
target25.y=0
target26.height=70
target26.name=SpikedPlattform
target26.showInterface=false
target26.type=ClassTarget
target26.width=120
target26.x=0
target26.y=0
target3.height=70
target3.name=Ground
target3.showInterface=false