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 
# Conflicts:
#	SMIMS-Game/MyWorld.class
#	SMIMS-Game/SpikedPlattform.class
#	SMIMS-Game/SpikedPlattform.java
#	SMIMS-Game/project.greenfoot
This commit is contained in:
Marlie
2026-09-17 16:08:24 +02:00
parent 8a15fa5a51 c0b6517f14
commit c52ba44c44
4 changed files with 68 additions and 7 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.java
+1 -1
View File
@@ -109,7 +109,7 @@ public class MyWorld extends World
} }
if(Greenfoot.getRandomNumber(100000)>=99750) if(Greenfoot.getRandomNumber(100000)>=99750)
{ {
addObject(new SpikedPlattform(100), 1+Greenfoot.getRandomNumber(398), 6); //Nach Links bewegende Plattform addObject(new SpikedPlattform(40), 1+Greenfoot.getRandomNumber(398), 6); //Nach Links bewegende Plattform
} }
} }
SMIMS-Game/SpikedPlattform.class
BIN
View File
Binary file not shown.
SMIMS-Game/project.greenfoot
+67 -6
View File
@@ -1,6 +1,6 @@
#Greenfoot project file #Greenfoot project file
class.BreakingPlattform.image=Breaking1.png class.BreakingPlattform.image=Breaking1.png
class.Button.image=button-red.png class.Button.image=Start.png
class.Enemy.image=Enemy.png class.Enemy.image=Enemy.png
class.EnemyProjectile.image=EnemyProjectile.png class.EnemyProjectile.image=EnemyProjectile.png
class.GameOverWorld.image=JUMP\ \u2018N\u2019\ RUNj.png class.GameOverWorld.image=JUMP\ \u2018N\u2019\ RUNj.png
@@ -15,9 +15,12 @@ class.Plattform.image=Platform1.png
class.Player.image=Player.png class.Player.image=Player.png
class.PlayerProjectile.image=PlayerProjectile.png class.PlayerProjectile.image=PlayerProjectile.png
class.Projectile.image=Projectile1.png class.Projectile.image=Projectile1.png
class.Score.image=Score1.png
class.Spike.image=singleSpike.png class.Spike.image=singleSpike.png
class.SpikedPlattform.image=Spikes2.png class.SpikedPlattform.image=Spikes2.png
class.StartWorld.image=Startbild.png class.StartWorld.image=Startbild.png
class.SpikedPlattform.image=Spikes.png
class.StartWorld.image=StartBackground.png
class.TargetingProjectile.image=TargetProjectile.png class.TargetingProjectile.image=TargetProjectile.png
class.TemporaryGround.image=Ground.png class.TemporaryGround.image=Ground.png
class.UnactiveSpike.image=Spike_Copy.png class.UnactiveSpike.image=Spike_Copy.png
@@ -53,100 +56,152 @@ dependency18.to=Button
dependency18.type=UsesDependency dependency18.type=UsesDependency
dependency19.from=GameOverWorld dependency19.from=GameOverWorld
dependency19.to=Score dependency19.to=Score
dependency19.from=StartWorld
dependency19.to=Button
dependency19.type=UsesDependency dependency19.type=UsesDependency
dependency2.from=PlayerTestWorld dependency2.from=PlayerTestWorld
dependency2.to=Player dependency2.to=Player
dependency2.type=UsesDependency dependency2.type=UsesDependency
dependency20.from=StartWorld dependency20.from=StartWorld
dependency20.to=Button dependency20.to=Button
dependency20.from=UnactiveSpike
dependency20.to=SpikedPlattform
dependency20.type=UsesDependency dependency20.type=UsesDependency
dependency21.from=UnactiveSpike dependency21.from=UnactiveSpike
dependency21.to=SpikedPlattform dependency21.to=SpikedPlattform
dependency21.from=UnactiveSpike
dependency21.to=MyWorld
dependency21.type=UsesDependency dependency21.type=UsesDependency
dependency22.from=UnactiveSpike dependency22.from=UnactiveSpike
dependency22.to=MyWorld dependency22.to=MyWorld
dependency22.from=UnactiveSpike
dependency22.to=Spike
dependency22.type=UsesDependency dependency22.type=UsesDependency
dependency23.from=UnactiveSpike dependency23.from=UnactiveSpike
dependency23.to=Spike dependency23.to=Spike
dependency23.from=Button
dependency23.to=MyWorld
dependency23.type=UsesDependency dependency23.type=UsesDependency
dependency24.from=PowerUps
dependency24.to=Player
dependency24.from=Button dependency24.from=Button
dependency24.to=MyWorld dependency24.to=MyWorld
dependency24.type=UsesDependency dependency24.type=UsesDependency
dependency25.from=HealthItem
dependency25.from=PowerUps dependency25.from=PowerUps
dependency25.to=Player dependency25.to=Player
dependency25.type=UsesDependency dependency25.type=UsesDependency
dependency26.from=JumpBoostItem
dependency26.from=HealthItem dependency26.from=HealthItem
dependency26.to=Player dependency26.to=Player
dependency26.type=UsesDependency dependency26.type=UsesDependency
dependency27.from=Groundflower
dependency27.to=Player
dependency27.from=JumpBoostItem dependency27.from=JumpBoostItem
dependency27.to=Player dependency27.to=Player
dependency27.type=UsesDependency dependency27.type=UsesDependency
dependency28.from=Enemy
dependency28.to=Player
dependency28.from=Groundflower dependency28.from=Groundflower
dependency28.to=Player dependency28.to=Player
dependency28.type=UsesDependency dependency28.type=UsesDependency
dependency29.from=Enemy dependency29.from=Enemy
dependency29.to=Player dependency29.to=Player
dependency29.from=Enemy
dependency29.to=EnemyProjectile
dependency29.type=UsesDependency dependency29.type=UsesDependency
dependency3.from=PlayerTestWorld dependency3.from=PlayerTestWorld
dependency3.to=JumpBoostItem dependency3.to=JumpBoostItem
dependency3.type=UsesDependency dependency3.type=UsesDependency
dependency30.from=Enemy dependency30.from=Enemy
dependency30.to=EnemyProjectile dependency30.to=EnemyProjectile
dependency30.from=Spike
dependency30.to=MyWorld
dependency30.type=UsesDependency dependency30.type=UsesDependency
dependency31.from=Spike dependency31.from=Spike
dependency31.to=MyWorld dependency31.to=MyWorld
dependency31.from=Player
dependency31.to=GameOverWorld
dependency31.type=UsesDependency dependency31.type=UsesDependency
dependency32.from=Player dependency32.from=Player
dependency32.to=Plattform
dependency32.to=MyWorld dependency32.to=MyWorld
dependency32.type=UsesDependency dependency32.type=UsesDependency
dependency33.from=Player dependency33.from=Player
dependency33.to=PlayerProjectile
dependency33.to=GameOverWorld dependency33.to=GameOverWorld
dependency33.type=UsesDependency dependency33.type=UsesDependency
dependency34.from=Player dependency34.from=Player
dependency34.to=Plattform dependency34.to=Plattform
dependency34.to=TemporaryGround
dependency34.type=UsesDependency dependency34.type=UsesDependency
dependency35.from=Player dependency35.from=Player
dependency35.to=PlayerProjectile dependency35.to=PlayerProjectile
dependency35.to=Projectile
dependency35.type=UsesDependency dependency35.type=UsesDependency
dependency36.from=Player dependency36.from=Player
dependency36.to=TemporaryGround dependency36.to=TemporaryGround
dependency36.to=Enemy
dependency36.type=UsesDependency dependency36.type=UsesDependency
dependency37.from=Player dependency37.from=Player
dependency37.to=Projectile dependency37.to=Projectile
dependency37.from=Player
dependency37.to=Spike
dependency37.type=UsesDependency dependency37.type=UsesDependency
dependency38.from=Player dependency38.from=Player
dependency38.to=Enemy dependency38.to=Enemy
dependency38.from=Plattform
dependency38.to=MyWorld
dependency38.type=UsesDependency dependency38.type=UsesDependency
dependency39.from=Player dependency39.from=Player
dependency39.to=Spike dependency39.to=Spike
dependency39.from=Plattform
dependency39.to=Player
dependency39.type=UsesDependency dependency39.type=UsesDependency
dependency4.from=MyWorld dependency4.from=MyWorld
dependency4.to=Player dependency4.to=Player
dependency4.type=UsesDependency dependency4.type=UsesDependency
dependency40.from=Plattform dependency40.from=Plattform
dependency40.to=MyWorld dependency40.to=MyWorld
dependency40.from=MovingPlattform
dependency40.to=MyWorld
dependency40.type=UsesDependency dependency40.type=UsesDependency
dependency41.from=Plattform dependency41.from=Plattform
dependency41.from=MovingPlattform
dependency41.to=Player dependency41.to=Player
dependency41.type=UsesDependency dependency41.type=UsesDependency
dependency42.from=TemporaryGround
dependency42.to=Player
dependency42.from=MovingPlattform dependency42.from=MovingPlattform
dependency42.to=MyWorld dependency42.to=MyWorld
dependency42.type=UsesDependency dependency42.type=UsesDependency
dependency43.from=MovingPlattform dependency43.from=MovingPlattform
dependency43.to=Player dependency43.to=Player
dependency43.from=SpikedPlattform
dependency43.to=Spike
dependency43.type=UsesDependency dependency43.type=UsesDependency
dependency44.from=TemporaryGround dependency44.from=TemporaryGround
dependency44.to=Player dependency44.to=Player
dependency44.from=SpikedPlattform
dependency44.to=GameOverWorld
dependency44.type=UsesDependency dependency44.type=UsesDependency
dependency45.from=SpikedPlattform dependency45.from=SpikedPlattform
dependency45.to=MyWorld
dependency45.to=Spike dependency45.to=Spike
dependency45.type=UsesDependency dependency45.type=UsesDependency
dependency46.from=SpikedPlattform dependency46.from=SpikedPlattform
dependency46.to=UnactiveSpike
dependency46.from=SpikedPlattform
dependency46.to=MyWorld dependency46.to=MyWorld
dependency46.type=UsesDependency dependency46.type=UsesDependency
dependency47.from=TargetingProjectile
dependency47.to=Player
dependency47.from=SpikedPlattform dependency47.from=SpikedPlattform
dependency47.to=GameOverWorld dependency47.to=GameOverWorld
dependency47.type=UsesDependency dependency47.type=UsesDependency
dependency48.from=PlayerProjectile
dependency48.to=Enemy
dependency48.type=UsesDependency
dependency48.from=SpikedPlattform dependency48.from=SpikedPlattform
dependency48.to=UnactiveSpike dependency48.to=UnactiveSpike
dependency48.type=UsesDependency dependency48.type=UsesDependency
@@ -171,6 +226,12 @@ dependency8.type=UsesDependency
dependency9.from=MyWorld dependency9.from=MyWorld
dependency9.to=MovingPlattform dependency9.to=MovingPlattform
dependency9.type=UsesDependency dependency9.type=UsesDependency
editor.fx.0.height=0
editor.fx.0.width=0
editor.fx.0.x=0
editor.fx.0.y=0
height=1048
package.numDependencies=48
editor.fx.0.height=737 editor.fx.0.height=737
editor.fx.0.width=808 editor.fx.0.width=808
editor.fx.0.x=204 editor.fx.0.x=204
@@ -191,7 +252,7 @@ readme.name=@README
readme.width=49 readme.width=49
readme.x=10 readme.x=10
readme.y=10 readme.y=10
simulation.speed=50 simulation.speed=51
target1.height=70 target1.height=70
target1.name=Heart target1.name=Heart
target1.showInterface=false target1.showInterface=false
@@ -368,7 +429,7 @@ target9.width=120
target9.x=0 target9.x=0
target9.y=0 target9.y=0
version=3.1.0 version=3.1.0
width=700 width=1550
world.lastInstantiated=GameOverWorld world.lastInstantiated=StartWorld
xPosition=850 xPosition=0
yPosition=0 yPosition=48