Compare commits

...

82 Commits

Author SHA1 Message Date
Jonas df41cd63c3 Score im EndScreen ist jetzt besser zentriert 2026-09-17 16:19:22 +02:00
Jonas 18f6594ec7 Jump Boost stärke etwas reduziert 2026-09-17 16:15:43 +02:00
Marlie c52ba44c44 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	SMIMS-Game/MyWorld.class
#	SMIMS-Game/SpikedPlattform.class
#	SMIMS-Game/SpikedPlattform.java
#	SMIMS-Game/project.greenfoot
2026-09-17 16:08:24 +02:00
Marlie 8a15fa5a51 Bilder, Score Anzeige und Dauer der Plattform 2026-09-17 16:06:17 +02:00
Caspar c0b6517f14 spiked fix 2026-09-17 12:40:49 +02:00
Marlie 40d5295716 Fix: Ground 2026-09-17 12:34:32 +02:00
Caspar 153f710a44 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	SMIMS-Game/MyWorld.class
#	SMIMS-Game/project.greenfoot
2026-09-17 12:23:08 +02:00
Caspar d84b853b65 +Ground Fix 2026-09-17 12:22:38 +02:00
Jonas bd0e81a2f7 Jump Boost stärke etwas reduziert 2026-09-17 12:21:48 +02:00
Jonas a36481e098 Fix: EnemyProjectile wird auch am rechten bildschirmrand gelöscht 2026-09-17 12:06:52 +02:00
Jonas c97dcde07a Merge remote-tracking branch 'origin/main' 2026-09-17 12:02:39 +02:00
Jonas 4d5e6ad567 Enemy dreht sich jetzt immer in die Richtung des Spielers 2026-09-17 12:02:30 +02:00
Marlie 69e753d5a8 Merge remote-tracking branch 'origin/main' 2026-09-17 11:55:57 +02:00
Marlie a7cfa6923a Enemy Right Bild 2026-09-17 11:55:46 +02:00
Jonas fe6d466cd6 Merge remote-tracking branch 'origin/main' 2026-09-17 11:49:22 +02:00
Jonas 047fe9597d Herzen werden jetzt immer über den Platformen angezeigt 2026-09-17 11:49:14 +02:00
Caspar af551a1a57 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	SMIMS-Game/MyWorld.class
#	SMIMS-Game/project.greenfoot
2026-09-17 11:40:04 +02:00
Caspar dc85fd679b +Breaking Plattforms Spawn 2026-09-17 11:39:38 +02:00
Marlie 8ae09335c0 Player Drehung und Enemy Größe 2026-09-17 11:35:44 +02:00
Marlie c1de4dad10 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	SMIMS-Game/project.greenfoot
2026-09-17 11:21:27 +02:00
Marlie fe9208291f Merge remote-tracking branch 'origin/main'
# Conflicts:
#	SMIMS-Game/project.greenfoot
2026-09-17 11:18:20 +02:00
Caspar 1fbc555d31 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	SMIMS-Game/MyWorld.java
#	SMIMS-Game/project.greenfoot
2026-09-17 11:16:31 +02:00
Marlie 2e11569755 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	SMIMS-Game/MyWorld.class
#	SMIMS-Game/MyWorld.java
#	SMIMS-Game/project.greenfoot
2026-09-17 11:15:39 +02:00
Caspar b5bbd00cc1 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	SMIMS-Game/MyWorld.class
#	SMIMS-Game/Player.class
#	SMIMS-Game/Player.java
#	SMIMS-Game/project.greenfoot
2026-09-17 11:13:42 +02:00
Jonas 97c8d5641e Items werden automatisch erzeugt 2026-09-17 11:11:22 +02:00
Marlie 964725a81c Textures und BreakingPlatform Änderung 2026-09-17 11:11:14 +02:00
Caspar aa07effa13 +Flower Png 2026-09-17 11:10:46 +02:00
Jonas 6ab5576115 Lebensanzeige wird wieder aufgefüllt, wenn healthItems aufgesammelt werden 2026-09-17 10:35:22 +02:00
Jonas f70e394f01 Merge remote-tracking branch 'origin/main' 2026-09-17 10:06:06 +02:00
Jonas 9a0d7e7f7a Fix: Game crasht nicht mehr bei damage auf 0 Leben und PowerUps werden wieder gelöscht wenn sie den unteren Fensterrand 2026-09-17 10:05:50 +02:00
Marlie f1bb70a2a2 Merge remote-tracking branch 'origin/main' 2026-09-17 09:54:47 +02:00
Marlie 1796607c93 Lebensanzeige hinzugefügt 2026-09-17 09:54:27 +02:00
Jonas 5cf095c370 Fix: game crasht nicht mehr bei damage 2026-09-17 09:52:17 +02:00
Jonas ddba231979 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	SMIMS-Game/Groundflower.class
#	SMIMS-Game/Groundflower.java
#	SMIMS-Game/MyWorld.class
#	SMIMS-Game/Player.class
#	SMIMS-Game/Player.java
#	SMIMS-Game/project.greenfoot
2026-09-17 09:44:40 +02:00
Jonas c0c5151c41 PowerUp Items bewegen sich jetzt nach unten und lösen auch nur noch das richtige PowerUp aus 2026-09-17 09:39:47 +02:00
Caspar 236a363572 +Flower Png 2026-09-17 09:29:14 +02:00
Caspar 6215bff73d Merge remote-tracking branch 'origin/main'
# Conflicts:
#	SMIMS-Game/MyWorld.class
#	SMIMS-Game/MyWorld.java
#	SMIMS-Game/Player.class
#	SMIMS-Game/project.greenfoot
2026-09-17 09:28:50 +02:00
Caspar c719e5b053 Fix Health 2026-09-17 09:24:04 +02:00
Marlie b3a951626c Lebensanzeige hinzugefügt 2026-09-17 09:13:50 +02:00
Jonas 3d047538f1 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	SMIMS-Game/project.greenfoot
2026-09-16 17:50:06 +02:00
Jonas a39e816038 Gegner werden jetzt in MyWorld gespawned 2026-09-16 17:49:43 +02:00
Marlie 443b4e9247 Start und Game Over World leicht geändert 2026-09-16 17:48:35 +02:00
Marlie 1ed7e0ce1f neue Platforms 2026-09-16 17:45:04 +02:00
Jonas fe11e83e78 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	SMIMS-Game/Player.class
#	SMIMS-Game/Player.java
#	SMIMS-Game/project.greenfoot
2026-09-16 17:34:20 +02:00
Jonas fc9f3a660e Spikes machen jetzt damage statt zu gameOverWorld zu wechseln 2026-09-16 17:31:47 +02:00
Caspar f7f611c2ae Fix Health 2026-09-16 17:26:16 +02:00
Caspar eba1e4567e Merge remote-tracking branch 'origin/main'
# Conflicts:
#	SMIMS-Game/MyWorld.class
#	SMIMS-Game/MyWorld.java
#	SMIMS-Game/Player.class
#	SMIMS-Game/Player.java
#	SMIMS-Game/project.greenfoot
2026-09-16 17:21:25 +02:00
Caspar a0de2fb58d Startplattform (nicht in MyWorld) 2026-09-16 17:16:52 +02:00
Jonas aa8fb9a067 Fix: playerProjectiles werden auch am rechten Rand vom Fenster entfernt 2026-09-16 17:11:28 +02:00
Jonas 66b7ced23a Fix: game crashed nicht mehr wenn PlayerProjectiles entfernt werden 2026-09-16 17:08:57 +02:00
Jonas 532e78de04 Fix: Score Objekte vom vorherigen frame löschen damit die spiel performance nicht beeinträchtigt wird 2026-09-16 17:04:41 +02:00
Jonas 1cd6356f4f Merge remote-tracking branch 'origin/main' 2026-09-16 16:22:08 +02:00
Marlie f8c53b518d Merge remote-tracking branch 'origin/main'
# Conflicts:
#	SMIMS-Game/MyWorld.class
2026-09-16 16:22:34 +02:00
Marlie b095aeb05f Score und neue Platforms sowie Player Figur 2026-09-16 16:22:07 +02:00
Jonas c605600c84 Gegner können sich jetzt bewegen 2026-09-16 16:21:57 +02:00
Jonas 8477d63e51 Fügt Leben zum Spieler, ein HealthItem und eine Healthbar hinzu. 2026-09-16 15:57:46 +02:00
Jonas da0a97adfe Fix: Game Crashed nicht mehr wenn das PlayerProjectile einen Gegner berührt 2026-09-16 12:23:03 +02:00
Caspar bfada2dbc2 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	SMIMS-Game/project.greenfoot
2026-09-16 12:20:46 +02:00
Caspar 22d42273c1 MovingPlattformsUpdate 2026-09-16 12:20:29 +02:00
Jonas ce7d999b0f Fix: Game Crashed nicht mehr wenn das PlayerProjectile das Fenster verlässt 2026-09-16 12:06:59 +02:00
Caspar cdc2e107d5 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	SMIMS-Game/project.greenfoot
2026-09-16 11:59:40 +02:00
Caspar 51725cd2b8 SpikedPlattforms3 2026-09-16 11:59:02 +02:00
Caspar cdcb5a5bac Merge remote-tracking branch 'origin/main'
# Conflicts:
#	SMIMS-Game/MyWorld.class
#	SMIMS-Game/MyWorld.java
#	SMIMS-Game/project.greenfoot
2026-09-16 11:54:37 +02:00
Jonas e58b55993d Es gibt jetzt einen Enemy, welcher in festen abständen auf den Player schießt. Der Enemy kann mit PlayerProjectiles abgeschossen werden 2026-09-16 11:50:58 +02:00
Caspar afdeede498 SpikedPlattforms2 2026-09-16 11:48:37 +02:00
Caspar 56b755b3d6 SpikedPlattforms2 2026-09-16 11:48:19 +02:00
Jonas eae3e92d60 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	SMIMS-Game/Player.class
2026-09-16 10:43:36 +02:00
Jonas 963fa43986 Der Spieler kann nun Projectile schießen 2026-09-16 10:40:42 +02:00
Marlie 5d65c61f15 Verfolgungsprojektil 2026-09-16 09:36:32 +02:00
Jonas 8fad77b878 Der Spieler kann nun über die Bildschirmränder auf die andere Seite des Fensters 2026-09-16 09:27:50 +02:00
Marlie 6127510ec8 Verfolgungsprojektil 2026-09-15 20:55:28 +02:00
Marlie aae6ac5e41 Verfolgungsprojektil 2026-09-15 20:39:10 +02:00
Caspar 4013820d8d Merge remote-tracking branch 'origin/main'
# Conflicts:
#	SMIMS-Game/project.greenfoot
2026-09-15 20:25:45 +02:00
Caspar 8eeb32af40 SpikedPlattforms1 2026-09-15 20:24:24 +02:00
Jonas 6ee623cad4 Spieler fällt nicht mehr durch Platformen, wenn er mehrere gleichzeitig berührt 2026-09-15 20:19:35 +02:00
Jonas dfe93e4da5 Merge remote-tracking branch 'origin/main' 2026-09-15 20:06:32 +02:00
Marlie 4bc13d6d57 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	SMIMS-Game/MyWorld.class
2026-09-15 20:06:40 +02:00
Jonas 282a2cade3 Spieler stirbt wenn er den unteren Bildschirmrand berührt 2026-09-15 20:06:20 +02:00
Marlie bbd34812cb Verfolgungsprojektil 2026-09-15 20:06:13 +02:00
Jonas d7645d43f0 Ich habe einen Score Actor hinzugefügt, welcher den Score oben im Bildschirm anzeigt und jede Sekunde um eins erhöht. 2026-09-15 19:57:22 +02:00
Jonas 024738ff62 Merge remote-tracking branch 'origin/main' 2026-09-15 19:24:14 +02:00
Jonas e345d13140 Player kann jetzt auf Platformen stehen (nicht mehr auf Ground) 2026-09-15 19:23:58 +02:00
110 changed files with 1326 additions and 155 deletions
Binary file not shown.
+1 -1
View File
@@ -25,7 +25,7 @@ public class BreakingPlattform extends Plattform
{ {
IsBreaking= true; IsBreaking= true;
//Greenfoot.playSound("...") //Greenfoot.playSound("...")
this.setImage("BreakingPlattform2.png"); //untested this.setImage("Breaking2.png");
} }
if(IsBreaking) if(IsBreaking)
Binary file not shown.
+11
View File
@@ -0,0 +1,11 @@
#BlueJ class context
comment0.target=Enemy
comment1.params=targetX\ targetY
comment1.target=Enemy(int,\ int)
comment2.params=
comment2.target=void\ act()
comment3.params=targetX\ targetY
comment3.target=void\ moveToTargetLocation(int,\ int)
comment4.params=
comment4.target=void\ shootAtPlayer()
numComments=5
+51
View File
@@ -0,0 +1,51 @@
import greenfoot.*; // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
public class Enemy extends Actor
{
int targetX;
int targetY;
boolean targetReached = false;
int speed = 3;
public Enemy (int targetX, int targetY) {
this.targetX = targetX;
this.targetY = targetY;
}
int shootTimer;
public void act()
{
shootAtPlayer();
if (!targetReached){
moveToTargetLocation(targetX, targetY);
}
}
public void moveToTargetLocation(int targetX, int targetY){
double dx = targetX - getX();
double dy = targetY - getY();
double distance = Math.sqrt(Math.pow(dx, 2) + Math.pow(dy, 2));
if (distance < 2){
targetReached = true;
}
setLocation(getX() + (int)(dx/distance*speed), getY() + (int)(dy/distance*speed));
}
public void shootAtPlayer(){
Player player = getWorld().getObjects(Player.class).get(0);
shootTimer++;
if (player.getX() - getX() < 0){
setImage("Enemy.png");
} else if (player.getX() - getX() > 0){
setImage("EnemyRight.png");
}
if (shootTimer >= 100){
EnemyProjectile enemyProjectile = new EnemyProjectile();
getWorld().addObject(enemyProjectile, getX(), getY());
enemyProjectile.turnTowards(player.getX(), player.getY());
shootTimer = 0;
}
}
}
Binary file not shown.
+9
View File
@@ -0,0 +1,9 @@
#BlueJ class context
comment0.target=EnemyProjectile
comment0.text=\r\n\ Write\ a\ description\ of\ class\ EnemyProjectile\ 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()
comment1.text=\r\n\ Act\ -\ do\ whatever\ the\ EnemyProjectile\ wants\ to\ do.\ This\ method\ is\ called\ whenever\r\n\ the\ 'Act'\ or\ 'Run'\ button\ gets\ pressed\ in\ the\ environment.\r\n
comment2.params=
comment2.target=boolean\ isProjectileOnScreen()
numComments=3
+34
View File
@@ -0,0 +1,34 @@
import greenfoot.*; // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
/**
* Write a description of class EnemyProjectile here.
*
* @author (your name)
* @version (a version number or a date)
*/
public class EnemyProjectile extends Projectile
{
/**
* Act - do whatever the EnemyProjectile wants to do. This method is called whenever
* the 'Act' or 'Run' button gets pressed in the environment.
*/
public void act()
{
move(10);
if (!isProjectileOnScreen()){
getWorld().removeObject(this);
}
}
public boolean isProjectileOnScreen(){
//Check Y-Value
if (getY() <= 0 || getY() >= getWorld().getHeight()-1){
return false;
}
//Check X-Value
if (getX() <= 0 || getX() >= getWorld().getWidth()-1){
return false;
}
return true;
}
}
Binary file not shown.
+5 -4
View File
@@ -1,10 +1,11 @@
#BlueJ class context #BlueJ class context
comment0.target=GameOverWorld comment0.target=GameOverWorld
comment0.text=\r\n\ Write\ a\ description\ of\ class\ GameOverWorld\ here.\r\n\ \r\n\ @author\ (your\ name)\ \r\n\ @version\ (a\ version\ number\ or\ a\ date)\r\n comment0.text=\r\n\ Write\ a\ description\ of\ class\ GameOverWorld\ here.\r\n\ \r\n\ @author\ (your\ name)\ \r\n\ @version\ (a\ version\ number\ or\ a\ date)\r\n
comment1.params= comment1.params=score
comment1.target=GameOverWorld() comment1.target=GameOverWorld(int)
comment1.text=\r\n\ Constructor\ for\ objects\ of\ class\ GameOverWorld.\r\n\ \r\n
comment2.params= comment2.params=
comment2.target=void\ prepare() 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 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 comment3.params=
comment3.target=void\ showScore()
numComments=4
+13 -2
View File
@@ -13,10 +13,12 @@ public class GameOverWorld extends World
* Constructor for objects of class GameOverWorld. * Constructor for objects of class GameOverWorld.
* *
*/ */
public GameOverWorld() int score;
public GameOverWorld(int score)
{ {
// Create a new world with 600x400 cells with a cell size of 1x1 pixels. // Create a new world with 600x400 cells with a cell size of 1x1 pixels.
super(400, 600, 1); super(400, 600, 1);
this.score = score;
prepare(); prepare();
} }
@@ -27,7 +29,16 @@ public class GameOverWorld extends World
private void prepare() private void prepare()
{ {
Button button = new Button(); Button button = new Button();
addObject(button,200,350); addObject(button,200,520);
button.setImage("Neustart.png"); button.setImage("Neustart.png");
showScore();
}
public void showScore(){
Color hintergrundFarbe = new Color(0,0,0,0);
GreenfootImage scoreBild = new GreenfootImage("" + score, 75, Color.WHITE, hintergrundFarbe);
Score score3 = new Score();
addObject(score3,200,72);
score3.setImage(scoreBild);
} }
} }
Binary file not shown.
+9
View File
@@ -0,0 +1,9 @@
#BlueJ class context
comment0.target=Groundflower
comment0.text=\r\n\ Write\ a\ description\ of\ class\ StarPowerUp\ 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()
comment1.text=\r\n\ Act\ -\ do\ whatever\ the\ StarPowerUp\ wants\ to\ do.\ This\ method\ is\ called\ whenever\r\n\ the\ 'Act'\ or\ 'Run'\ button\ gets\ pressed\ in\ the\ environment.\r\n
comment2.params=
comment2.target=void\ collect()
numComments=3
+30
View File
@@ -0,0 +1,30 @@
import greenfoot.*; // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
/**
* Write a description of class StarPowerUp here.
*
* @author (your name)
* @version (a version number or a date)
*/
public class Groundflower extends PowerUps
{
int duration= 60*4; //15 Sekunden
/**
* Act - do whatever the StarPowerUp wants to do. This method is called whenever
* the 'Act' or 'Run' button gets pressed in the environment.
*/
public void act()
{
moveDown();
touchedByPlayer();
if (deleteAfterActCycle){
getWorld().removeObject(this);
}
}
@ Override void collect()
{
Player player = getIntersectingObjects(Player.class).get(0);
player.receivePowerUp(duration, "GroundPower");
}
}
Binary file not shown.
+8
View File
@@ -0,0 +1,8 @@
#BlueJ class context
comment0.target=HealthItem
comment0.text=\r\n\ Write\ a\ description\ of\ class\ HealthItem\ 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\ collect()
numComments=3
+24
View File
@@ -0,0 +1,24 @@
import greenfoot.*; // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
/**
* Write a description of class HealthItem here.
*
* @author (your name)
* @version (a version number or a date)
*/
public class HealthItem extends PowerUps
{
public void act()
{
moveDown();
touchedByPlayer();
if (deleteAfterActCycle){
getWorld().removeObject(this);
}
}
@Override void collect(){
Player player = getIntersectingObjects(Player.class).get(0);
player.receivePowerUp(duration, "Heal");
}
}
Binary file not shown.
+7
View File
@@ -0,0 +1,7 @@
#BlueJ class context
comment0.target=Heart
comment0.text=\r\n\ Write\ a\ description\ of\ class\ Heart\ 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()
comment1.text=\r\n\ Act\ -\ do\ whatever\ the\ Heart\ wants\ to\ do.\ This\ method\ is\ called\ whenever\r\n\ the\ 'Act'\ or\ 'Run'\ button\ gets\ pressed\ in\ the\ environment.\r\n
numComments=2
+19
View File
@@ -0,0 +1,19 @@
import greenfoot.*; // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
/**
* Write a description of class Heart here.
*
* @author (your name)
* @version (a version number or a date)
*/
public class Heart extends Actor
{
/**
* Act - do whatever the Heart wants to do. This method is called whenever
* the 'Act' or 'Run' button gets pressed in the environment.
*/
public void act()
{
// Add your action code here.
}
}
Binary file not shown.
+5 -1
View File
@@ -11,11 +11,15 @@ public class JumpBoostItem extends PowerUps
int duration = 60*5; int duration = 60*5;
public void act() public void act()
{ {
moveDown();
touchedByPlayer(); touchedByPlayer();
if (deleteAfterActCycle){
getWorld().removeObject(this);
}
} }
@Override void collect(){ @Override void collect(){
Player player = getIntersectingObjects(Player.class).get(0); Player player = getIntersectingObjects(Player.class).get(0);
player.reveivePowerUp(duration, "JumpBoost"); player.receivePowerUp(duration, "JumpBoost");
} }
} }
Binary file not shown.
+3 -1
View File
@@ -8,4 +8,6 @@ comment2.target=void\ act()
comment2.text=\r\n\ Act\ -\ do\ whatever\ the\ MovingPlattform\ wants\ to\ do.\ This\ method\ is\ called\ whenever\r\n\ the\ 'Act'\ or\ 'Run'\ button\ gets\ pressed\ in\ the\ environment.\r\n comment2.text=\r\n\ Act\ -\ do\ whatever\ the\ MovingPlattform\ wants\ to\ do.\ This\ method\ is\ called\ whenever\r\n\ the\ 'Act'\ or\ 'Run'\ button\ gets\ pressed\ in\ the\ environment.\r\n
comment3.params= comment3.params=
comment3.target=void\ bewege() comment3.target=void\ bewege()
numComments=4 comment4.params=
comment4.target=void\ bewegeSpielerMit()
numComments=5
+16 -1
View File
@@ -9,7 +9,7 @@ import greenfoot.*; // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
public class MovingPlattform extends Plattform public class MovingPlattform extends Plattform
{ {
int speed; int speed;
int temp=0;
public MovingPlattform(int pSpeed) public MovingPlattform(int pSpeed)
{ {
speed= pSpeed; speed= pSpeed;
@@ -23,6 +23,7 @@ public class MovingPlattform extends Plattform
{ {
// Add your action code here. // Add your action code here.
this.bewege(); this.bewege();
this.bewegeSpielerMit();
super.act(); super.act();
} }
@@ -34,5 +35,19 @@ public class MovingPlattform extends Plattform
{ {
speed=speed*(-1); speed=speed*(-1);
} }
}
public void bewegeSpielerMit()
{
if(this.PlayerOnPlattform())
{
World theWorld= this.getWorld();
Player DerSpieler = theWorld.getObjects(Player.class).get(0);
if(DerSpieler!=null)
{
DerSpieler.setLocation(DerSpieler.getX()+speed*2, DerSpieler.getY());
}
}
} }
} }
Binary file not shown.
+13 -1
View File
@@ -9,4 +9,16 @@ 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 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
comment3.params= comment3.params=
comment3.target=void\ act() comment3.target=void\ act()
numComments=4 comment4.params=
comment4.target=void\ drawNewHearts()
comment5.params=
comment5.target=void\ spawnItems()
comment6.params=
comment6.target=void\ spawnEnemies()
comment7.params=
comment7.target=void\ projectile()
comment8.params=
comment8.target=void\ targetingProjectile()
comment9.params=
comment9.target=void\ showScore()
numComments=10
+129 -16
View File
@@ -9,9 +9,13 @@ import greenfoot.*; // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
public class MyWorld extends World public class MyWorld extends World
{ {
int PlattformCountdown; int PlattformCountdown;
int timer = 200; //Zeit, bevor das erste Projektil auftaucht int timer = 600; //Zeit, bevor das erste Projektil auftaucht
//kann später noch beliebig angepasst werden //kann später noch beliebig angepasst werden
int targetTimer = 1000; int targetTimer = 1000;
int time = 0;
int enemyTimer;
int itemTimer;
int score = 0;
/** /**
* Constructor for objects of class MyWorld. * Constructor for objects of class MyWorld.
* *
@@ -22,6 +26,7 @@ public class MyWorld extends World
super(400, 600, 1); super(400, 600, 1);
prepare(); prepare();
} }
/** /**
* Prepare the world for the start of the program. * Prepare the world for the start of the program.
* That is: create the initial objects and add them to the world. * That is: create the initial objects and add them to the world.
@@ -30,47 +35,155 @@ public class MyWorld extends World
{ {
Player player = new Player(); Player player = new Player();
addObject(player,302,320); addObject(player,302,320);
Score score1 = new Score();
addObject(score1, 200, 30);
score1.setImage("Score1.png");
Score score2 = new Score();
addObject(score2, 200, 60);
score2.setImage("Score2.png");
Plattform plattform = new Plattform();
addObject(plattform,285,577);
plattform.setLocation(286,492);
plattform.setLocation(293,379);
removeObject(plattform);
Plattform plattform2 = new Plattform();
addObject(plattform2,291,373);
Plattform plattform3 = new Plattform();
addObject(plattform3,123,268);
plattform3.setLocation(136,306);
Plattform plattform4 = new Plattform();
addObject(plattform4,294,204);
Plattform plattform5 = new Plattform();
addObject(plattform5,105,112);
plattform2.setLocation(320,367);
plattform2.setLocation(312,371);
plattform2.setLocation(308,382);
Heart heart = new Heart();
addObject(heart,371,27);
Heart heart2 = new Heart();
addObject(heart2,343,27);
Heart heart3 = new Heart();
addObject(heart3,314,27);
addObject(new TemporaryGround(60*8), 200, 575);
} }
public void act() public void act()
{ {
if (getObjects(Score.class).size() > 0){
removeObjects(getObjects(Score.class));
}
Score score1 = new Score();
addObject(score1, 200, 30);
score1.setImage("Score1.png");
Score score2 = new Score();
addObject(score2, 200, 60);
score2.setImage("Score2.png");
showScore();
projectile();
spawnEnemies();
targetingProjectile();
spawnItems();
drawNewHearts();
if(PlattformCountdown==0) //Damit in regelmäßigen Abständen auf jeden Fall eine Plattform auftaucht if(PlattformCountdown==0) //Damit in regelmäßigen Abständen auf jeden Fall eine Plattform auftaucht
{ {
addObject(new Plattform(), Greenfoot.getRandomNumber(400), 5); addObject(new Plattform(), 1+Greenfoot.getRandomNumber(398), 5);
PlattformCountdown=100; PlattformCountdown=50;
} }
PlattformCountdown--; PlattformCountdown--;
if(Greenfoot.getRandomNumber(100000)>=99800) if(Greenfoot.getRandomNumber(100000)>=99800)
{ {
addObject(new Plattform(), Greenfoot.getRandomNumber(400), 5); addObject(new Plattform(), 1+Greenfoot.getRandomNumber(398), 5);
} }
if(Greenfoot.getRandomNumber(100000)>=99900) if(Greenfoot.getRandomNumber(100000)>=99900)
{ {
addObject(new MovingPlattform(2), Greenfoot.getRandomNumber(400), 6); //Nach Rechts bewegende Plattform addObject(new MovingPlattform(1), 1+Greenfoot.getRandomNumber(398), 6); //Nach Rechts bewegende Plattform
} }
if(Greenfoot.getRandomNumber(100000)>=99900) if(Greenfoot.getRandomNumber(100000)>=99900)
{ {
addObject(new MovingPlattform(-2), Greenfoot.getRandomNumber(400), 6); //Nach Links bewegende Plattform addObject(new MovingPlattform(-1), 1+Greenfoot.getRandomNumber(398), 6); //Nach Links bewegende Plattform
} }
if(Greenfoot.getRandomNumber(100000)>=99750) if(Greenfoot.getRandomNumber(100000)>=99750)
{ {
addObject(new BreakingPlattform(50), Greenfoot.getRandomNumber(400), 6); //Nach Links bewegende Plattform addObject(new BreakingPlattform(50), 1+Greenfoot.getRandomNumber(398), 6); //Nach Links bewegende Plattform
} }
if(Greenfoot.getRandomNumber(100000)>=99750)
{
addObject(new SpikedPlattform(40), 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(){
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() - 50) + 25, Greenfoot.getRandomNumber(getHeight()/2) + 15);
addObject(enemy, Greenfoot.getRandomNumber(getWidth()-100)+50,0);
enemyTimer = 0;
}
}
public void projectile(){
if(timer == 0){ if(timer == 0){
Projectile projectile = new Projectile(); Projectile projectile = new Projectile();
addObject(projectile,Greenfoot.getRandomNumber(300)+50,0); addObject(projectile,Greenfoot.getRandomNumber(300)+50,0);
timer = 200; //zeitlicher Abstand timer = 600; //zeitlicher Abstand
} }
else{ else{
timer = timer - 1; timer = timer - 1;
} }
//if(timer == 0){ }
// TargetingProjectile targetingProjectile = new TargetingProjectile();
// addObject(targetingProjectile, Greenfoot.getRandomNumber(300)+50,0); public void targetingProjectile(){
// timer = 1000; if(targetTimer == 0){
//} TargetingProjectile targetingProjectile = new TargetingProjectile();
//else{ addObject(targetingProjectile, Greenfoot.getRandomNumber(300)+50,0);
// timer = timer - 1; targetTimer = 1000;
//} }
else{
targetTimer = targetTimer - 1;
}
} }
public void showScore(){
time++;
score = time/60;
showText("" + score, 200, 60);
}
} }
Binary file not shown.
+3 -3
View File
@@ -40,10 +40,10 @@ public class Plattform extends Actor
public boolean PlayerOnPlattform() public boolean PlayerOnPlattform()
{ {
Player Spieler= (Player) getOneIntersectingObject(Player.class); Player Spieler= (Player) this.getWorld().getObjects(Player.class).get(0);
if(this.isTouching(Player.class)) if(Spieler.getX()+(Spieler.getImage().getWidth()/2)>=this.getX()-(this.getImage().getWidth()/2) && Spieler.getX()-(Spieler.getImage().getWidth()/2)<=this.getX()+(this.getImage().getWidth()/2))
{ {
if(Spieler.getY()<this.getY()-20) if(Spieler.getY()+(Spieler.getImage().getHeight()/2)<=this.getY()-(this.getImage().getHeight()/2) && Spieler.getY()+(Spieler.getImage().getHeight()/2)>=this.getY()-(this.getImage().getHeight()/2))
{ {
return true; return true;
} }
Binary file not shown.
+11 -5
View File
@@ -3,6 +3,8 @@ 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 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.params=
comment1.target=void\ act() comment1.target=void\ act()
comment10.params=
comment10.target=void\ playerRotation()
comment2.params= comment2.params=
comment2.target=void\ moveLeftAndRight() comment2.target=void\ moveLeftAndRight()
comment3.params= comment3.params=
@@ -10,9 +12,13 @@ comment3.target=void\ jump()
comment4.params= comment4.params=
comment4.target=void\ fall() comment4.target=void\ fall()
comment5.params= comment5.params=
comment5.target=boolean\ collision() comment5.target=void\ shootProjectile()
comment6.params= comment6.params=
comment6.target=void\ handlePowerUps() comment6.target=void\ collision()
comment7.params=duration\ type comment7.params=
comment7.target=void\ reveivePowerUp(int,\ java.lang.String) comment7.target=void\ checkHealth()
numComments=8 comment8.params=
comment8.target=void\ handlePowerUps()
comment9.params=duration\ type
comment9.target=void\ receivePowerUp(int,\ java.lang.String)
numComments=11
+103 -52
View File
@@ -8,10 +8,15 @@ import greenfoot.*; // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
*/ */
public class Player extends Actor public class Player extends Actor
{ {
int MAX_HEALTH = 3;
int health = MAX_HEALTH;
int jumpBoostDuration = -1; int jumpBoostDuration = -1;
int jumpBoostStrength = 5; int jumpBoostStrength = 3;
boolean projectileReady = false;
int projectileTimer;
private int speed = 6; private int speed = 6;
private int currentJumpStrength; private int currentJumpStrength;
private int defaultJumpStrength = 15; private int defaultJumpStrength = 15;
@@ -27,6 +32,21 @@ public class Player extends Actor
jump(); jump();
fall(); fall();
handlePowerUps(); handlePowerUps();
shootProjectile();
checkHealth();
playerRotation();
//Check ob der Spieler am unteren Fensterrand ist
if (getY()+1 >= getWorld().getHeight()){
MyWorld world = (MyWorld) getWorld();
Greenfoot.setWorld(new GameOverWorld(world.score));
}
//Check ob der Spieler an der Seite vom Fenster ist
if (getX() <= 0){
setLocation(getWorld().getWidth(), getY());
} else if (getX() >= getWorld().getWidth()-1){
setLocation(1, getY());
}
} }
// Bewegung nach links und rechts // Bewegung nach links und rechts
@@ -35,11 +55,13 @@ public class Player extends Actor
if (Greenfoot.isKeyDown("a")) if (Greenfoot.isKeyDown("a"))
{ {
setLocation(getX() - speed, getY()); setLocation(getX() - speed, getY());
setImage("Player.png");
} }
if (Greenfoot.isKeyDown("d")) if (Greenfoot.isKeyDown("d"))
{ {
setLocation(getX() + speed, getY()); setLocation(getX() + speed, getY());
setImage("Player.png");
} }
} }
@@ -53,61 +75,64 @@ public class Player extends Actor
} }
} }
// Schwerkraft // Schwerkraft
private void fall() private void fall() {
{ int oldY = getY();
int oldY = getY(); verticalSpeed += gravity;
int newY = getY() + verticalSpeed;
verticalSpeed += gravity; setLocation(getX(), newY);
// Alle Plattformen überprüfen, die der Spieler berührt
int newY = getY() + verticalSpeed; java.util.List<Plattform> platforms = getIntersectingObjects(Plattform.class);
boolean landed = false;
setLocation(getX(), newY); for (Plattform platform : platforms) {
int groundTop = platform.getY() - platform.getImage().getHeight() / 2;
Actor ground = getOneIntersectingObject(Ground.class); int characterBottom = getY() + getImage().getHeight() / 2;
int oldCharacterBottom = oldY + getImage().getHeight() / 2;
if (ground != null && verticalSpeed >= 0) // Prüfen, ob der Spieler von oben auf diese Plattform fällt
{ if (verticalSpeed >= 0 && oldCharacterBottom <= groundTop && characterBottom >= groundTop) {
int groundTop = ground.getY() setLocation( getX(), groundTop - getImage().getHeight() / 2 );
- ground.getImage().getHeight() / 2;
int characterBottom = getY()
+ getImage().getHeight() / 2;
// Nur landen, wenn der Spieler vorher über dem Boden war
int oldCharacterBottom = oldY
+ getImage().getHeight() / 2;
if (oldCharacterBottom <= groundTop &&
characterBottom >= groundTop)
{
setLocation(
getX(),
groundTop - getImage().getHeight() / 2
);
verticalSpeed = 0; verticalSpeed = 0;
onGround = true; landed = true;
} break;
}
}
onGround = landed;
}
public void shootProjectile(){
projectileTimer++;
MouseInfo mouse = Greenfoot.getMouseInfo();
if (Greenfoot.mousePressed(null)){
PlayerProjectile playerProjectile = new PlayerProjectile();
getWorld().addObject(playerProjectile, getX(), getY());
playerProjectile.turnTowards(Greenfoot.getMouseInfo().getX(), Greenfoot.getMouseInfo().getY());
projectileReady = false;
} }
else if (projectileTimer >= 10){
{ projectileReady = true;
onGround = false; projectileTimer = 0;
} }
} }
public boolean collision(){ public void collision(){
if (getIntersectingObjects(Projectile.class).size()>0) if (getIntersectingObjects(Projectile.class).size()>0
|| getIntersectingObjects(Enemy.class).size()>0
|| getIntersectingObjects(Spike.class).size()>0)
{ {
Greenfoot.setWorld(new GameOverWorld()); health--;
return true; getWorld().removeObjects(getIntersectingObjects(Projectile.class));
} getWorld().removeObjects(getIntersectingObjects(Enemy.class));
else getWorld().removeObjects(getWorld().getObjects(Spike.class));
{
return false;
} }
} }
public void checkHealth(){
if (health <= 0){
MyWorld world = (MyWorld) getWorld();
Greenfoot.setWorld(new GameOverWorld(world.score));
}
}
public void handlePowerUps(){ public void handlePowerUps(){
if (jumpBoostDuration >= 0){ if (jumpBoostDuration >= 0){
jumpBoostDuration -= 1; jumpBoostDuration -= 1;
@@ -115,8 +140,8 @@ public class Player extends Actor
currentJumpStrength = defaultJumpStrength; currentJumpStrength = defaultJumpStrength;
} }
} }
public void reveivePowerUp(int duration, String type){ public void receivePowerUp(int duration, String type){
switch(type){ switch(type){
case "dummy": case "dummy":
break; break;
@@ -124,6 +149,32 @@ public class Player extends Actor
currentJumpStrength = defaultJumpStrength; currentJumpStrength = defaultJumpStrength;
currentJumpStrength += jumpBoostStrength; currentJumpStrength += jumpBoostStrength;
jumpBoostDuration = duration; jumpBoostDuration = duration;
break;
case "Heal":
if (health < MAX_HEALTH){
health++;
}
break;
case "GroundPower":
World theWorld= this.getWorld();
if(!theWorld.getObjects(TemporaryGround.class).isEmpty())
{
theWorld.getObjects(TemporaryGround.class).get(0).RefreshLifeToDuration(duration);
}
else
{
theWorld.addObject((new TemporaryGround(duration)), 200, 575);
}
break;
}
}
public void playerRotation(){
if(Greenfoot.isKeyDown("a")){
setImage("PlayerLeft.png");
}
if(Greenfoot.isKeyDown("d")){
setImage("Player.png");
} }
} }
} }
Binary file not shown.
+11
View File
@@ -0,0 +1,11 @@
#BlueJ class context
comment0.target=PlayerProjectile
comment0.text=\r\n\ Write\ a\ description\ of\ class\ PlayerProjectile\ 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()
comment1.text=\r\n\ Act\ -\ do\ whatever\ the\ PlayerProjectile\ wants\ to\ do.\ This\ method\ is\ called\ whenever\r\n\ the\ 'Act'\ or\ 'Run'\ button\ gets\ pressed\ in\ the\ environment.\r\n
comment2.params=
comment2.target=void\ checkForEnemyCollision()
comment3.params=
comment3.target=boolean\ isProjectileOnScreen()
numComments=4
+43
View File
@@ -0,0 +1,43 @@
import greenfoot.*; // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
/**
* Write a description of class PlayerProjectile here.
*
* @author (your name)
* @version (a version number or a date)
*/
public class PlayerProjectile extends Actor
{
boolean deleteAfterActCycle = false;
/**
* Act - do whatever the PlayerProjectile wants to do. This method is called whenever
* the 'Act' or 'Run' button gets pressed in the environment.
*/
public void act()
{
move(7);
checkForEnemyCollision();
if (deleteAfterActCycle || !isProjectileOnScreen()){
getWorld().removeObject(this);
}
}
public void checkForEnemyCollision(){
if (getOneIntersectingObject(Enemy.class) != null){
getWorld().removeObject(getOneIntersectingObject(Enemy.class));
deleteAfterActCycle = true;
}
}
public boolean isProjectileOnScreen(){
//Check Y-Value
if (getY() <= 0 || getY() >= getWorld().getHeight()-1){
return false;
}
//Check X-Value
if (getX() <= 0 || getX() >= getWorld().getWidth()-1){
return false;
}
return true;
}
}
Binary file not shown.
+3 -1
View File
@@ -7,4 +7,6 @@ comment2.params=
comment2.target=void\ touchedByPlayer() comment2.target=void\ touchedByPlayer()
comment3.params= comment3.params=
comment3.target=void\ collect() comment3.target=void\ collect()
numComments=4 comment4.params=
comment4.target=void\ moveDown()
numComments=5
+17 -2
View File
@@ -9,20 +9,35 @@ import greenfoot.*; // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
public class PowerUps extends Actor public class PowerUps extends Actor
{ {
int duration; int duration;
boolean deleteAfterActCycle = false;
public void act() public void act()
{ {
moveDown();
touchedByPlayer(); touchedByPlayer();
if (deleteAfterActCycle){
getWorld().removeObject(this);
}
} }
public void touchedByPlayer(){ public void touchedByPlayer(){
if (getIntersectingObjects(Player.class).size() > 0){ if (getIntersectingObjects(Player.class).size() > 0){
collect(); collect();
getWorld().removeObject(this); deleteAfterActCycle = true;
} }
} }
void collect(){ void collect(){
Player player = getIntersectingObjects(Player.class).get(0); Player player = getIntersectingObjects(Player.class).get(0);
player.reveivePowerUp(duration, "dummy"); player.receivePowerUp(duration, "dummy");
}
public void moveDown()
{
setLocation(this.getX(), this.getY()+2);
if(this.getY() >= getWorld().getHeight()-1)
{
deleteAfterActCycle = true;
}
} }
} }
Binary file not shown.
+7
View File
@@ -0,0 +1,7 @@
#BlueJ class context
comment0.target=Score
comment0.text=\r\n\ Write\ a\ description\ of\ class\ UI\ 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()
comment1.text=\r\n\ Act\ -\ do\ whatever\ the\ UI\ wants\ to\ do.\ This\ method\ is\ called\ whenever\r\n\ the\ 'Act'\ or\ 'Run'\ button\ gets\ pressed\ in\ the\ environment.\r\n
numComments=2
+20
View File
@@ -0,0 +1,20 @@
import greenfoot.*; // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
/**
* Write a description of class UI here.
*
* @author (your name)
* @version (a version number or a date)
*/
public class Score extends Actor
{
/**
* Act - do whatever the UI wants to do. This method is called whenever
* the 'Act' or 'Run' button gets pressed in the environment.
*/
public void act()
{
}
}
Binary file not shown.
+13
View File
@@ -0,0 +1,13 @@
#BlueJ class context
comment0.target=Spike
comment0.text=\r\n\ Write\ a\ description\ of\ class\ Spike\ here.\r\n\ \r\n\ @author\ (your\ name)\ \r\n\ @version\ (a\ version\ number\ or\ a\ date)\r\n
comment1.params=pSpeed
comment1.target=Spike(int)
comment2.params=
comment2.target=void\ act()
comment2.text=\r\n\ Act\ -\ do\ whatever\ the\ Spike\ wants\ to\ do.\ This\ method\ is\ called\ whenever\r\n\ the\ 'Act'\ or\ 'Run'\ button\ gets\ pressed\ in\ the\ environment.\r\n
comment3.params=
comment3.target=void\ loescheMich()
comment4.params=
comment4.target=void\ bewege()
numComments=5
+41
View File
@@ -0,0 +1,41 @@
import greenfoot.*; // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
/**
* Write a description of class Spike here.
*
* @author (your name)
* @version (a version number or a date)
*/
public class Spike extends Actor
{
int speed;
public Spike(int pSpeed)
{
speed=pSpeed;
}
/**
* Act - do whatever the Spike wants to do. This method is called whenever
* the 'Act' or 'Run' button gets pressed in the environment.
*/
public void act()
{
this.bewege();
}
public void loescheMich()
{
MyWorld theWorld= (MyWorld) this.getWorld();
theWorld.removeObject(this);
}
public void bewege()
{
this.setLocation(this.getX(), this.getY()+speed);
MyWorld theWorld= (MyWorld) this.getWorld();
if(this.getY()>=theWorld.getHeight()-5)
{
this.loescheMich();
}
}
}
Binary file not shown.
+13
View File
@@ -0,0 +1,13 @@
#BlueJ class context
comment0.target=SpikedPlattform
comment0.text=\r\n\ Write\ a\ description\ of\ class\ SpikedPlattform\ here.\r\n\ \r\n\ @author\ (your\ name)\ \r\n\ @version\ (a\ version\ number\ or\ a\ date)\r\n
comment1.params=pSpikeCountdown
comment1.target=SpikedPlattform(int)
comment2.params=
comment2.target=void\ act()
comment2.text=\r\n\ Act\ -\ do\ whatever\ the\ SpikedPlattform\ wants\ to\ do.\ This\ method\ is\ called\ whenever\r\n\ the\ 'Act'\ or\ 'Run'\ button\ gets\ pressed\ in\ the\ environment.\r\n
comment3.params=
comment3.target=void\ activateSpikes()
comment4.params=
comment4.target=void\ spikeTheSurface()
numComments=5
+63
View File
@@ -0,0 +1,63 @@
import greenfoot.*; // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
/**
* Write a description of class SpikedPlattform here.
*
* @author (your name)
* @version (a version number or a date)
*/
public class SpikedPlattform extends Plattform
{
int SpikeCountdown;
boolean spikesActivated=false;
boolean isSpiked=false;
Spike[] hasSpikes= new Spike[5];
public SpikedPlattform(int pSpikeCountdown)
{
SpikeCountdown=pSpikeCountdown;
}
/**
* Act - do whatever the SpikedPlattform wants to do. This method is called whenever
* the 'Act' or 'Run' button gets pressed in the environment.
*/
public void act()
{
// Add your action code here.
if(this.PlayerOnPlattform() && spikesActivated== false)
{
this.activateSpikes();
}
if(spikesActivated)
{
SpikeCountdown--;
}
if(SpikeCountdown==0)
{
this.spikeTheSurface();
}
super.act();
}
public void activateSpikes()
{
spikesActivated=true;
MyWorld theWorld= (MyWorld) this.getWorld();
for(int i=-6; i<7; i++)
{
theWorld.addObject(new UnactiveSpike(2,SpikeCountdown, this ), this.getX()+i* (this.getImage().getWidth()/13), this.getY()-(this.getImage().getHeight()/2));
}
//Sound
//setImage
}
public void spikeTheSurface()
{
isSpiked=true;
//Soun)
//setImage
}
}
Binary file not shown.
+1 -1
View File
@@ -26,7 +26,7 @@ public class StartWorld extends World
private void prepare() private void prepare()
{ {
Button button = new Button(); Button button = new Button();
addObject(button,200,350); addObject(button,200,310);
button.setImage("Start.png"); button.setImage("Start.png");
} }
} }
Binary file not shown.
+9
View File
@@ -0,0 +1,9 @@
#BlueJ class context
comment0.target=TargetingProjectile
comment0.text=\r\n\ Write\ a\ description\ of\ class\ TargetingProjectile\ 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()
comment1.text=\r\n\ Act\ -\ do\ whatever\ the\ TargetingProjectile\ wants\ to\ do.\ This\ method\ is\ called\ whenever\r\n\ the\ 'Act'\ or\ 'Run'\ button\ gets\ pressed\ in\ the\ environment.\r\n
comment2.params=
comment2.target=void\ targetPlayer()
numComments=3
+32
View File
@@ -0,0 +1,32 @@
import greenfoot.*; // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
/**
* Write a description of class TargetingProjectile here.
*
* @author (your name)
* @version (a version number or a date)
*/
public class TargetingProjectile extends Projectile
{
/**
* Act - do whatever the TargetingProjectile wants to do. This method is called whenever
* the 'Act' or 'Run' button gets pressed in the environment.
*/
public void act()
{
targetPlayer();
falling();
}
public void targetPlayer(){
Player player = (Player) getWorld().getObjects(Player.class).get(0);
int playerX = player.getX();
int playerY = player.getY();
turnTowards(playerX, playerY);
move(1);
if(getY() > playerY){
setLocation(getX(),getY()+5);
}
}
}
Binary file not shown.
+17
View File
@@ -0,0 +1,17 @@
#BlueJ class context
comment0.target=TemporaryGround
comment0.text=\r\n\ Write\ a\ description\ of\ class\ TemporaryGround\ here.\r\n\ \r\n\ @author\ (your\ name)\ \r\n\ @version\ (a\ version\ number\ or\ a\ date)\r\n
comment1.params=pLebensdauer
comment1.target=TemporaryGround(int)
comment2.params=
comment2.target=void\ act()
comment2.text=\r\n\ Act\ -\ do\ whatever\ the\ TemporaryGround\ wants\ to\ do.\ This\ method\ is\ called\ whenever\r\n\ the\ 'Act'\ or\ 'Run'\ button\ gets\ pressed\ in\ the\ environment.\r\n
comment3.params=
comment3.target=void\ warning()
comment4.params=
comment4.target=void\ noMoreWarning()
comment5.params=pDuration
comment5.target=void\ RefreshLifeToDuration(int)
comment6.params=
comment6.target=void\ Buffer()
numComments=7
+71
View File
@@ -0,0 +1,71 @@
import greenfoot.*; // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
/**
* Write a description of class TemporaryGround here.
*
* @author (your name)
* @version (a version number or a date)
*/
public class TemporaryGround extends Plattform
{
private int Lebensdauer;
boolean warningHasHappend=false;
boolean deWarningHasHappend=true;
public TemporaryGround(int pLebensdauer)
{
Lebensdauer=pLebensdauer;
}
/**
* Act - do whatever the TemporaryGround wants to do. This method is called whenever
* the 'Act' or 'Run' button gets pressed in the environment.
*/
public void act()
{
// Add your action code here.
this.Buffer();
Lebensdauer--;
if(Lebensdauer==0)
{
this.loescheMich();
}
if(Lebensdauer<60*3 && warningHasHappend==false) //3 Sekunden
{
this.warning();
}
if(Lebensdauer>=60*3 && deWarningHasHappend==false)
{
this.noMoreWarning();
}
}
public void warning()
{
this.setImage("BreakingGround.png");
warningHasHappend=true;
deWarningHasHappend=false;
}
public void noMoreWarning()
{
this.setImage("Ground.png");
warningHasHappend=false;
deWarningHasHappend=true;
}
public void RefreshLifeToDuration(int pDuration)
{
Lebensdauer=pDuration;
}
public void Buffer()
{
{
Player player= this.getWorld().getObjects(Player.class).get(0);
if(this.intersects(player))
{
player.setLocation(player.getX(), this.getY()-this.getImage().getHeight()-5);
}
}
}
}
Binary file not shown.
+13
View File
@@ -0,0 +1,13 @@
#BlueJ class context
comment0.target=UnactiveSpike
comment0.text=\r\n\ Write\ a\ description\ of\ class\ UnactiveSpike\ here.\r\n\ \r\n\ @author\ (your\ name)\ \r\n\ @version\ (a\ version\ number\ or\ a\ date)\r\n
comment1.params=pSpeed\ pCoundown\ pPlattform
comment1.target=UnactiveSpike(int,\ int,\ SpikedPlattform)
comment2.params=
comment2.target=void\ act()
comment2.text=\r\n\ Act\ -\ do\ whatever\ the\ UnactiveSpike\ wants\ to\ do.\ This\ method\ is\ called\ whenever\r\n\ the\ 'Act'\ or\ 'Run'\ button\ gets\ pressed\ in\ the\ environment.\r\n
comment3.params=
comment3.target=void\ loescheMich()
comment4.params=
comment4.target=void\ bewege()
numComments=5
+58
View File
@@ -0,0 +1,58 @@
import greenfoot.*; // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
/**
* Write a description of class UnactiveSpike here.
*
* @author (your name)
* @version (a version number or a date)
*/
public class UnactiveSpike extends Actor
{
int countdown;
int speed;
boolean geloescht=false;
public UnactiveSpike(int pSpeed, int pCoundown, SpikedPlattform pPlattform)
{
speed=pSpeed;
countdown=pCoundown;
}
/**
* Act - do whatever the UnactiveSpike wants to do. This method is called whenever
* the 'Act' or 'Run' button gets pressed in the environment.
*/
public void act()
{
this.bewege();
countdown--;
if(countdown==0)
{
MyWorld theWorld= (MyWorld) this.getWorld();
Spike BeispielSpike=new Spike(1);
GreenfootImage SpikeImage= BeispielSpike.getImage();
theWorld.addObject(new Spike(speed), this.getX(), (this.getY()- this.getImage().getHeight()/2)-2); //die Zahl Minus damit ist endlich passt
geloescht=true;
}
if(geloescht)
{
this.loescheMich();
}
}
public void loescheMich()
{
MyWorld theWorld= (MyWorld) this.getWorld();
theWorld.removeObject(this);
}
public void bewege()
{
this.setLocation(this.getX(), this.getY()+speed);
MyWorld theWorld= (MyWorld) this.getWorld();
if(this.getY()>=theWorld.getHeight()-5)
{
geloescht=true;
}
}
}
+148
View File
@@ -0,0 +1,148 @@
<!DOCTYPE HTML>
<html lang="de">
<head>
<!-- Generated by javadoc (21) on Wed Sep 16 11:08:05 CEST 2026 -->
<title>Score</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="dc.created" content="2026-09-16">
<meta name="description" content="declaration: class: Score">
<meta name="generator" content="javadoc/ClassWriterImpl">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<script type="text/javascript" src="script.js"></script>
</head>
<body class="class-declaration-page">
<script type="text/javascript"></script>
<noscript>
<div>JavaScript ist im Browser deaktiviert.</div>
</noscript>
<div class="flex-box">
<div class="flex-content">
<main role="main">
<!-- ======== START OF CLASS DATA ======== -->
<div class="header">
<h1 title="Klasse Score" class="title">Klasse Score</h1>
</div>
<div class="inheritance" title="Vererbungsbaum"><a href="https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/lang/Object.html" title="Klasse oder Schnittstelle in java.lang" class="external-link">java.lang.Object</a>
<div class="inheritance">greenfoot.Actor
<div class="inheritance">Score</div>
</div>
</div>
<section class="class-description" id="class-description">
<hr>
<div class="type-signature"><span class="modifiers">public class </span><span class="element-name type-name-label">Score</span>
<span class="extends-implements">extends greenfoot.Actor</span></div>
<div class="block">Write a description of class UI here.</div>
<dl class="notes">
<dt>Version:</dt>
<dd>(a version number or a date)</dd>
<dt>Autor:</dt>
<dd>(your name)</dd>
</dl>
</section>
<section class="summary">
<ul class="summary-list">
<!-- ======== CONSTRUCTOR SUMMARY ======== -->
<li>
<section class="constructor-summary" id="constructor-summary">
<h2>Konstruktorübersicht</h2>
<div class="caption"><span>Konstruktoren</span></div>
<div class="summary-table two-column-summary">
<div class="table-header col-first">Konstruktor</div>
<div class="table-header col-last">Beschreibung</div>
<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E()" class="member-name-link">Score</a>()</code></div>
<div class="col-last even-row-color">&nbsp;</div>
</div>
</section>
</li>
<!-- ========== METHOD SUMMARY =========== -->
<li>
<section class="method-summary" id="method-summary">
<h2>Methodenübersicht</h2>
<div id="method-summary-table">
<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">Alle Methoden</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instanzmethoden</button><button id="method-summary-table-tab4" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab4', 3)" class="table-tab">Konkrete Methoden</button></div>
<div id="method-summary-table.tabpanel" role="tabpanel" aria-labelledby="method-summary-table-tab0">
<div class="summary-table three-column-summary">
<div class="table-header col-first">Modifizierer und Typ</div>
<div class="table-header col-second">Methode</div>
<div class="table-header col-last">Beschreibung</div>
<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#act()" class="member-name-link">act</a>()</code></div>
<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
<div class="block">Act - do whatever the UI wants to do.</div>
</div>
<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>int</code></div>
<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#calculate_score()" class="member-name-link">calculate_score</a>()</code></div>
<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#draw_score()" class="member-name-link">draw_score</a>()</code></div>
<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
</div>
</div>
</div>
<div class="inherited-list">
<h3 id="methods-inherited-from-class-greenfoot.Actor">Von Klasse geerbte Methoden&nbsp;greenfoot.Actor</h3>
<code>addedToWorld, getImage, getIntersectingObjects, getNeighbours, getObjectsAtOffset, getObjectsInRange, getOneIntersectingObject, getOneObjectAtOffset, getRotation, getWorld, getWorldOfType, getX, getY, intersects, isAtEdge, isTouching, move, removeTouching, setImage, setImage, setLocation, setRotation, sleepFor, turn, turnTowards</code></div>
<div class="inherited-list">
<h3 id="methods-inherited-from-class-java.lang.Object">Von Klasse geerbte Methoden&nbsp;java.lang.<a href="https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/lang/Object.html" title="Klasse oder Schnittstelle in java.lang" class="external-link">Object</a></h3>
<code><a href="https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/lang/Object.html#clone()" title="Klasse oder Schnittstelle in java.lang" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="Klasse oder Schnittstelle in java.lang" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/lang/Object.html#getClass()" title="Klasse oder Schnittstelle in java.lang" class="external-link">getClass</a>, <a href="https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/lang/Object.html#hashCode()" title="Klasse oder Schnittstelle in java.lang" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/lang/Object.html#notify()" title="Klasse oder Schnittstelle in java.lang" class="external-link">notify</a>, <a href="https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/lang/Object.html#notifyAll()" title="Klasse oder Schnittstelle in java.lang" class="external-link">notifyAll</a>, <a href="https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/lang/Object.html#toString()" title="Klasse oder Schnittstelle in java.lang" class="external-link">toString</a>, <a href="https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/lang/Object.html#wait()" title="Klasse oder Schnittstelle in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/lang/Object.html#wait(long)" title="Klasse oder Schnittstelle in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/lang/Object.html#wait(long,int)" title="Klasse oder Schnittstelle in java.lang" class="external-link">wait</a></code></div>
</section>
</li>
</ul>
</section>
<section class="details">
<ul class="details-list">
<!-- ========= CONSTRUCTOR DETAIL ======== -->
<li>
<section class="constructor-details" id="constructor-detail">
<h2>Konstruktordetails</h2>
<ul class="member-list">
<li>
<section class="detail" id="&lt;init&gt;()">
<h3>Score</h3>
<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name">Score</span>()</div>
</section>
</li>
</ul>
</section>
</li>
<!-- ============ METHOD DETAIL ========== -->
<li>
<section class="method-details" id="method-detail">
<h2>Methodendetails</h2>
<ul class="member-list">
<li>
<section class="detail" id="act()">
<h3>act</h3>
<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name">act</span>()</div>
<div class="block">Act - do whatever the UI wants to do. This method is called whenever
the 'Act' or 'Run' button gets pressed in the environment.</div>
<dl class="notes">
<dt>Setzt außer Kraft:</dt>
<dd><code>act</code>&nbsp;in Klasse&nbsp;<code>greenfoot.Actor</code></dd>
</dl>
</section>
</li>
<li>
<section class="detail" id="draw_score()">
<h3>draw_score</h3>
<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name">draw_score</span>()</div>
</section>
</li>
<li>
<section class="detail" id="calculate_score()">
<h3>calculate_score</h3>
<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name">calculate_score</span>()</div>
</section>
</li>
</ul>
</section>
</li>
</ul>
</section>
<!-- ========= END OF CLASS DATA ========= -->
</main>
</div>
</div>
</body>
</html>
+2 -2
View File
@@ -1,11 +1,11 @@
<!DOCTYPE HTML> <!DOCTYPE HTML>
<html lang="de"> <html lang="de">
<head> <head>
<!-- Generated by javadoc (21) on Tue Sep 15 12:14:29 CEST 2026 --> <!-- Generated by javadoc (21) on Wed Sep 16 11:08:05 CEST 2026 -->
<title>Generierte Dokumentation (unbenannt)</title> <title>Generierte Dokumentation (unbenannt)</title>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="dc.created" content="2026-09-15"> <meta name="dc.created" content="2026-09-16">
<meta name="description" content="index redirect"> <meta name="description" content="index redirect">
<meta name="generator" content="javadoc/IndexRedirectWriter"> <meta name="generator" content="javadoc/IndexRedirectWriter">
<link rel="canonical" href="package-summary.html"> <link rel="canonical" href="package-summary.html">
+3 -3
View File
@@ -20,16 +20,16 @@ C:\Users\Marlie\Documents\Workspace\SMIMS_2026_2\SMIMS-Game\doc
UTF-8 UTF-8
-charset -charset
UTF-8 UTF-8
C:\Users\Marlie\Documents\Workspace\SMIMS_2026_2\SMIMS-Game\StartWorld.java C:\Users\Marlie\Documents\Workspace\SMIMS_2026_2\SMIMS-Game\Score.java
<---- end of javadoc command ----> <---- end of javadoc command ---->
Quelldatei C:\Users\Marlie\Documents\Workspace\SMIMS_2026_2\SMIMS-Game\StartWorld.java wird geladen... Quelldatei C:\Users\Marlie\Documents\Workspace\SMIMS_2026_2\SMIMS-Game\Score.java wird geladen...
Javadoc-Informationen werden erstellt... Javadoc-Informationen werden erstellt...
Warnung: Unbekannte Enum-Konstante Tag.Any Warnung: Unbekannte Enum-Konstante Tag.Any
Grund: Klassendatei für threadchecker.Tag nicht gefunden Grund: Klassendatei für threadchecker.Tag nicht gefunden
Warnung: Unbekannte Enum-Konstante Tag.Any Warnung: Unbekannte Enum-Konstante Tag.Any
Standard-Doclet-Version 21.0.4+7-LTS Standard-Doclet-Version 21.0.4+7-LTS
Baum für alle Packages und Klassen wird erstellt... Baum für alle Packages und Klassen wird erstellt...
C:\Users\Marlie\Documents\Workspace\SMIMS_2026_2\SMIMS-Game\doc\StartWorld.html wird generiert... C:\Users\Marlie\Documents\Workspace\SMIMS_2026_2\SMIMS-Game\doc\Score.html wird generiert...
C:\Users\Marlie\Documents\Workspace\SMIMS_2026_2\SMIMS-Game\doc\package-summary.html wird generiert... C:\Users\Marlie\Documents\Workspace\SMIMS_2026_2\SMIMS-Game\doc\package-summary.html wird generiert...
C:\Users\Marlie\Documents\Workspace\SMIMS_2026_2\SMIMS-Game\doc\index.html wird generiert... C:\Users\Marlie\Documents\Workspace\SMIMS_2026_2\SMIMS-Game\doc\index.html wird generiert...
2 Warnungen 2 Warnungen
+4 -4
View File
@@ -1,11 +1,11 @@
<!DOCTYPE HTML> <!DOCTYPE HTML>
<html lang="de"> <html lang="de">
<head> <head>
<!-- Generated by javadoc (21) on Tue Sep 15 12:14:29 CEST 2026 --> <!-- Generated by javadoc (21) on Wed Sep 16 11:08:05 CEST 2026 -->
<title>Unbenanntes Package</title> <title>Unbenanntes Package</title>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="dc.created" content="2026-09-15"> <meta name="dc.created" content="2026-09-16">
<meta name="description" content="declaration: package: &lt;unnamed&gt;"> <meta name="description" content="declaration: package: &lt;unnamed&gt;">
<meta name="generator" content="javadoc/PackageWriterImpl"> <meta name="generator" content="javadoc/PackageWriterImpl">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style"> <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
@@ -31,9 +31,9 @@
<div class="summary-table two-column-summary"> <div class="summary-table two-column-summary">
<div class="table-header col-first">Klasse</div> <div class="table-header col-first">Klasse</div>
<div class="table-header col-last">Beschreibung</div> <div class="table-header col-last">Beschreibung</div>
<div class="col-first even-row-color class-summary class-summary-tab2"><a href="StartWorld.html" title="Klasse in Unbenanntes Package">StartWorld</a></div> <div class="col-first even-row-color class-summary class-summary-tab2"><a href="Score.html" title="Klasse in Unbenanntes Package">Score</a></div>
<div class="col-last even-row-color class-summary class-summary-tab2"> <div class="col-last even-row-color class-summary class-summary-tab2">
<div class="block">Write a description of class StartWorld here.</div> <div class="block">Write a description of class UI here.</div>
</div> </div>
</div> </div>
</div> </div>
Binary file not shown.

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 139 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 41 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.8 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 981 B

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 707 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 750 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 160 KiB

After

Width:  |  Height:  |  Size: 272 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 124 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 971 B

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 610 B

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 776 B

Some files were not shown because too many files have changed in this diff Show More