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.java
#	SMIMS-Game/project.greenfoot
This commit is contained in:
Caspar
2026-09-17 11:16:31 +02:00
parent b5bbd00cc1 97c8d5641e
commit 1fbc555d31
9 changed files with 90 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SMIMS-Game/HealthItem.class
BIN
View File
Binary file not shown.
SMIMS-Game/HealthItem.java
-1
View File
@@ -8,7 +8,6 @@ import greenfoot.*; // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
*/
public class HealthItem extends PowerUps
{
int duration = 60*60;
public void act()
{
moveDown();
SMIMS-Game/JumpBoostItem.class
BIN
View File
Binary file not shown.
SMIMS-Game/JumpBoostItem.java
+1 -1
View File
@@ -8,7 +8,7 @@ import greenfoot.*; // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
*/
public class JumpBoostItem extends PowerUps
{
int duration = 60*60;
int duration = 60*5;
public void act()
{
moveDown();
SMIMS-Game/MyWorld.class
BIN
View File
Binary file not shown.
SMIMS-Game/MyWorld.ctxt
+7 -5
View File
@@ -10,11 +10,13 @@ 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\ spawnEnemies()
comment4.target=void\ spawnItems()
comment5.params=
comment5.target=void\ projectile()
comment5.target=void\ spawnEnemies()
comment6.params=
comment6.target=void\ targetingProjectile()
comment6.target=void\ projectile()
comment7.params=
comment7.target=void\ showScore()
numComments=8
comment7.target=void\ targetingProjectile()
comment8.params=
comment8.target=void\ showScore()
numComments=9
SMIMS-Game/MyWorld.java
+23 -18
View File
@@ -14,6 +14,7 @@ public class MyWorld extends World
int targetTimer = 1000;
int time = 0;
int enemyTimer;
int itemTimer;
int score = 0;
/**
* Constructor for objects of class MyWorld.
@@ -84,6 +85,7 @@ public class MyWorld extends World
projectile();
spawnEnemies();
targetingProjectile();
spawnItems();
if(PlattformCountdown==0) //Damit in regelmäßigen Abständen auf jeden Fall eine Plattform auftaucht
{
addObject(new Plattform(), 1+Greenfoot.getRandomNumber(398), 5);
@@ -106,31 +108,34 @@ 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
}
if(Greenfoot.getRandomNumber(100000)>=99900)
{
addObject(new Groundflower(), 1+Greenfoot.getRandomNumber(398), 6); //Nach Links bewegende Plattform
}
if(Greenfoot.getRandomNumber(100000)>=99900)
{
addObject(new HealthItem(), 1+Greenfoot.getRandomNumber(398), 6); //Nach Links bewegende Plattform
}
if(Greenfoot.getRandomNumber(100000)>=99900)
{
addObject(new JumpBoostItem(), 1+Greenfoot.getRandomNumber(398), 6); //Nach Links bewegende Plattform
public void spawnItems(){
itemTimer++;
if (itemTimer >= 575){
itemTimer = 0;
switch (Greenfoot.getRandomNumber(3)){
case 0:
Groundflower groundF = new Groundflower();
addObject(groundF, Greenfoot.getRandomNumber(getWidth()-100)+50,0);
break;
case 1:
HealthItem healthItem = new HealthItem();
addObject(healthItem, Greenfoot.getRandomNumber(getWidth()-100)+50,0);
break;
case 2:
JumpBoostItem jumpBoostItem = new JumpBoostItem();
addObject(jumpBoostItem, Greenfoot.getRandomNumber(getWidth()-100)+50,0);
break;
}
}
}
public void spawnEnemies(){
enemyTimer++;
if (enemyTimer == 420){
Enemy enemy = new Enemy(Greenfoot.getRandomNumber(getWidth()), Greenfoot.getRandomNumber(getHeight()/2));
addObject(enemy, Greenfoot.getRandomNumber(300)+50,0);
if (enemyTimer >= 420){
Enemy enemy = new Enemy(Greenfoot.getRandomNumber(getWidth() - 50) + 25, Greenfoot.getRandomNumber(getHeight()/2) + 15);
addObject(enemy, Greenfoot.getRandomNumber(getWidth()-100)+50,0);
enemyTimer = 0;
}
SMIMS-Game/Player.class
BIN
View File
Binary file not shown.
SMIMS-Game/project.greenfoot
+58 -61
View File
@@ -23,134 +23,131 @@ dependency1.from=PlayerTestWorld
dependency1.to=Ground
dependency1.type=UsesDependency
dependency10.from=MyWorld
dependency10.to=MovingPlattform
dependency10.to=BreakingPlattform
dependency10.type=UsesDependency
dependency11.from=MyWorld
dependency11.to=BreakingPlattform
dependency11.to=SpikedPlattform
dependency11.type=UsesDependency
dependency12.from=MyWorld
dependency12.to=SpikedPlattform
dependency12.to=Groundflower
dependency12.type=UsesDependency
dependency13.from=MyWorld
dependency13.to=Groundflower
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=Healthbar
dependency38.to=Player
dependency38.from=Plattform
dependency38.to=MyWorld
dependency38.type=UsesDependency
dependency39.from=Plattform
dependency39.to=MyWorld
dependency39.to=Player
dependency39.type=UsesDependency
dependency4.from=MyWorld
dependency4.to=Player
dependency4.type=UsesDependency
dependency40.from=Plattform
dependency40.to=Player
dependency40.from=MovingPlattform
dependency40.to=MyWorld
dependency40.type=UsesDependency
dependency41.from=MovingPlattform
dependency41.to=MyWorld
dependency41.to=Player
dependency41.type=UsesDependency
dependency42.from=MovingPlattform
dependency42.from=TemporaryGround
dependency42.to=Player
dependency42.type=UsesDependency
dependency43.from=TemporaryGround
dependency43.to=Player
dependency43.from=SpikedPlattform
dependency43.to=Spike
dependency43.type=UsesDependency
dependency44.from=SpikedPlattform
dependency44.to=Spike
dependency44.to=GameOverWorld
dependency44.type=UsesDependency
dependency45.from=SpikedPlattform
dependency45.to=GameOverWorld
dependency45.to=MyWorld
dependency45.type=UsesDependency
dependency46.from=SpikedPlattform
dependency46.to=MyWorld
dependency46.to=UnactiveSpike
dependency46.type=UsesDependency
dependency47.from=SpikedPlattform
dependency47.to=UnactiveSpike
dependency47.from=TargetingProjectile
dependency47.to=Player
dependency47.type=UsesDependency
dependency48.from=TargetingProjectile
dependency48.to=Player
dependency48.from=PlayerProjectile
dependency48.to=Enemy
dependency48.type=UsesDependency
dependency49.from=PlayerProjectile
dependency49.to=Enemy
dependency49.type=UsesDependency
dependency5.from=MyWorld
dependency5.to=Score
dependency5.type=UsesDependency
@@ -158,20 +155,20 @@ dependency6.from=MyWorld
dependency6.to=Plattform
dependency6.type=UsesDependency
dependency7.from=MyWorld
dependency7.to=Healthbar
dependency7.to=Heart
dependency7.type=UsesDependency
dependency8.from=MyWorld
dependency8.to=Heart
dependency8.to=TemporaryGround
dependency8.type=UsesDependency
dependency9.from=MyWorld
dependency9.to=TemporaryGround
dependency9.to=MovingPlattform
dependency9.type=UsesDependency
editor.fx.0.height=737
editor.fx.0.width=814
editor.fx.0.x=444
editor.fx.0.y=78
editor.fx.0.x=386
editor.fx.0.y=48
height=830
package.numDependencies=49
package.numDependencies=48
package.numTargets=26
project.charset=UTF-8
publish.hasSource=false
@@ -371,6 +368,6 @@ target9.x=0
target9.y=0
version=3.1.0
width=1550
world.lastInstantiated=MyWorld
world.lastInstantiated=StartWorld
xPosition=0
yPosition=0