diff options
| -rw-r--r-- | src/assets/BookBetrayal.wav | bin | 0 -> 41328718 bytes | |||
| -rw-r--r-- | src/assets/levels/test level/metadata.json | 5 | ||||
| -rw-r--r-- | src/main/SettingsController.java | 8 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/assets/BookBetrayal.wav b/src/assets/BookBetrayal.wav Binary files differnew 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/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)
{
|