diff options
Diffstat (limited to '')
| -rw-r--r-- | levels/testLevel/metadata.json | 9 | ||||
| -rw-r--r-- | src/main/Level.java | 27 | 
2 files changed, 32 insertions, 4 deletions
diff --git a/levels/testLevel/metadata.json b/levels/testLevel/metadata.json index eff28b2..b055416 100644 --- a/levels/testLevel/metadata.json +++ b/levels/testLevel/metadata.json @@ -1,5 +1,12 @@  {      "title": "testSong",      "artist": "ed sheeran", -    "desc": "this is a test level. lalalala testing testing" +    "desc": "this is a test level. lalalala testing testing", +     +    "color1": "#ffae00", +    "color2": "#264630", +    "color3": "#3b77d6", +    "color4": "#f0bd07", +    "color5": "#c2e7ff" +      }
\ No newline at end of file diff --git a/src/main/Level.java b/src/main/Level.java index 2e97367..66fe243 100644 --- a/src/main/Level.java +++ b/src/main/Level.java @@ -21,7 +21,12 @@ public class Level      public ArrayList<Difficulty> diffList = new ArrayList<Difficulty>();      public Image background; //optional -    public Color[] colors = new Color[]{Color.RED,Color.BLUE,Color.GREEN,Color.PURPLE,Color.YELLOW};//optional, have default colors +    public Color[] colors;//optional, have default colors +    public Color c1; +    public Color c2; +    public Color c3; +    public Color c4; +    public Color c5;      private JSONObject levelStuff; @@ -54,9 +59,25 @@ public class Level              artist = (String)(levelStuff.get("artist"));              desc = (String)(levelStuff.get("desc")); -            if(( levelStuff).containsKey("color1")) +            if(( levelStuff).containsKey("color1")) //check for custom colors in a hexadecimal format              { -                 +                colors = new Color[5]; + +                c1 = Color.web((String)(levelStuff.get("color1"))); //read in all the custom colors +                c2 = Color.web((String)(levelStuff.get("color2"))); +                c3 = Color.web((String)(levelStuff.get("color3"))); +                c4 = Color.web((String)(levelStuff.get("color4"))); +                c5 = Color.web((String)(levelStuff.get("color5"))); + +                colors[0] = c1; +                colors[1] = c2; +                colors[2] = c3; +                colors[3] = c4; +                colors[4] = c5; +            } +            else +            { +                colors = new Color[]{Color.RED,Color.BLUE,Color.GREEN,Color.PURPLE,Color.YELLOW};              }  		}  		catch (FileNotFoundException e)   | 
