Merge remote-tracking branch 'origin/main'

# Conflicts:
#	SMIMS-Game/project.greenfoot
This commit is contained in:
2026-09-17 11:18:20 +02:00
10 changed files with 105 additions and 23 deletions
+25 -8
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.
@@ -82,6 +83,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(), Greenfoot.getRandomNumber(400), 5);
@@ -108,19 +110,34 @@ public class MyWorld extends World
{
addObject(new SpikedPlattform(100), Greenfoot.getRandomNumber(400), 6); //Nach Links bewegende Plattform
}
if(Greenfoot.getRandomNumber(100000)>=99750)
{
addObject(new Groundflower(), Greenfoot.getRandomNumber(400), 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;
}