From c6e18fe90279daed01492eadd9f06596d6821cee Mon Sep 17 00:00:00 2001
From: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com>
Date: Wed, 8 Jan 2020 01:09:35 +0200
Subject: [PATCH] Made "comments" be on top of "colors" in the JSON palette
 files

---
 Palettes/Complementary.json |  2 +-
 Palettes/Default.json       |  2 +-
 Palettes/Monochromatic.json |  2 +-
 Palettes/Shades.json        |  2 +-
 Palettes/Triad.json         |  2 +-
 Palettes/bubblegum16.json   | 89 ++++++++++++++++++++++++++++---------
 Scripts/Palette/Palette.gd  |  2 +-
 7 files changed, 75 insertions(+), 26 deletions(-)

diff --git a/Palettes/Complementary.json b/Palettes/Complementary.json
index e578d74..c94e429 100644
--- a/Palettes/Complementary.json
+++ b/Palettes/Complementary.json
@@ -1,5 +1,6 @@
 {
  "name": "Complementary",
+ "comments": "By Erevos",
  "colors": [
   {
    "data": "ffb35102",
@@ -102,6 +103,5 @@
    "name": "no name"
   }
  ],
- "comments": "By Erevos",
  "editable": true
 }
\ No newline at end of file
diff --git a/Palettes/Default.json b/Palettes/Default.json
index 2698252..a527cf4 100644
--- a/Palettes/Default.json
+++ b/Palettes/Default.json
@@ -1,5 +1,6 @@
 {
  "name": "Default",
+ "comments": "",
  "colors": [
   {
    "data": "ff000000",
@@ -130,6 +131,5 @@
    "name": "no name"
   }
  ],
- "comments": "",
  "editable": true
 }
\ No newline at end of file
diff --git a/Palettes/Monochromatic.json b/Palettes/Monochromatic.json
index c22e4f2..fe0f6a2 100644
--- a/Palettes/Monochromatic.json
+++ b/Palettes/Monochromatic.json
@@ -1,5 +1,6 @@
 {
  "name": "Monochromatic",
+ "comments": "By Erevos",
  "colors": [
   {
    "data": "ff323880",
@@ -162,6 +163,5 @@
    "name": "no name"
   }
  ],
- "comments": "By Erevos",
  "editable": true
 }
\ No newline at end of file
diff --git a/Palettes/Shades.json b/Palettes/Shades.json
index 8ec45f6..25f5312 100644
--- a/Palettes/Shades.json
+++ b/Palettes/Shades.json
@@ -1,5 +1,6 @@
 {
  "name": "Shades",
+ "comments": "By Erevos",
  "colors": [
   {
    "data": "ffc25400",
@@ -142,6 +143,5 @@
    "name": "no name"
   }
  ],
- "comments": "By Erevos",
  "editable": true
 }
\ No newline at end of file
diff --git a/Palettes/Triad.json b/Palettes/Triad.json
index ca7572d..d3761dc 100644
--- a/Palettes/Triad.json
+++ b/Palettes/Triad.json
@@ -1,5 +1,6 @@
 {
  "name": "Triad",
+ "comments": "By Erevos",
  "colors": [
   {
    "data": "ff852c32",
@@ -102,6 +103,5 @@
    "name": "no name"
   }
  ],
- "comments": "By Erevos",
  "editable": true
 }
\ No newline at end of file
diff --git a/Palettes/bubblegum16.json b/Palettes/bubblegum16.json
index 1239d8a..817dfec 100644
--- a/Palettes/bubblegum16.json
+++ b/Palettes/bubblegum16.json
@@ -1,22 +1,71 @@
 {
-  "name": "BubbleGum16",
-  "colors" : [
-    { "data" : "#FF000000", "name" : "no name" },
-    { "data" : "#FF7f0622", "name" : "no name" },
-    { "data" : "#FFd62411", "name" : "no name" },
-    { "data" : "#FFff8426", "name" : "no name" },
-    { "data" : "#FFffd100", "name" : "no name" },
-    { "data" : "#FFfafdff", "name" : "no name" },
-    { "data" : "#FFff80a4", "name" : "no name" },
-    { "data" : "#FFff2674", "name" : "no name" },
-    { "data" : "#FF94216a", "name" : "no name" },
-    { "data" : "#FF430067", "name" : "no name" },
-    { "data" : "#FF234975", "name" : "no name" },
-    { "data" : "#FF68aed4", "name" : "no name" },
-    { "data" : "#FFbfff3c", "name" : "no name" },
-    { "data" : "#FF10d275", "name" : "no name" },
-    { "data" : "#FF007899", "name" : "no name" },
-    { "data" : "#FF002859", "name" : "no name" },
-    ],
-    "comments": "by PineTreePizza - https://twitter.com/PineTreePizza"
+ "name": "BubbleGum16",
+ "comments": "by PineTreePizza - https://twitter.com/PineTreePizza",
+ "colors": [
+  {
+   "data": "ff000000",
+   "name": "no name"
+  },
+  {
+   "data": "ff7f0622",
+   "name": "no name"
+  },
+  {
+   "data": "ffd62411",
+   "name": "no name"
+  },
+  {
+   "data": "ffff8426",
+   "name": "no name"
+  },
+  {
+   "data": "ffffd100",
+   "name": "no name"
+  },
+  {
+   "data": "fffafdff",
+   "name": "no name"
+  },
+  {
+   "data": "ffff80a4",
+   "name": "no name"
+  },
+  {
+   "data": "ffff2674",
+   "name": "no name"
+  },
+  {
+   "data": "ff94216a",
+   "name": "no name"
+  },
+  {
+   "data": "ff430067",
+   "name": "no name"
+  },
+  {
+   "data": "ff234975",
+   "name": "no name"
+  },
+  {
+   "data": "ff68aed4",
+   "name": "no name"
+  },
+  {
+   "data": "ffbfff3c",
+   "name": "no name"
+  },
+  {
+   "data": "ff10d275",
+   "name": "no name"
+  },
+  {
+   "data": "ff007899",
+   "name": "no name"
+  },
+  {
+   "data": "ff002859",
+   "name": "no name"
+  }
+ ],
+ "editable": true
 }
\ No newline at end of file
diff --git a/Scripts/Palette/Palette.gd b/Scripts/Palette/Palette.gd
index c6f11bc..859463c 100644
--- a/Scripts/Palette/Palette.gd
+++ b/Scripts/Palette/Palette.gd
@@ -85,8 +85,8 @@ func _serialize() -> String:
 	var result = ""
 	var serialize_data : Dictionary = {
 		"name" : name,
-		"colors" : [],
 		"comments" : comments,
+		"colors" : [],
 		"editable" : editable
 	}
 	for color in colors: