From 9ebf6e0ee1a5264651b5e54e52ffa12e480978a4 Mon Sep 17 00:00:00 2001 From: sowgro Date: Wed, 24 May 2023 09:26:38 -0400 Subject: small changes to the metadata and BookBetrayal --- src/assets/BookBetrayal.wav | Bin 0 -> 41328718 bytes src/assets/levels/test level/metadata.json | 5 +++++ src/main/SettingsController.java | 8 +------- 3 files changed, 6 insertions(+), 7 deletions(-) create mode 100644 src/assets/BookBetrayal.wav diff --git a/src/assets/BookBetrayal.wav b/src/assets/BookBetrayal.wav new file mode 100644 index 0000000..0634a41 Binary files /dev/null and b/src/assets/BookBetrayal.wav differ 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) { -- cgit v1.2.3