diff options
author | sowgro <tpoke.ferrari@gmail.com> | 2023-05-30 08:39:09 -0400 |
---|---|---|
committer | sowgro <tpoke.ferrari@gmail.com> | 2023-05-30 08:39:09 -0400 |
commit | 2ce13a58f9bf1cac1b7c8644ba38f5ad7e7bee44 (patch) | |
tree | 4901e38b24927aacf97c059f08b9bcc7fd9a758d /src/main | |
parent | 0795c44d8e523bfd96671576f70d67d6184a1ede (diff) | |
parent | c502ba54d61edf9118f9667c37329a15a9359a3f (diff) | |
download | NPEhero-2ce13a58f9bf1cac1b7c8644ba38f5ad7e7bee44.tar.gz NPEhero-2ce13a58f9bf1cac1b7c8644ba38f5ad7e7bee44.tar.bz2 NPEhero-2ce13a58f9bf1cac1b7c8644ba38f5ad7e7bee44.zip |
Merge branch 'main' of https://gitlab.sowgro.net/guitarheros/guitarhero
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/Level.java | 27 |
1 files changed, 24 insertions, 3 deletions
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) |