Code cleaned up, file handling, animations and tutorial implemented

qhyun2 · Apr 21, 2017 · 0ad65e1 · 0ad65e1
1 parent d0ab859
commit 0ad65e1
Show file tree

Hide file tree

Showing 82 changed files with 5 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
 .classpath
 .project
-bin
+src
 .settings
diff --git a/Graphics Backup/Backups/bin.rar b/Graphics Backup/Backups/bin.rar
diff --git a/Graphics Backup/Backups/options.pdn b/Graphics Backup/Backups/options.pdn
diff --git a/Graphics Backup/audio/ouch.wav b/Graphics Backup/audio/ouch.wav
diff --git a/Graphics Backup/images/ammo.png b/Graphics Backup/images/ammo.png
diff --git a/Graphics Backup/images/back_button.png b/Graphics Backup/images/back_button.png
diff --git a/Graphics Backup/images/background.png b/Graphics Backup/images/background.png
diff --git a/Graphics Backup/images/button.png b/Graphics Backup/images/button.png
diff --git a/Graphics Backup/images/down.png b/Graphics Backup/images/down.png
diff --git a/Graphics Backup/images/empty.png b/Graphics Backup/images/empty.png
diff --git a/Graphics Backup/images/enemy1.png b/Graphics Backup/images/enemy1.png
diff --git a/Graphics Backup/images/enemy2.png b/Graphics Backup/images/enemy2.png
diff --git a/Graphics Backup/images/enemy3.png b/Graphics Backup/images/enemy3.png
diff --git a/Graphics Backup/images/enemy4.png b/Graphics Backup/images/enemy4.png
diff --git a/Graphics Backup/images/explosion.png b/Graphics Backup/images/explosion.png
diff --git a/Graphics Backup/images/gameover.png b/Graphics Backup/images/gameover.png
diff --git a/Graphics Backup/images/gandhi.png b/Graphics Backup/images/gandhi.png
diff --git a/Graphics Backup/images/hole.png b/Graphics Backup/images/hole.png
diff --git a/Graphics Backup/images/icon.png b/Graphics Backup/images/icon.png
diff --git a/Graphics Backup/images/lead1.png b/Graphics Backup/images/lead1.png
diff --git a/Graphics Backup/images/lead2.png b/Graphics Backup/images/lead2.png
diff --git a/Graphics Backup/images/lead3.png b/Graphics Backup/images/lead3.png
diff --git a/Graphics Backup/images/lead4.png b/Graphics Backup/images/lead4.png
diff --git a/Graphics Backup/images/magazine.png b/Graphics Backup/images/magazine.png
diff --git a/Graphics Backup/images/menu.png b/Graphics Backup/images/menu.png
diff --git a/Graphics Backup/images/objective.png b/Graphics Backup/images/objective.png
diff --git a/Graphics Backup/images/options.png b/Graphics Backup/images/options.png
diff --git a/Graphics Backup/images/options_button.png b/Graphics Backup/images/options_button.png
diff --git a/Graphics Backup/images/play_button.png b/Graphics Backup/images/play_button.png
diff --git a/Graphics Backup/images/powerup.png b/Graphics Backup/images/powerup.png
diff --git a/Graphics Backup/images/quit_button.png b/Graphics Backup/images/quit_button.png
diff --git a/Graphics Backup/images/splash.png b/Graphics Backup/images/splash.png
diff --git a/Graphics Backup/images/tutorial.png b/Graphics Backup/images/tutorial.png
diff --git a/Graphics Backup/images/up.png b/Graphics Backup/images/up.png
diff --git a/Graphics Files/Player.class b/Graphics Files/Player.class
diff --git a/Graphics Backup/audio/ammo.ogg → Graphics Files/audio/ammo.ogg b/Graphics Backup/audio/ammo.ogg → Graphics Files/audio/ammo.ogg
diff --git a/Graphics Backup/audio/dead1.wav → Graphics Files/audio/dead1.wav b/Graphics Backup/audio/dead1.wav → Graphics Files/audio/dead1.wav
diff --git a/Graphics Backup/audio/dead2.wav → Graphics Files/audio/dead2.wav b/Graphics Backup/audio/dead2.wav → Graphics Files/audio/dead2.wav
diff --git a/Graphics Backup/audio/dead3.wav → Graphics Files/audio/dead3.wav b/Graphics Backup/audio/dead3.wav → Graphics Files/audio/dead3.wav
diff --git a/Graphics Backup/audio/dead4.wav → Graphics Files/audio/dead4.wav b/Graphics Backup/audio/dead4.wav → Graphics Files/audio/dead4.wav
diff --git a/Graphics Backup/audio/hit.ogg → Graphics Files/audio/hit.ogg b/Graphics Backup/audio/hit.ogg → Graphics Files/audio/hit.ogg
diff --git a/Graphics Backup/audio/hit.wav → Graphics Files/audio/hit.wav b/Graphics Backup/audio/hit.wav → Graphics Files/audio/hit.wav
diff --git a/Graphics Files/audio/ouch.ogg b/Graphics Files/audio/ouch.ogg
diff --git a/Graphics Backup/audio/powerup.ogg → Graphics Files/audio/powerup.ogg b/Graphics Backup/audio/powerup.ogg → Graphics Files/audio/powerup.ogg
diff --git a/Graphics Backup/audio/shoot.ogg → Graphics Files/audio/shoot.ogg b/Graphics Backup/audio/shoot.ogg → Graphics Files/audio/shoot.ogg
diff --git a/Graphics Backup/audio/song1.ogg → Graphics Files/audio/song1.ogg b/Graphics Backup/audio/song1.ogg → Graphics Files/audio/song1.ogg
diff --git a/Graphics Backup/audio/song2.ogg → Graphics Files/audio/song2.ogg b/Graphics Backup/audio/song2.ogg → Graphics Files/audio/song2.ogg
diff --git a/Graphics Backup/audio/song3.ogg → Graphics Files/audio/song3.ogg b/Graphics Backup/audio/song3.ogg → Graphics Files/audio/song3.ogg
diff --git a/Graphics Backup/audio/song4.ogg → Graphics Files/audio/song4.ogg b/Graphics Backup/audio/song4.ogg → Graphics Files/audio/song4.ogg
diff --git a/Graphics Backup/Backups/down.png → Graphics Files/down.png b/Graphics Backup/Backups/down.png → Graphics Files/down.png
diff --git a/Graphics Backup/explosion.png → Graphics Files/explosion.png b/Graphics Backup/explosion.png → Graphics Files/explosion.png
diff --git a/Graphics Backup/image006.png → Graphics Files/image006.png b/Graphics Backup/image006.png → Graphics Files/image006.png
diff --git a/Graphics Backup/options.pdn → Graphics Files/options.pdn b/Graphics Backup/options.pdn → Graphics Files/options.pdn
diff --git a/Graphics Backup/images/tutorial.psd → Graphics Files/tutorial.psd b/Graphics Backup/images/tutorial.psd → Graphics Files/tutorial.psd
diff --git a/Graphics Backup/Backups/up.png → Graphics Files/up.png b/Graphics Backup/Backups/up.png → Graphics Files/up.png
diff --git a/bin/core/FileManager.class b/bin/core/FileManager.class
diff --git a/bin/core/Game.class b/bin/core/Game.class
diff --git a/bin/core/SoundManager.class b/bin/core/SoundManager.class
diff --git a/bin/gui/Button.class b/bin/gui/Button.class
diff --git a/bin/gui/Interface.class b/bin/gui/Interface.class
diff --git a/bin/objects/Ammo.class b/bin/objects/Ammo.class
diff --git a/bin/objects/Bullet.class b/bin/objects/Bullet.class
diff --git a/bin/objects/Enemy.class b/bin/objects/Enemy.class
diff --git a/bin/objects/Explosion.class b/bin/objects/Explosion.class
diff --git a/bin/objects/Item.class b/bin/objects/Item.class
diff --git a/bin/objects/Objective.class b/bin/objects/Objective.class
diff --git a/bin/objects/Player.class b/bin/objects/Player.class
diff --git a/bin/objects/Vodka.class b/bin/objects/Vodka.class
diff --git a/bin/states/BlackScreen.class b/bin/states/BlackScreen.class
diff --git a/bin/states/Gameover.class b/bin/states/Gameover.class
diff --git a/bin/states/Menu.class b/bin/states/Menu.class
diff --git a/bin/states/Options.class b/bin/states/Options.class
diff --git a/bin/states/Play.class b/bin/states/Play.class
diff --git a/bin/states/Splash.class b/bin/states/Splash.class
diff --git a/bin/states/Tutorial.class b/bin/states/Tutorial.class
diff --git a/res/audio/ouch.ogg b/res/audio/ouch.ogg
diff --git a/res/audio/ouch.wav b/res/audio/ouch.wav
diff --git a/res/config.properties b/res/config.properties
@@ -1,4 +1,4 @@
-#Sat Apr 01 14:11:44 EDT 2017
-displaymode=1
-lastscore=24
-highscore=6969
+#Sat Apr 15 13:02:50 EDT 2017
+highscore=3154
+lastscore=0
+displaymode=100
diff --git a/res/default.properties b/res/default.properties
diff --git a/res/images/images - Shortcut.lnk b/res/images/images - Shortcut.lnk
diff --git a/res/images/tutorial.png b/res/images/tutorial.png
diff --git a/src b/src