Add assets

tyrann · Mar 1, 2016 · 7f307bc · 7f307bc
1 parent 22cd3ac
commit 7f307bc
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,10 +8,9 @@
 # Specific Files #
 *.txt
 *.wav
-sound_effects
 bin
 .settings
 .classpath
 .project
-
+/lib
 
diff --git a/assets/music/gone.ogg b/assets/music/gone.ogg
diff --git a/assets/sound_effects/coin_sound.ogg b/assets/sound_effects/coin_sound.ogg
diff --git a/assets/sound_effects/coin_sound2.ogg b/assets/sound_effects/coin_sound2.ogg
diff --git a/assets/sound_effects/death.ogg b/assets/sound_effects/death.ogg
diff --git a/assets/sound_effects/lost_life.ogg b/assets/sound_effects/lost_life.ogg
diff --git a/assets/sound_effects/size_increased.ogg b/assets/sound_effects/size_increased.ogg
diff --git a/src/game_screen/GamePanel.java b/src/game_screen/GamePanel.java
@@ -47,14 +47,14 @@ public class GamePanel extends JPanel implements MouseListener,
 	public static int sphere_cons = 10;
 	private int insideSphere = 0;
 	private int lifes;
-	private CoinSound coins = new CoinSound("sound_effects/coin_sound.wav");
-	private LifeLost lifeLost = new LifeLost("sound_effects/lost_life.wav");
-	private CoinSound2 coins2 = new CoinSound2("sound_effects/coin_sound2.wav");
+	private CoinSound coins = new CoinSound("assets/sound_effects/coin_sound.ogg");
+	private LifeLost lifeLost = new LifeLost("assets/sound_effects/lost_life.ogg");
+	private CoinSound2 coins2 = new CoinSound2("assets/sound_effects/coin_sound2.ogg");
 	// private LifeGained lifeGained=new
 	// LifeGained("sound_effects/life_gained.wav");
 	private SizeIncreased size = new SizeIncreased(
-			"sound_effects/size_increased.wav");
-	private DeathSound death = new DeathSound("sound_effects/death.wav");
+			"assets/sound_effects/size_increased.ogg");
+	private DeathSound death = new DeathSound("assets/sound_effects/death.ogg");
 	private boolean soundEffects;
 	private BlocksGame main;
 	private Cursor blankCursor;

diff --git a/src/game_screen/SoundEffects.java b/src/game_screen/SoundEffects.java
@@ -11,6 +11,7 @@
 import javax.sound.sampled.LineUnavailableException;
 import javax.sound.sampled.UnsupportedAudioFileException;
 
+
 public abstract class SoundEffects {
 	private File file;
 	protected Clip clip;

diff --git a/src/menu_screen/BlocksGame.java b/src/menu_screen/BlocksGame.java
@@ -31,7 +31,7 @@ public BlocksGame() {
 		add(menu);
 		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 		addKeyListener(this);
-		music = new MusicThread("Fake_Moon_Flight_(Original_Mix).wav");
+		music = new MusicThread("assets/music/gone.ogg");
 		setResizable(false);
 		pack();
 		setVisible(true);