Merge branch 'main' of https://gitlab.sowgro.net/guitarheros/guitarhero

6 files changed, 52 insertions, 45 deletions

diff --git a/src/assets/BookBetrayal.wav b/src/assets/BookBetrayal.wav
new file mode 100644
index 0000000..0634a41
--- /dev/null
+++ b/src/assets/BookBetrayal.wav
diff --git a/src/assets/levels/test level/metadata.json b/src/assets/levels/test level/metadata.json
index e69de29..17f5611 100644
--- a/src/assets/levels/test level/metadata.json
+++ b/src/assets/levels/test level/metadata.json
@@ -0,0 +1,5 @@
+{
+    "diff1": "Easy",
+    "diff2": "Medium",
+    "diff3": "Hard"
+}
\ No newline at end of file
diff --git a/src/assets/settings.json b/src/assets/settings.json
index 37f05f1..56e4a52 100644
--- a/src/assets/settings.json
+++ b/src/assets/settings.json
@@ -1,5 +1,4 @@
 {

     "musicVol": 100,

     "effectsVol": 100,

-    "fullscreen": true

 }
\ No newline at end of file
diff --git a/src/main/LevelController.java b/src/main/LevelController.java
index b51da37..5d2654b 100644
--- a/src/main/LevelController.java
+++ b/src/main/LevelController.java
@@ -11,42 +11,51 @@ public class LevelController
 
     public LevelController()
     {
-        Difficulty d1 = new Difficulty();
-        d1.title = "Easy";
-        LeaderboardEntry lb = new LeaderboardEntry("t-bone", 1000, "DATE");
-        //lb.setName("t-bone");
-        //lb.setScore(1000);
-        d1.leaderboard.add(lb);
-
-        Difficulty d2 = new Difficulty();
-        d2.title = "Medium";
-        Difficulty d3 = new Difficulty();
-        d3.title = "Hard";
-        Difficulty d4 = new Difficulty();
-        d4.title = "Expert";
-        Difficulty d5 = new Difficulty();
-        d5.title = "Impossible";
-
-        Level testLevel = new Level("test level class","testArtist");
-        //testLevel.setTitle("test level class");
-        testLevel.desc = "this level is being used to test the LevelController class";
-        //testLevel.setAritst("testArtist");
-        testLevel.setColors(Color.RED, Color.BLUE, Color.GREEN, Color.ORANGE, Color.PURPLE);
-        testLevel.diffList.add(d1);
-        testLevel.diffList.add(d2);
-        levelList.add(testLevel);
-
-        Level testLevel2 = new Level("another one", "testArtist2");
-        //testLevel2.setTitle("another one");
-        testLevel2.desc = "it can say something else too";
-        //testLevel2.setAritst("testArtist2");
-        testLevel2.setColors(Color.RED, Color.BLUE, Color.GREEN, Color.ORANGE, Color.PURPLE);
-        testLevel2.diffList.add(d2);
-        testLevel2.diffList.add(d3);
-        testLevel2.diffList.add(d4);
-        testLevel2.preview = new Image("assets/pico.png");
-        levelList.add(testLevel2);
+
+        // Difficulty d1 = new Difficulty();
+        // d1.title = "Easy";
+        // LeaderboardEntry lb = new LeaderboardEntry("t-bone", 1000, "DATE");
+        // //lb.setName("t-bone");
+        // //lb.setScore(1000);
+        // d1.leaderboard.add(lb);
+
+        // Difficulty d2 = new Difficulty();
+        // d2.title = "Medium";
+        // Difficulty d3 = new Difficulty();
+        // d3.title = "Hard";
+        // Difficulty d4 = new Difficulty();
+        // d4.title = "Expert";
+        // Difficulty d5 = new Difficulty();
+        // d5.title = "Impossible";
+
+        // Level testLevel = new Level("test level class","testArtist");
+        // //testLevel.setTitle("test level class");
+        // testLevel.desc = "this level is being used to test the LevelController class";
+        // //testLevel.setAritst("testArtist");
+        // testLevel.setColors(Color.RED, Color.BLUE, Color.GREEN, Color.ORANGE, Color.PURPLE);
+        // testLevel.diffList.add(d1);
+        // testLevel.diffList.add(d2);
+        // levelList.add(testLevel);
+
+        // Level testLevel2 = new Level("another one", "testArtist2");
+        // //testLevel2.setTitle("another one");
+        // testLevel2.desc = "it can say something else too";
+        // //testLevel2.setAritst("testArtist2");
+        // testLevel2.setColors(Color.RED, Color.BLUE, Color.GREEN, Color.ORANGE, Color.PURPLE);
+        // testLevel2.diffList.add(d2);
+        // testLevel2.diffList.add(d3);
+        // testLevel2.diffList.add(d4);
+        // testLevel2.preview = new Image("assets/pico.png");
+        // levelList.add(testLevel2);
+         
         
     }
 
+    public void readInLevels()
+    {
+        //oh boy time for a flowchart
+    } 
+
+
+
 }
\ No newline at end of file
diff --git a/src/main/SettingsController.java b/src/main/SettingsController.java
index 0dcf707..2fe0792 100644
--- a/src/main/SettingsController.java
+++ b/src/main/SettingsController.java
@@ -1,14 +1,11 @@
 package main;

 

-import java.util.Map;

-import java.util.HashMap;

 import java.io.FileWriter;

 import java.io.FileNotFoundException;

 import java.io.FileReader;

 import java.io.IOException;

 

 import org.json.simple.JSONObject;

-import org.json.simple.JSONArray;

 import org.json.simple.parser.JSONParser;

 import org.json.simple.parser.ParseException;

 

@@ -21,13 +18,11 @@ public class SettingsController
 	private boolean fullscreen;

 	private JSONObject settings;

 	

-	public void saveAndWrite(int newEffVol, int newMusVol, boolean isFull)

+	public void saveAndWrite(int newEffVol, int newMusVol)

 	{

 		

 		settings.put("musicVol", newMusVol);

 		settings.put("effectsVol", newEffVol);

-		settings.put("fullscreen", isFull);

-

 		try (FileWriter file = new FileWriter("settings.json")) 

 		{

             //write the settings JSONObject instance to the file

@@ -51,7 +46,6 @@ public class SettingsController
 			

 			effectsVol.set((int) settings.get("effectsVol"));

 			musicVol.set((int) settings.get("musicVol"));

-			fullscreen = (boolean) settings.get("fullscreen");

 		}

 		catch (FileNotFoundException e) 

 		{

diff --git a/src/sound/AudioFilePlayer.java b/src/sound/AudioFilePlayer.java
index 06f728b..44baa0e 100644
--- a/src/sound/AudioFilePlayer.java
+++ b/src/sound/AudioFilePlayer.java
@@ -51,7 +51,7 @@ public class AudioFilePlayer
     {
         try 
         {
-            filePath = "GH3Intro.wav";
+            filePath = "src/assets/BookBetrayal.wav3";
             AudioFilePlayer audioPlayer = new AudioFilePlayer();
               
             audioPlayer.play();
@@ -81,7 +81,7 @@ public class AudioFilePlayer
     }
       
     // Work as the user enters his choice
-      
+
     private void gotoChoice(int c)throws IOException, LineUnavailableException, UnsupportedAudioFileException 
     {
         //reads the users input and chooses what to do based on said input