diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ + diff --git a/spaceinvaders/.metadata/.log b/spaceinvaders/.metadata/.log index 5835675..8cc728a 100644 --- a/spaceinvaders/.metadata/.log +++ b/spaceinvaders/.metadata/.log @@ -51,3 +51,207 @@ user global configuration and to define the default location to store repositori not correct please set the HOME environment variable and restart Eclipse. Otherwise Git for Windows and EGit might behave differently since they see different configuration options. This warning can be switched off on the Team > Git > Confirmations and Warnings preference page. +!SESSION 2022-05-11 22:09:40.657 ----------------------------------------------- +eclipse.buildId=4.23.0.I20220308-0310 +java.version=17.0.2 +java.vendor=Eclipse Adoptium +BootLoader constants: OS=win32, ARCH=x86_64, WS=win32, NL=de_DE +Framework arguments: -product org.eclipse.epp.package.java.product +Command-line arguments: -os win32 -ws win32 -arch x86_64 -product org.eclipse.epp.package.java.product + +!ENTRY org.eclipse.core.resources 2 10035 2022-05-11 22:10:01.438 +!MESSAGE The workspace exited with unsaved changes in the previous session; refreshing workspace to recover changes. + +!ENTRY org.eclipse.core.resources 4 567 2022-05-11 22:10:01.564 +!MESSAGE Workspace restored, but some problems occurred. +!SUBENTRY 1 org.eclipse.core.resources 4 567 2022-05-11 22:10:01.564 +!MESSAGE Could not read metadata for '.org.eclipse.egit.core.cmp'. +!STACK 1 +org.eclipse.core.internal.resources.ResourceException(/.org.eclipse.egit.core.cmp)[567]: java.lang.Exception: The project description file (.project) for '.org.eclipse.egit.core.cmp' is missing. This file contains important information about the project. The project will not function properly until this file is restored. + at org.eclipse.core.internal.resources.ResourceException.provideStackTrace(ResourceException.java:42) + at org.eclipse.core.internal.resources.ResourceException.(ResourceException.java:38) + at org.eclipse.core.internal.localstore.FileSystemResourceManager.read(FileSystemResourceManager.java:908) + at org.eclipse.core.internal.resources.SaveManager.restoreMetaInfo(SaveManager.java:888) + at org.eclipse.core.internal.resources.SaveManager.restoreMetaInfo(SaveManager.java:868) + at org.eclipse.core.internal.resources.SaveManager.restore(SaveManager.java:724) + at org.eclipse.core.internal.resources.SaveManager.startup(SaveManager.java:1555) + at org.eclipse.core.internal.resources.Workspace.startup(Workspace.java:2482) + at org.eclipse.core.internal.resources.Workspace.open(Workspace.java:2233) + at org.eclipse.core.resources.ResourcesPlugin.start(ResourcesPlugin.java:475) + at org.eclipse.osgi.internal.framework.BundleContextImpl$2.run(BundleContextImpl.java:813) + at org.eclipse.osgi.internal.framework.BundleContextImpl$2.run(BundleContextImpl.java:1) + at java.base/java.security.AccessController.doPrivileged(AccessController.java:569) + at org.eclipse.osgi.internal.framework.BundleContextImpl.startActivator(BundleContextImpl.java:805) + at org.eclipse.osgi.internal.framework.BundleContextImpl.start(BundleContextImpl.java:762) + at org.eclipse.osgi.internal.framework.EquinoxBundle.startWorker0(EquinoxBundle.java:1032) + at org.eclipse.osgi.internal.framework.EquinoxBundle$EquinoxModule.startWorker(EquinoxBundle.java:371) + at org.eclipse.osgi.container.Module.doStart(Module.java:605) + at org.eclipse.osgi.container.Module.start(Module.java:468) + at org.eclipse.osgi.framework.util.SecureAction.start(SecureAction.java:513) + at org.eclipse.osgi.internal.hooks.EclipseLazyStarter.postFindLocalClass(EclipseLazyStarter.java:117) + at org.eclipse.osgi.internal.loader.classpath.ClasspathManager.findLocalClass(ClasspathManager.java:570) + at org.eclipse.osgi.internal.loader.ModuleClassLoader.findLocalClass(ModuleClassLoader.java:335) + at org.eclipse.osgi.internal.loader.BundleLoader.findLocalClass(BundleLoader.java:397) + at org.eclipse.osgi.internal.loader.sources.SingleSourcePackage.loadClass(SingleSourcePackage.java:41) + at org.eclipse.osgi.internal.loader.BundleLoader.findClass0(BundleLoader.java:484) + at org.eclipse.osgi.internal.loader.BundleLoader.findClass(BundleLoader.java:416) + at org.eclipse.osgi.internal.loader.ModuleClassLoader.loadClass(ModuleClassLoader.java:168) + at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:520) + at org.eclipse.ui.internal.ide.application.IDEApplication.start(IDEApplication.java:153) + at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:203) + at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:136) + at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:104) + at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:401) + at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:255) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77) + at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.base/java.lang.reflect.Method.invoke(Method.java:568) + at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:659) + at org.eclipse.equinox.launcher.Main.basicRun(Main.java:596) + at org.eclipse.equinox.launcher.Main.run(Main.java:1467) +!SUBENTRY 2 org.eclipse.core.resources 4 567 2022-05-11 22:10:01.566 +!MESSAGE The project description file (.project) for '.org.eclipse.egit.core.cmp' is missing. This file contains important information about the project. The project will not function properly until this file is restored. +!STACK 0 +java.lang.Exception: The project description file (.project) for '.org.eclipse.egit.core.cmp' is missing. This file contains important information about the project. The project will not function properly until this file is restored. + at org.eclipse.core.internal.resources.ResourceException.provideStackTrace(ResourceException.java:42) + at org.eclipse.core.internal.resources.ResourceException.(ResourceException.java:38) + at org.eclipse.core.internal.localstore.FileSystemResourceManager.read(FileSystemResourceManager.java:908) + at org.eclipse.core.internal.resources.SaveManager.restoreMetaInfo(SaveManager.java:888) + at org.eclipse.core.internal.resources.SaveManager.restoreMetaInfo(SaveManager.java:868) + at org.eclipse.core.internal.resources.SaveManager.restore(SaveManager.java:724) + at org.eclipse.core.internal.resources.SaveManager.startup(SaveManager.java:1555) + at org.eclipse.core.internal.resources.Workspace.startup(Workspace.java:2482) + at org.eclipse.core.internal.resources.Workspace.open(Workspace.java:2233) + at org.eclipse.core.resources.ResourcesPlugin.start(ResourcesPlugin.java:475) + at org.eclipse.osgi.internal.framework.BundleContextImpl$2.run(BundleContextImpl.java:813) + at org.eclipse.osgi.internal.framework.BundleContextImpl$2.run(BundleContextImpl.java:1) + at java.base/java.security.AccessController.doPrivileged(AccessController.java:569) + at org.eclipse.osgi.internal.framework.BundleContextImpl.startActivator(BundleContextImpl.java:805) + at org.eclipse.osgi.internal.framework.BundleContextImpl.start(BundleContextImpl.java:762) + at org.eclipse.osgi.internal.framework.EquinoxBundle.startWorker0(EquinoxBundle.java:1032) + at org.eclipse.osgi.internal.framework.EquinoxBundle$EquinoxModule.startWorker(EquinoxBundle.java:371) + at org.eclipse.osgi.container.Module.doStart(Module.java:605) + at org.eclipse.osgi.container.Module.start(Module.java:468) + at org.eclipse.osgi.framework.util.SecureAction.start(SecureAction.java:513) + at org.eclipse.osgi.internal.hooks.EclipseLazyStarter.postFindLocalClass(EclipseLazyStarter.java:117) + at org.eclipse.osgi.internal.loader.classpath.ClasspathManager.findLocalClass(ClasspathManager.java:570) + at org.eclipse.osgi.internal.loader.ModuleClassLoader.findLocalClass(ModuleClassLoader.java:335) + at org.eclipse.osgi.internal.loader.BundleLoader.findLocalClass(BundleLoader.java:397) + at org.eclipse.osgi.internal.loader.sources.SingleSourcePackage.loadClass(SingleSourcePackage.java:41) + at org.eclipse.osgi.internal.loader.BundleLoader.findClass0(BundleLoader.java:484) + at org.eclipse.osgi.internal.loader.BundleLoader.findClass(BundleLoader.java:416) + at org.eclipse.osgi.internal.loader.ModuleClassLoader.loadClass(ModuleClassLoader.java:168) + at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:520) + at org.eclipse.ui.internal.ide.application.IDEApplication.start(IDEApplication.java:153) + at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:203) + at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:136) + at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:104) + at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:401) + at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:255) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77) + at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.base/java.lang.reflect.Method.invoke(Method.java:568) + at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:659) + at org.eclipse.equinox.launcher.Main.basicRun(Main.java:596) + at org.eclipse.equinox.launcher.Main.run(Main.java:1467) + +!ENTRY org.eclipse.jface 2 0 2022-05-11 22:10:03.776 +!MESSAGE Keybinding conflicts occurred. They may interfere with normal accelerator operation. +!SUBENTRY 1 org.eclipse.jface 2 0 2022-05-11 22:10:03.776 +!MESSAGE A conflict occurred for CTRL+SHIFT+T: +Binding(CTRL+SHIFT+T, + ParameterizedCommand(Command(org.eclipse.jdt.ui.navigate.open.type,Open Type, + Open a type in a Java editor, + Category(org.eclipse.ui.category.navigate,Navigate,null,true), + org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@7210f559, + ,,true),null), + org.eclipse.ui.defaultAcceleratorConfiguration, + org.eclipse.ui.contexts.window,,,system) +Binding(CTRL+SHIFT+T, + ParameterizedCommand(Command(org.eclipse.lsp4e.symbolinworkspace,Go to Symbol in Workspace, + , + Category(org.eclipse.lsp4e.category,Language Servers,null,true), + org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@49b9ba6a, + ,,true),null), + org.eclipse.ui.defaultAcceleratorConfiguration, + org.eclipse.ui.contexts.window,,,system) +!SUBENTRY 1 org.eclipse.jface 2 0 2022-05-11 22:10:03.776 +!MESSAGE A conflict occurred for ALT+SHIFT+R: +Binding(ALT+SHIFT+R, + ParameterizedCommand(Command(org.eclipse.jdt.ui.edit.text.java.rename.element,Rename - Refactoring , + Rename the selected element, + Category(org.eclipse.jdt.ui.category.refactoring,Refactor - Java,Java Refactoring Actions,true), + org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@7be62956, + ,,true),null), + org.eclipse.ui.defaultAcceleratorConfiguration, + org.eclipse.ui.contexts.window,,,system) +Binding(ALT+SHIFT+R, + ParameterizedCommand(Command(org.eclipse.ui.edit.rename,Rename, + Rename the selected item, + Category(org.eclipse.ui.category.file,File,null,true), + org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@30e143ff, + ,,true),null), + org.eclipse.ui.defaultAcceleratorConfiguration, + org.eclipse.ui.contexts.window,,,system) + +!ENTRY org.eclipse.egit.ui 2 0 2022-05-11 22:10:22.885 +!MESSAGE Warning: The environment variable HOME is not set. The following directory will be used to store the Git +user global configuration and to define the default location to store repositories: 'C:\Users\Shadow'. If this is +not correct please set the HOME environment variable and restart Eclipse. Otherwise Git for Windows and +EGit might behave differently since they see different configuration options. +This warning can be switched off on the Team > Git > Confirmations and Warnings preference page. +!SESSION 2022-05-11 22:23:03.056 ----------------------------------------------- +eclipse.buildId=4.23.0.I20220308-0310 +java.version=17.0.2 +java.vendor=Eclipse Adoptium +BootLoader constants: OS=win32, ARCH=x86_64, WS=win32, NL=de_DE +Framework arguments: -product org.eclipse.epp.package.java.product +Command-line arguments: -os win32 -ws win32 -arch x86_64 -product org.eclipse.epp.package.java.product + +!ENTRY org.eclipse.jface 2 0 2022-05-11 22:23:10.102 +!MESSAGE Keybinding conflicts occurred. They may interfere with normal accelerator operation. +!SUBENTRY 1 org.eclipse.jface 2 0 2022-05-11 22:23:10.102 +!MESSAGE A conflict occurred for CTRL+SHIFT+T: +Binding(CTRL+SHIFT+T, + ParameterizedCommand(Command(org.eclipse.jdt.ui.navigate.open.type,Open Type, + Open a type in a Java editor, + Category(org.eclipse.ui.category.navigate,Navigate,null,true), + org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@7507d96c, + ,,true),null), + org.eclipse.ui.defaultAcceleratorConfiguration, + org.eclipse.ui.contexts.window,,,system) +Binding(CTRL+SHIFT+T, + ParameterizedCommand(Command(org.eclipse.lsp4e.symbolinworkspace,Go to Symbol in Workspace, + , + Category(org.eclipse.lsp4e.category,Language Servers,null,true), + org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@7210f559, + ,,true),null), + org.eclipse.ui.defaultAcceleratorConfiguration, + org.eclipse.ui.contexts.window,,,system) +!SUBENTRY 1 org.eclipse.jface 2 0 2022-05-11 22:23:10.102 +!MESSAGE A conflict occurred for ALT+SHIFT+R: +Binding(ALT+SHIFT+R, + ParameterizedCommand(Command(org.eclipse.jdt.ui.edit.text.java.rename.element,Rename - Refactoring , + Rename the selected element, + Category(org.eclipse.jdt.ui.category.refactoring,Refactor - Java,Java Refactoring Actions,true), + org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@49b9ba6a, + ,,true),null), + org.eclipse.ui.defaultAcceleratorConfiguration, + org.eclipse.ui.contexts.window,,,system) +Binding(ALT+SHIFT+R, + ParameterizedCommand(Command(org.eclipse.ui.edit.rename,Rename, + Rename the selected item, + Category(org.eclipse.ui.category.file,File,null,true), + org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@7be62956, + ,,true),null), + org.eclipse.ui.defaultAcceleratorConfiguration, + org.eclipse.ui.contexts.window,,,system) + +!ENTRY org.eclipse.egit.ui 2 0 2022-05-11 22:23:15.443 +!MESSAGE Warning: The environment variable HOME is not set. The following directory will be used to store the Git +user global configuration and to define the default location to store repositories: 'C:\Users\Shadow'. If this is +not correct please set the HOME environment variable and restart Eclipse. Otherwise Git for Windows and +EGit might behave differently since they see different configuration options. +This warning can be switched off on the Team > Git > Confirmations and Warnings preference page. diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.history/0/306c019f67d1001c1f38bf860d4f945c b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.history/0/306c019f67d1001c1f38bf860d4f945c new file mode 100644 index 0000000..d7903ed --- /dev/null +++ b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.history/0/306c019f67d1001c1f38bf860d4f945c @@ -0,0 +1,26 @@ +package base; + +import java.io.IOException; + +import playground.LevelWithBox; +import playground.Level5; +import playground.Level6; +import playground.Level7; + + +public class MultiLevelGame extends GameLoop { + + @Override + void defineLevels() { + this.resetLevels(); + //this.addLevel(new LevelWithBox()); + this.addLevel(new Level5()); + this.addLevel(new Level6()); + this.addLevel(new Level7()); + } + + public static void main(String[] args) throws IOException { + MultiLevelGame mlg = new MultiLevelGame(); + mlg.runGame(args); + } +} diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.history/14/d075868967d1001c1f38bf860d4f945c b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.history/14/d075868967d1001c1f38bf860d4f945c new file mode 100644 index 0000000..befa201 --- /dev/null +++ b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.history/14/d075868967d1001c1f38bf860d4f945c @@ -0,0 +1,59 @@ +package playground; + +import java.awt.Color; +import java.awt.Font; +import java.awt.Graphics2D; +import java.awt.Polygon; +import java.awt.RenderingHints; +import java.awt.font.TextAttribute; +import java.awt.image.BufferedImage; +import java.io.*; +import java.text.AttributedString; +import java.util.LinkedList; +import controller.EnemyController; +import controller.FallingStarController; +import controller.LimitedTimeController; +import controller.ObjectController; +import controller.EgoController; +import controller.CollisionAwareEgoController; +import gameobjects.AnimatedGameobject; +import gameobjects.FallingStar; +import gameobjects.GameObject; +import gameobjects.EgoObject; +import gameobjects.TextObject; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; + +public class Level5 extends SpaceInvadersLevel { + + protected static final double ENEMYSPEEDX = 160; + protected static final double ENEMYSPEEDY = 80; + protected static final int NR_ENEMIES = 5; + + + @Override + void actionIfEnemyIsHit(GameObject e, GameObject shot) { + super.actionIfEnemyIsHit(e, shot); + System.out.println("AUA!"); + } + + @Override + protected String getStartupMessage() { + return "Level5, get ready!"; + } + + @Override + protected double calcEnemySpeedX() { + return Level5.ENEMYSPEEDX; + } + + @Override + protected double calcEnemySpeedY() { + return Level5.ENEMYSPEEDY; + } + + @Override + protected int calcNrEnemies() { + return Level5.NR_ENEMIES; + } +} diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.history/87/00c24e9067d1001c1f38bf860d4f945c b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.history/87/00c24e9067d1001c1f38bf860d4f945c new file mode 100644 index 0000000..bfc6801 --- /dev/null +++ b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.history/87/00c24e9067d1001c1f38bf860d4f945c @@ -0,0 +1,26 @@ +package base; + +import java.io.IOException; + +import playground.LevelWithBox; +import playground.Level5; +import playground.Level6; +import playground.Level7; + + +public class MultiLevelGame extends GameLoop { + + @Override + void defineLevels() { + this.resetLevels(); + this.addLevel(new LevelWithBox()); + this.addLevel(new Level5()); + this.addLevel(new Level6()); + this.addLevel(new Level7()); + } + + public static void main(String[] args) throws IOException { + MultiLevelGame mlg = new MultiLevelGame(); + mlg.runGame(args); + } +} diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.history/90/f084776868d1001c1242a4a35cdee9f4 b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.history/90/f084776868d1001c1242a4a35cdee9f4 new file mode 100644 index 0000000..d7903ed --- /dev/null +++ b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.history/90/f084776868d1001c1242a4a35cdee9f4 @@ -0,0 +1,26 @@ +package base; + +import java.io.IOException; + +import playground.LevelWithBox; +import playground.Level5; +import playground.Level6; +import playground.Level7; + + +public class MultiLevelGame extends GameLoop { + + @Override + void defineLevels() { + this.resetLevels(); + //this.addLevel(new LevelWithBox()); + this.addLevel(new Level5()); + this.addLevel(new Level6()); + this.addLevel(new Level7()); + } + + public static void main(String[] args) throws IOException { + MultiLevelGame mlg = new MultiLevelGame(); + mlg.runGame(args); + } +} diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.history/b/405d725e68d1001c1242a4a35cdee9f4 b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.history/b/405d725e68d1001c1242a4a35cdee9f4 new file mode 100644 index 0000000..bfc6801 --- /dev/null +++ b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.history/b/405d725e68d1001c1242a4a35cdee9f4 @@ -0,0 +1,26 @@ +package base; + +import java.io.IOException; + +import playground.LevelWithBox; +import playground.Level5; +import playground.Level6; +import playground.Level7; + + +public class MultiLevelGame extends GameLoop { + + @Override + void defineLevels() { + this.resetLevels(); + this.addLevel(new LevelWithBox()); + this.addLevel(new Level5()); + this.addLevel(new Level6()); + this.addLevel(new Level7()); + } + + public static void main(String[] args) throws IOException { + MultiLevelGame mlg = new MultiLevelGame(); + mlg.runGame(args); + } +} diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.history/b7/1032e95668d1001c1242a4a35cdee9f4 b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.history/b7/1032e95668d1001c1242a4a35cdee9f4 new file mode 100644 index 0000000..08f93bc --- /dev/null +++ b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.history/b7/1032e95668d1001c1242a4a35cdee9f4 @@ -0,0 +1,58 @@ +package playground; + +import java.awt.Color; +import java.awt.Font; +import java.awt.Graphics2D; +import java.awt.Polygon; +import java.awt.RenderingHints; +import java.awt.font.TextAttribute; +import java.awt.image.BufferedImage; +import java.io.*; +import java.text.AttributedString; +import java.util.LinkedList; +import controller.EnemyController; +import controller.FallingStarController; +import controller.LimitedTimeController; +import controller.ObjectController; +import controller.EgoController; +import controller.CollisionAwareEgoController; +import gameobjects.AnimatedGameobject; +import gameobjects.FallingStar; +import gameobjects.GameObject; +import gameobjects.EgoObject; +import gameobjects.TextObject; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; + +public class Level6 extends SpaceInvadersLevel { + + protected static final double ENEMYSPEEDX = 480; + protected static final double ENEMYSPEEDY = 80; + protected static final int NR_ENEMIES = 12; + + @Override + void actionIfEnemyIsHit(GameObject e, GameObject shot) { + super.actionIfEnemyIsHit(e, shot); + System.out.println("AUA!"); + } + + @Override + protected String getStartupMessage() { + return "Level6, get ready!"; + } + + @Override + protected double calcEnemySpeedX() { + return Level6.ENEMYSPEEDX; + } + + @Override + protected double calcEnemySpeedY() { + return Level6.ENEMYSPEEDY; + } + + @Override + protected int calcNrEnemies() { + return Level6.NR_ENEMIES; + } +} diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.history/c2/6016295668d1001c1242a4a35cdee9f4 b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.history/c2/6016295668d1001c1242a4a35cdee9f4 new file mode 100644 index 0000000..b77dfcc --- /dev/null +++ b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.history/c2/6016295668d1001c1242a4a35cdee9f4 @@ -0,0 +1,57 @@ +package playground; + +import java.awt.Color; +import java.awt.Font; +import java.awt.Graphics2D; +import java.awt.Polygon; +import java.awt.RenderingHints; +import java.awt.font.TextAttribute; +import java.awt.image.BufferedImage; +import java.io.*; +import java.text.AttributedString; +import java.util.LinkedList; +import controller.EnemyController; +import controller.FallingStarController; +import controller.LimitedTimeController; +import controller.ObjectController; +import controller.EgoController; +import controller.CollisionAwareEgoController; +import gameobjects.AnimatedGameobject; +import gameobjects.FallingStar; +import gameobjects.GameObject; +import gameobjects.EgoObject; +import gameobjects.TextObject; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; + +public class Level7 extends SpaceInvadersLevel { + protected static final double ENEMYSPEEDX = 800; + protected static final double ENEMYSPEEDY = 140; + protected static final int NR_ENEMIES = 21; + + @Override + void actionIfEnemyIsHit(GameObject e, GameObject shot) { + super.actionIfEnemyIsHit(e, shot); + System.out.println("AUA!"); + } + + @Override + protected String getStartupMessage() { + return "Level7, get ready!"; + } + + @Override + protected double calcEnemySpeedX() { + return Level7.ENEMYSPEEDX; + } + + @Override + protected double calcEnemySpeedY() { + return Level7.ENEMYSPEEDY; + } + + @Override + protected int calcNrEnemies() { + return Level7.NR_ENEMIES; + } +} diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.history/c4/f062237667d1001c1f38bf860d4f945c b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.history/c4/f062237667d1001c1f38bf860d4f945c new file mode 100644 index 0000000..df6d6d4 --- /dev/null +++ b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.history/c4/f062237667d1001c1f38bf860d4f945c @@ -0,0 +1,5 @@ +package playground; + +public class SpaceInvadersLevelAua extends SpaceInvadersLevel { + +} diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.history/dd/a0946d9067d1001c1f38bf860d4f945c b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.history/dd/a0946d9067d1001c1f38bf860d4f945c new file mode 100644 index 0000000..61c497a --- /dev/null +++ b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.history/dd/a0946d9067d1001c1f38bf860d4f945c @@ -0,0 +1 @@ +/playground/ diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.history/f0/80f58a6e67d1001c1f38bf860d4f945c b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.history/f0/80f58a6e67d1001c1f38bf860d4f945c new file mode 100644 index 0000000..e69de29 diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.egit.core.cmp/.location b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.egit.core.cmp/.location index bf3f4db..11fdde2 100644 Binary files a/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.egit.core.cmp/.location and b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.egit.core.cmp/.location differ diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.egit.core.cmp/.markers.snap b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.egit.core.cmp/.markers.snap deleted file mode 100644 index 3ab7083..0000000 Binary files a/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.egit.core.cmp/.markers.snap and /dev/null differ diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.egit.core.cmp/.syncinfo.snap b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.egit.core.cmp/.syncinfo.snap deleted file mode 100644 index 3ab7083..0000000 Binary files a/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.egit.core.cmp/.syncinfo.snap and /dev/null differ diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.projects/GameProject/.indexes/7/history.index b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.projects/GameProject/.indexes/7/history.index new file mode 100644 index 0000000..4337418 Binary files /dev/null and b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.projects/GameProject/.indexes/7/history.index differ diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.projects/GameProject/.indexes/e4/45/history.index b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.projects/GameProject/.indexes/e4/45/history.index new file mode 100644 index 0000000..402815a Binary files /dev/null and b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.projects/GameProject/.indexes/e4/45/history.index differ diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.projects/GameProject/.indexes/e4/d1/history.index b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.projects/GameProject/.indexes/e4/d1/history.index new file mode 100644 index 0000000..51c0465 Binary files /dev/null and b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.projects/GameProject/.indexes/e4/d1/history.index differ diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.projects/GameProject/.markers b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.projects/GameProject/.markers new file mode 100644 index 0000000..81c1b9c Binary files /dev/null and b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.projects/GameProject/.markers differ diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.projects/GameProject/.markers.snap b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.projects/GameProject/.markers.snap deleted file mode 100644 index c63c927..0000000 Binary files a/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.projects/GameProject/.markers.snap and /dev/null differ diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.projects/GameProject/.syncinfo.snap b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.projects/GameProject/.syncinfo.snap deleted file mode 100644 index 1253ec8..0000000 Binary files a/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.projects/GameProject/.syncinfo.snap and /dev/null differ diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.projects/GameProject/org.eclipse.jdt.core/state.dat b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.projects/GameProject/org.eclipse.jdt.core/state.dat new file mode 100644 index 0000000..a0b3c22 Binary files /dev/null and b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.projects/GameProject/org.eclipse.jdt.core/state.dat differ diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version new file mode 100644 index 0000000..25cb955 --- /dev/null +++ b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index index 2e4dc76..66f7e97 100644 Binary files a/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index and b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index differ diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version new file mode 100644 index 0000000..6b2aaa7 --- /dev/null +++ b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap deleted file mode 100644 index 3ab7083..0000000 Binary files a/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap and /dev/null differ diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.root/2.tree b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.root/2.tree new file mode 100644 index 0000000..3bf7b3d Binary files /dev/null and b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.root/2.tree differ diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources index f22dee3..715add5 100644 Binary files a/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources and b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources differ diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/0.snap b/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/0.snap deleted file mode 100644 index 4e789a7..0000000 Binary files a/spaceinvaders/.metadata/.plugins/org.eclipse.core.resources/0.snap and /dev/null differ diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs b/spaceinvaders/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs index 981346e..9948e00 100644 --- a/spaceinvaders/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs +++ b/spaceinvaders/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs @@ -1,2 +1,2 @@ eclipse.preferences.version=1 -org.eclipse.jdt.launching.PREF_VM_XML=\r\n\r\n \r\n \r\n \r\n\r\n +org.eclipse.jdt.launching.PREF_VM_XML=\r\n\r\n \r\n \r\n \r\n\r\n diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs b/spaceinvaders/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs new file mode 100644 index 0000000..67b1d96 --- /dev/null +++ b/spaceinvaders/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +org.eclipse.m2e.discovery.pref.projects= diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs b/spaceinvaders/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs new file mode 100644 index 0000000..2abf475 --- /dev/null +++ b/spaceinvaders/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +platformState=1652299781440 +quickStart=false +tipsAndTricks=true diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs b/spaceinvaders/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs new file mode 100644 index 0000000..b85d0db --- /dev/null +++ b/spaceinvaders/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs @@ -0,0 +1,9 @@ +//org.eclipse.ui.commands/state/org.eclipse.ui.navigator.resources.nested.changeProjectPresentation/org.eclipse.ui.commands.radioState=false +PLUGINS_NOT_ACTIVATED_ON_STARTUP=;org.eclipse.m2e.discovery; +eclipse.preferences.version=1 +org.eclipse.ui.workbench.ACTIVE_NOFOCUS_TAB_BG_END=255,255,255 +org.eclipse.ui.workbench.ACTIVE_NOFOCUS_TAB_BG_START=255,255,255 +org.eclipse.ui.workbench.ACTIVE_NOFOCUS_TAB_TEXT_COLOR=16,16,16 +org.eclipse.ui.workbench.ACTIVE_TAB_BG_END=255,255,255 +org.eclipse.ui.workbench.ACTIVE_TAB_BG_START=255,255,255 +org.eclipse.ui.workbench.INACTIVE_TAB_BG_START=242,242,242 diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.urischeme.prefs b/spaceinvaders/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.urischeme.prefs new file mode 100644 index 0000000..855d634 --- /dev/null +++ b/spaceinvaders/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.urischeme.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +processedSchemes=,eclipse+command,eclipse+mpc diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml b/spaceinvaders/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml new file mode 100644 index 0000000..257d774 --- /dev/null +++ b/spaceinvaders/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi b/spaceinvaders/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi index a908071..7da5002 100644 --- a/spaceinvaders/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi +++ b/spaceinvaders/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi @@ -1,12 +1,16 @@ - + activeSchemeId:org.eclipse.ui.defaultAcceleratorConfiguration + + + topLevel + shellMaximized @@ -196,20 +200,44 @@ categoryTag:Help - + org.eclipse.e4.primaryDataStack EditorStack active - noFocus Editor removeOnHide org.eclipse.jdt.ui.CompilationUnitEditor - active - + + Editor + removeOnHide + org.eclipse.jdt.ui.CompilationUnitEditor + + + + Editor + removeOnHide + org.eclipse.jdt.ui.CompilationUnitEditor + active + activeOnClose + + + + Editor + removeOnHide + org.eclipse.jdt.ui.CompilationUnitEditor + + + + Editor + removeOnHide + org.eclipse.jdt.ui.CompilationUnitEditor + + + Editor removeOnHide org.eclipse.jdt.ui.CompilationUnitEditor @@ -226,7 +254,7 @@ ViewMenu menuContribution:menu - + @@ -243,7 +271,7 @@ - + View categoryTag:General @@ -286,7 +314,7 @@ ViewMenu menuContribution:menu - + @@ -310,7 +338,7 @@ ViewMenu menuContribution:menu - + @@ -355,7 +383,7 @@ Draggable - + toolbarSeparator @@ -386,10 +414,7 @@ Draggable - - - - Draggable + toolbarSeparator @@ -1228,18 +1253,18 @@ View categoryTag:General - - + + glue move_after:PerspectiveSpacer SHOW_RESTORE_MENU - + move_after:Spacer Glue HIDEABLE SHOW_RESTORE_MENU - + glue move_after:SearchField SHOW_RESTORE_MENU diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/3851925960.index b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/1857163570.index similarity index 100% rename from spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/3851925960.index rename to spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/1857163570.index diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/1865797976.index b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/1865797976.index index b251f00..9ed8b48 100644 Binary files a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/1865797976.index and b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/1865797976.index differ diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/471036660.index b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/1870273661.index similarity index 76% rename from spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/471036660.index rename to spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/1870273661.index index d05978e..b063426 100644 Binary files a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/471036660.index and b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/1870273661.index differ diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/314657506.index b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/1912148065.index similarity index 100% rename from spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/314657506.index rename to spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/1912148065.index diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/1323802929.index b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/191715084.index similarity index 100% rename from spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/1323802929.index rename to spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/191715084.index diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/154772007.index b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/2769343091.index similarity index 100% rename from spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/154772007.index rename to spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/2769343091.index diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/1045345399.index b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/2774443053.index similarity index 100% rename from spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/1045345399.index rename to spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/2774443053.index diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/3667887152.index b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/2832002345.index similarity index 100% rename from spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/3667887152.index rename to spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/2832002345.index diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/2942172793.index b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/2842007843.index similarity index 100% rename from spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/2942172793.index rename to spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/2842007843.index diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/3389993303.index b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/3167495238.index similarity index 100% rename from spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/3389993303.index rename to spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/3167495238.index diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/3417787616.index b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/3417787616.index index 52361a6..66c3664 100644 Binary files a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/3417787616.index and b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/3417787616.index differ diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/2934959487.index b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/3453466620.index similarity index 100% rename from spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/2934959487.index rename to spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/3453466620.index diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/2941380907.index b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/4071806849.index similarity index 100% rename from spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/2941380907.index rename to spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/4071806849.index diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/2175876234.index b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/4116960842.index similarity index 100% rename from spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/2175876234.index rename to spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/4116960842.index diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/2165708916.index b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/4123325108.index similarity index 100% rename from spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/2165708916.index rename to spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/4123325108.index diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/1638656465.index b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/43234130.index similarity index 100% rename from spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/1638656465.index rename to spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/43234130.index diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/2954194391.index b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/468479026.index similarity index 100% rename from spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/2954194391.index rename to spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/468479026.index diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/1885772502.index b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/483141195.index similarity index 100% rename from spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/1885772502.index rename to spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/483141195.index diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/3820782742.index b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/863464288.index similarity index 100% rename from spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/3820782742.index rename to spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/863464288.index diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/assumedExternalFilesCache b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/assumedExternalFilesCache new file mode 100644 index 0000000..80fa229 Binary files /dev/null and b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/assumedExternalFilesCache differ diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache new file mode 100644 index 0000000..1813e73 Binary files /dev/null and b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache differ diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps index a665ce1..31f480f 100644 Binary files a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps and b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps differ diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache new file mode 100644 index 0000000..848e50c Binary files /dev/null and b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache differ diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt index fcdcc21..9a4c737 100644 --- a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt +++ b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt @@ -1,23 +1,23 @@ -INDEX VERSION 1.131+C:\Users\birgi\Programmierung 2\GitTeam53\spaceinvaders\.metadata\.plugins\org.eclipse.jdt.core -3851925960.index -1885772502.index -460876229.index -3389993303.index -2954194391.index -2941380907.index -1940943461.index -2165708916.index +INDEX VERSION 1.131+C:\git\codingteam0815\spaceinvaders\.metadata\.plugins\org.eclipse.jdt.core +2774443053.index +2842007843.index 3315482259.index -471036660.index -1045345399.index -2175876234.index -1323802929.index -314657506.index -154772007.index -2934959487.index -1638656465.index -3820782742.index -2942172793.index -3667887152.index +191715084.index 1865797976.index +3453466620.index +2769343091.index +4123325108.index +43234130.index 3417787616.index +483141195.index +4071806849.index +460876229.index +1912148065.index +3167495238.index +863464288.index +468479026.index +1857163570.index +2832002345.index +1940943461.index +1870273661.index +4116960842.index diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat index b511a82..aff117a 100644 Binary files a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat and b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat differ diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml index 8db86ab..e4ce963 100644 --- a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml +++ b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml @@ -1,4 +1,6 @@ + + diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml index 47f95fd..1cb4da5 100644 --- a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml +++ b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml @@ -1,4 +1,6 @@ + + diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml new file mode 100644 index 0000000..d3d388f --- /dev/null +++ b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml @@ -0,0 +1,4 @@ + + + + diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml new file mode 100644 index 0000000..9e390f5 --- /dev/null +++ b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml @@ -0,0 +1,2 @@ + + diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml new file mode 100644 index 0000000..716cf88 --- /dev/null +++ b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml @@ -0,0 +1,34 @@ + +
+
+ + + + + +
+
+
+
+
+
+
+
+ + +
+ + + + + +
+
+
+ +
+
+ + +
+
diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/0.png b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/0.png deleted file mode 100644 index c5eb718..0000000 Binary files a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/0.png and /dev/null differ diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png deleted file mode 100644 index 8f82f1b..0000000 Binary files a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png and /dev/null differ diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/2.png b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/2.png deleted file mode 100644 index 016d1b8..0000000 Binary files a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/2.png and /dev/null differ diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/3.png b/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/3.png deleted file mode 100644 index 3a09227..0000000 Binary files a/spaceinvaders/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/3.png and /dev/null differ diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log b/spaceinvaders/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log index e69de29..2ba5347 100644 --- a/spaceinvaders/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log +++ b/spaceinvaders/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log @@ -0,0 +1,2 @@ +2022-05-11 22:10:22,876 [Worker-0: Loading available Gradle versions] INFO o.e.b.c.i.u.g.PublishedGradleVersions - Gradle version information cache is not available. Remote download required. +2022-05-11 22:23:15,426 [Worker-0: Loading available Gradle versions] INFO o.e.b.c.i.u.g.PublishedGradleVersions - Gradle version information cache is up-to-date. Trying to read. diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.tips.ide/dialog_settings.xml b/spaceinvaders/.metadata/.plugins/org.eclipse.tips.ide/dialog_settings.xml new file mode 100644 index 0000000..5ca0b77 --- /dev/null +++ b/spaceinvaders/.metadata/.plugins/org.eclipse.tips.ide/dialog_settings.xml @@ -0,0 +1,3 @@ + +
+
diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.tm.terminal.view.ui/.executables/data.properties b/spaceinvaders/.metadata/.plugins/org.eclipse.tm.terminal.view.ui/.executables/data.properties new file mode 100644 index 0000000..d92c3ff --- /dev/null +++ b/spaceinvaders/.metadata/.plugins/org.eclipse.tm.terminal.view.ui/.executables/data.properties @@ -0,0 +1,6 @@ +#Wed May 11 22:16:33 CEST 2022 +0.Icon=C\:\\Program Files\\Git\\mingw64\\share\\git\\git-for-windows.ico +0.Path=C\:\\Program Files\\Git\\bin\\sh.exe +0.Translate=true +0.Args=--login -i +0.Name=Git Bash diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.ui.intro/dialog_settings.xml b/spaceinvaders/.metadata/.plugins/org.eclipse.ui.intro/dialog_settings.xml new file mode 100644 index 0000000..4868369 --- /dev/null +++ b/spaceinvaders/.metadata/.plugins/org.eclipse.ui.intro/dialog_settings.xml @@ -0,0 +1,4 @@ + +
+ +
diff --git a/spaceinvaders/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml b/spaceinvaders/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml index 37d2bc8..b1ff7f7 100644 --- a/spaceinvaders/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml +++ b/spaceinvaders/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml @@ -3,4 +3,5 @@ + \ No newline at end of file diff --git a/spaceinvaders/.metadata/version.ini b/spaceinvaders/.metadata/version.ini index c9012ea..4ead43b 100644 --- a/spaceinvaders/.metadata/version.ini +++ b/spaceinvaders/.metadata/version.ini @@ -1,3 +1,3 @@ -#Wed May 11 16:42:56 CEST 2022 +#Wed May 11 22:23:07 CEST 2022 org.eclipse.core.runtime=2 org.eclipse.platform=4.23.0.v20220308-0310 diff --git a/spaceinvaders/GameProject/bin/.gitignore b/spaceinvaders/GameProject/bin/.gitignore index aa21310..b37a95c 100644 --- a/spaceinvaders/GameProject/bin/.gitignore +++ b/spaceinvaders/GameProject/bin/.gitignore @@ -1,8 +1,2 @@ -/base/ -/collider/ -/controller/ -/gameobjects/ -/log4j2.xml /playground/ -/rendering/ -/ui/ +/base/ diff --git a/spaceinvaders/GameProject/bin/playground/Level5.class b/spaceinvaders/GameProject/bin/playground/Level5.class index 98f4c37..6568ac5 100644 Binary files a/spaceinvaders/GameProject/bin/playground/Level5.class and b/spaceinvaders/GameProject/bin/playground/Level5.class differ diff --git a/spaceinvaders/GameProject/bin/playground/Level6.class b/spaceinvaders/GameProject/bin/playground/Level6.class index 8ad7413..eac510d 100644 Binary files a/spaceinvaders/GameProject/bin/playground/Level6.class and b/spaceinvaders/GameProject/bin/playground/Level6.class differ diff --git a/spaceinvaders/GameProject/bin/playground/Level7.class b/spaceinvaders/GameProject/bin/playground/Level7.class index 3605297..b9f232a 100644 Binary files a/spaceinvaders/GameProject/bin/playground/Level7.class and b/spaceinvaders/GameProject/bin/playground/Level7.class differ diff --git a/spaceinvaders/GameProject/log/log4j.log b/spaceinvaders/GameProject/log/log4j.log index 1f5c0de..86c5e05 100644 --- a/spaceinvaders/GameProject/log/log4j.log +++ b/spaceinvaders/GameProject/log/log4j.log @@ -827,3 +827,72 @@ 2022-05-11 19:07:43,043 INFO playground.Animation - img added .\video/heart0.png 2022-05-11 19:07:43,055 INFO playground.Animation - img added .\video/heart1.png 2022-05-11 19:07:43,073 INFO playground.SpaceInvadersLevel - HIGHSCORE17200 +2022-05-11 22:12:25,968 INFO base.GameLoop - GUI starts +2022-05-11 22:12:28,134 INFO base.GameLoop - GUI NEW +2022-05-11 22:12:28,135 INFO playground.SpaceInvadersLevel - PREPARE +2022-05-11 22:12:28,188 INFO playground.Animation - img added .\video/sweetAlien0.png +2022-05-11 22:12:28,196 INFO playground.Animation - img added .\video/sweetAlien1.png +2022-05-11 22:12:28,198 INFO playground.Animation - img added .\video/sweetAlien2.png +2022-05-11 22:12:28,202 INFO playground.Animation - img added .\video/sweetAlien3.png +2022-05-11 22:12:28,207 INFO playground.Animation - img added .\video/sweetAlien4.png +2022-05-11 22:12:28,211 INFO playground.Animation - img added .\video/sweetAlien5.png +2022-05-11 22:12:28,214 INFO playground.Animation - img added .\video/sweetAlien6.png +2022-05-11 22:12:28,216 INFO playground.Animation - img added .\video/sweetAlien7.png +2022-05-11 22:12:28,223 INFO playground.Animation - img added .\video/heart0.png +2022-05-11 22:12:28,226 INFO playground.Animation - img added .\video/heart1.png +2022-05-11 22:12:28,230 INFO playground.SpaceInvadersLevel - HIGHSCORE17200 +2022-05-11 22:13:43,461 INFO base.GameLoop - Game ends. Bye. +2022-05-11 22:18:52,369 INFO base.GameLoop - GUI starts +2022-05-11 22:18:54,350 INFO base.GameLoop - GUI NEW +2022-05-11 22:18:54,351 INFO playground.SpaceInvadersLevel - PREPARE +2022-05-11 22:18:54,404 INFO playground.Animation - img added .\video/sweetAlien0.png +2022-05-11 22:18:54,412 INFO playground.Animation - img added .\video/sweetAlien1.png +2022-05-11 22:18:54,415 INFO playground.Animation - img added .\video/sweetAlien2.png +2022-05-11 22:18:54,419 INFO playground.Animation - img added .\video/sweetAlien3.png +2022-05-11 22:18:54,423 INFO playground.Animation - img added .\video/sweetAlien4.png +2022-05-11 22:18:54,427 INFO playground.Animation - img added .\video/sweetAlien5.png +2022-05-11 22:18:54,430 INFO playground.Animation - img added .\video/sweetAlien6.png +2022-05-11 22:18:54,433 INFO playground.Animation - img added .\video/sweetAlien7.png +2022-05-11 22:18:54,440 INFO playground.Animation - img added .\video/heart0.png +2022-05-11 22:18:54,443 INFO playground.Animation - img added .\video/heart1.png +2022-05-11 22:18:54,447 INFO playground.SpaceInvadersLevel - HIGHSCORE17200 +2022-05-11 22:19:04,222 INFO playground.SpaceInvadersLevel - no enemies left, level done. +2022-05-11 22:19:04,223 INFO playground.SpaceInvadersLevel - PREPARE +2022-05-11 22:19:04,229 INFO playground.Animation - img added .\video/sweetAlien0.png +2022-05-11 22:19:04,231 INFO playground.Animation - img added .\video/sweetAlien1.png +2022-05-11 22:19:04,233 INFO playground.Animation - img added .\video/sweetAlien2.png +2022-05-11 22:19:04,235 INFO playground.Animation - img added .\video/sweetAlien3.png +2022-05-11 22:19:04,237 INFO playground.Animation - img added .\video/sweetAlien4.png +2022-05-11 22:19:04,239 INFO playground.Animation - img added .\video/sweetAlien5.png +2022-05-11 22:19:04,241 INFO playground.Animation - img added .\video/sweetAlien6.png +2022-05-11 22:19:04,243 INFO playground.Animation - img added .\video/sweetAlien7.png +2022-05-11 22:19:04,247 INFO playground.Animation - img added .\video/heart0.png +2022-05-11 22:19:04,249 INFO playground.Animation - img added .\video/heart1.png +2022-05-11 22:19:04,251 INFO playground.SpaceInvadersLevel - HIGHSCORE17200 +2022-05-11 22:24:39,428 INFO base.GameLoop - GUI starts +2022-05-11 22:24:41,201 INFO base.GameLoop - GUI NEW +2022-05-11 22:24:41,202 INFO playground.SpaceInvadersLevel - PREPARE +2022-05-11 22:24:41,255 INFO playground.Animation - img added .\video/sweetAlien0.png +2022-05-11 22:24:41,263 INFO playground.Animation - img added .\video/sweetAlien1.png +2022-05-11 22:24:41,266 INFO playground.Animation - img added .\video/sweetAlien2.png +2022-05-11 22:24:41,270 INFO playground.Animation - img added .\video/sweetAlien3.png +2022-05-11 22:24:41,274 INFO playground.Animation - img added .\video/sweetAlien4.png +2022-05-11 22:24:41,278 INFO playground.Animation - img added .\video/sweetAlien5.png +2022-05-11 22:24:41,281 INFO playground.Animation - img added .\video/sweetAlien6.png +2022-05-11 22:24:41,283 INFO playground.Animation - img added .\video/sweetAlien7.png +2022-05-11 22:24:41,291 INFO playground.Animation - img added .\video/heart0.png +2022-05-11 22:24:41,293 INFO playground.Animation - img added .\video/heart1.png +2022-05-11 22:24:41,298 INFO playground.SpaceInvadersLevel - HIGHSCORE17200 +2022-05-11 22:24:46,500 INFO playground.SpaceInvadersLevel - no enemies left, level done. +2022-05-11 22:24:46,500 INFO playground.SpaceInvadersLevel - PREPARE +2022-05-11 22:24:46,506 INFO playground.Animation - img added .\video/sweetAlien0.png +2022-05-11 22:24:46,509 INFO playground.Animation - img added .\video/sweetAlien1.png +2022-05-11 22:24:46,511 INFO playground.Animation - img added .\video/sweetAlien2.png +2022-05-11 22:24:46,513 INFO playground.Animation - img added .\video/sweetAlien3.png +2022-05-11 22:24:46,515 INFO playground.Animation - img added .\video/sweetAlien4.png +2022-05-11 22:24:46,517 INFO playground.Animation - img added .\video/sweetAlien5.png +2022-05-11 22:24:46,519 INFO playground.Animation - img added .\video/sweetAlien6.png +2022-05-11 22:24:46,521 INFO playground.Animation - img added .\video/sweetAlien7.png +2022-05-11 22:24:46,526 INFO playground.Animation - img added .\video/heart0.png +2022-05-11 22:24:46,528 INFO playground.Animation - img added .\video/heart1.png +2022-05-11 22:24:46,530 INFO playground.SpaceInvadersLevel - HIGHSCORE17200 diff --git a/spaceinvaders/GameProject/src/playground/Level5.java b/spaceinvaders/GameProject/src/playground/Level5.java index befa201..423850e 100644 --- a/spaceinvaders/GameProject/src/playground/Level5.java +++ b/spaceinvaders/GameProject/src/playground/Level5.java @@ -24,18 +24,13 @@ import gameobjects.TextObject; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; -public class Level5 extends SpaceInvadersLevel { +public class Level5 extends SpaceInvadersLevelAua { protected static final double ENEMYSPEEDX = 160; protected static final double ENEMYSPEEDY = 80; protected static final int NR_ENEMIES = 5; - @Override - void actionIfEnemyIsHit(GameObject e, GameObject shot) { - super.actionIfEnemyIsHit(e, shot); - System.out.println("AUA!"); - } @Override protected String getStartupMessage() { diff --git a/spaceinvaders/GameProject/src/playground/Level6.java b/spaceinvaders/GameProject/src/playground/Level6.java index 08f93bc..2be8257 100644 --- a/spaceinvaders/GameProject/src/playground/Level6.java +++ b/spaceinvaders/GameProject/src/playground/Level6.java @@ -24,17 +24,12 @@ import gameobjects.TextObject; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; -public class Level6 extends SpaceInvadersLevel { +public class Level6 extends SpaceInvadersLevelAua { protected static final double ENEMYSPEEDX = 480; protected static final double ENEMYSPEEDY = 80; protected static final int NR_ENEMIES = 12; - @Override - void actionIfEnemyIsHit(GameObject e, GameObject shot) { - super.actionIfEnemyIsHit(e, shot); - System.out.println("AUA!"); - } @Override protected String getStartupMessage() { diff --git a/spaceinvaders/GameProject/src/playground/Level7.java b/spaceinvaders/GameProject/src/playground/Level7.java index b77dfcc..694563b 100644 --- a/spaceinvaders/GameProject/src/playground/Level7.java +++ b/spaceinvaders/GameProject/src/playground/Level7.java @@ -24,16 +24,11 @@ import gameobjects.TextObject; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; -public class Level7 extends SpaceInvadersLevel { +public class Level7 extends SpaceInvadersLevelAua { protected static final double ENEMYSPEEDX = 800; protected static final double ENEMYSPEEDY = 140; protected static final int NR_ENEMIES = 21; - @Override - void actionIfEnemyIsHit(GameObject e, GameObject shot) { - super.actionIfEnemyIsHit(e, shot); - System.out.println("AUA!"); - } @Override protected String getStartupMessage() { diff --git a/spaceinvaders/GameProject/src/playground/SpaceInvadersLevelAua.java b/spaceinvaders/GameProject/src/playground/SpaceInvadersLevelAua.java new file mode 100644 index 0000000..f5e5d34 --- /dev/null +++ b/spaceinvaders/GameProject/src/playground/SpaceInvadersLevelAua.java @@ -0,0 +1,33 @@ +package playground; + +import java.awt.Color; +import java.awt.Font; +import java.awt.Graphics2D; +import java.awt.Polygon; +import java.awt.RenderingHints; +import java.awt.font.TextAttribute; +import java.awt.image.BufferedImage; +import java.io.*; +import java.text.AttributedString; +import java.util.LinkedList; +import controller.EnemyController; +import controller.FallingStarController; +import controller.LimitedTimeController; +import controller.ObjectController; +import controller.EgoController; +import controller.CollisionAwareEgoController; +import gameobjects.AnimatedGameobject; +import gameobjects.FallingStar; +import gameobjects.GameObject; +import gameobjects.EgoObject; +import gameobjects.TextObject; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; + +public class SpaceInvadersLevelAua extends SpaceInvadersLevel { + @Override + void actionIfEnemyIsHit(GameObject e, GameObject shot) { + super.actionIfEnemyIsHit(e, shot); + System.out.println("AUA! 2.0"); + } +}