From d4e6eb64f5af693abffbce0870325ed5631b7c1e Mon Sep 17 00:00:00 2001 From: b3nj4m1n Date: Wed, 8 Jul 2020 00:30:28 +0200 Subject: [PATCH] Add makefile; Apply color to zero on simplified; Use arguments in py script; --- Makefile | 7 +++++++ fire_extended.json | 6 +++--- fire_simplified.json | 4 ++-- frozen_extended.json | 6 +++--- frozen_simplified.json | 4 ++-- lime_extended.json | 6 +++--- lime_simplified.json | 4 ++-- magenta_extended.json | 6 +++--- magenta_simplified.json | 4 ++-- parser.py | 3 ++- pinky_extended.json | 6 +++--- pinky_simplified.json | 4 ++-- template_simplified.json | 4 ++-- 13 files changed, 36 insertions(+), 28 deletions(-) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..442c130 --- /dev/null +++ b/Makefile @@ -0,0 +1,7 @@ + +all: + python parser.py "fire" + python parser.py "lime" + python parser.py "frozen" + python parser.py "magenta" + python parser.py "pinky" diff --git a/fire_extended.json b/fire_extended.json index f956b0d..d57ff20 100644 --- a/fire_extended.json +++ b/fire_extended.json @@ -3,7 +3,7 @@ "cap value": null, "color empty": "#D00D21", "color empty descendant": "#E31A1C", - "color zero": false, + "color zero": true, "columns": [ { "absolute": true, @@ -388,12 +388,12 @@ "subdeck": true } ], - "default column color": "red", + "default column color": "#D00D21", "do color empty": true, "do color marked": true, "dot in numbers": true, "end symbol": ";", - "ended marked background color": "red", + "ended marked background color": "#D00D21", "given up symbol": "/", "hide values of parent decks when subdecks are shown": false, "marked background color": "null", diff --git a/fire_simplified.json b/fire_simplified.json index ba64759..b1dd118 100644 --- a/fire_simplified.json +++ b/fire_simplified.json @@ -388,12 +388,12 @@ "subdeck": true } ], - "default column color": "red", + "default column color": "#D00D21", "do color empty": true, "do color marked": true, "dot in numbers": true, "end symbol": ";", - "ended marked background color": "red", + "ended marked background color": "#D00D21", "given up symbol": "/", "hide values of parent decks when subdecks are shown": false, "marked background color": "null", diff --git a/frozen_extended.json b/frozen_extended.json index 2c96fc5..d78647e 100644 --- a/frozen_extended.json +++ b/frozen_extended.json @@ -3,7 +3,7 @@ "cap value": null, "color empty": "#0063DE", "color empty descendant": "#257CE3", - "color zero": false, + "color zero": true, "columns": [ { "absolute": true, @@ -388,12 +388,12 @@ "subdeck": true } ], - "default column color": "red", + "default column color": "#0063DE", "do color empty": true, "do color marked": true, "dot in numbers": true, "end symbol": ";", - "ended marked background color": "red", + "ended marked background color": "#0063DE", "given up symbol": "/", "hide values of parent decks when subdecks are shown": false, "marked background color": "null", diff --git a/frozen_simplified.json b/frozen_simplified.json index 1c939ea..3cc8e97 100644 --- a/frozen_simplified.json +++ b/frozen_simplified.json @@ -388,12 +388,12 @@ "subdeck": true } ], - "default column color": "red", + "default column color": "#0063DE", "do color empty": true, "do color marked": true, "dot in numbers": true, "end symbol": ";", - "ended marked background color": "red", + "ended marked background color": "#0063DE", "given up symbol": "/", "hide values of parent decks when subdecks are shown": false, "marked background color": "null", diff --git a/lime_extended.json b/lime_extended.json index 671d71d..5b98e1d 100644 --- a/lime_extended.json +++ b/lime_extended.json @@ -3,7 +3,7 @@ "cap value": null, "color empty": "#1E6823", "color empty descendant": "#378F36", - "color zero": false, + "color zero": true, "columns": [ { "absolute": true, @@ -388,12 +388,12 @@ "subdeck": true } ], - "default column color": "red", + "default column color": "#1E6823", "do color empty": true, "do color marked": true, "dot in numbers": true, "end symbol": ";", - "ended marked background color": "red", + "ended marked background color": "#1E6823", "given up symbol": "/", "hide values of parent decks when subdecks are shown": false, "marked background color": "null", diff --git a/lime_simplified.json b/lime_simplified.json index 5fa4c23..ccac574 100644 --- a/lime_simplified.json +++ b/lime_simplified.json @@ -388,12 +388,12 @@ "subdeck": true } ], - "default column color": "red", + "default column color": "#1E6823", "do color empty": true, "do color marked": true, "dot in numbers": true, "end symbol": ";", - "ended marked background color": "red", + "ended marked background color": "#1E6823", "given up symbol": "/", "hide values of parent decks when subdecks are shown": false, "marked background color": "null", diff --git a/magenta_extended.json b/magenta_extended.json index 709cf21..314f5a1 100644 --- a/magenta_extended.json +++ b/magenta_extended.json @@ -3,7 +3,7 @@ "cap value": null, "color empty": "#7A0177", "color empty descendant": "#AE017E", - "color zero": false, + "color zero": true, "columns": [ { "absolute": true, @@ -388,12 +388,12 @@ "subdeck": true } ], - "default column color": "red", + "default column color": "#7A0177", "do color empty": true, "do color marked": true, "dot in numbers": true, "end symbol": ";", - "ended marked background color": "red", + "ended marked background color": "#7A0177", "given up symbol": "/", "hide values of parent decks when subdecks are shown": false, "marked background color": "null", diff --git a/magenta_simplified.json b/magenta_simplified.json index 24c12f1..0834445 100644 --- a/magenta_simplified.json +++ b/magenta_simplified.json @@ -388,12 +388,12 @@ "subdeck": true } ], - "default column color": "red", + "default column color": "#7A0177", "do color empty": true, "do color marked": true, "dot in numbers": true, "end symbol": ";", - "ended marked background color": "red", + "ended marked background color": "#7A0177", "given up symbol": "/", "hide values of parent decks when subdecks are shown": false, "marked background color": "null", diff --git a/parser.py b/parser.py index 7576a91..e1b6d1f 100644 --- a/parser.py +++ b/parser.py @@ -1,6 +1,7 @@ import json +import sys -scheme = "magenta" +scheme = sys.argv[1] schemes = "" with open("colorschemes.json", "r", encoding="utf-8") as file: schemes = json.loads(file.read()) diff --git a/pinky_extended.json b/pinky_extended.json index 1d19a0f..bd09165 100644 --- a/pinky_extended.json +++ b/pinky_extended.json @@ -3,7 +3,7 @@ "cap value": null, "color empty": "#9d003f", "color empty descendant": "#d80056", - "color zero": false, + "color zero": true, "columns": [ { "absolute": true, @@ -388,12 +388,12 @@ "subdeck": true } ], - "default column color": "red", + "default column color": "#9d003f", "do color empty": true, "do color marked": true, "dot in numbers": true, "end symbol": ";", - "ended marked background color": "red", + "ended marked background color": "#9d003f", "given up symbol": "/", "hide values of parent decks when subdecks are shown": false, "marked background color": "null", diff --git a/pinky_simplified.json b/pinky_simplified.json index ce1b943..a139e4c 100644 --- a/pinky_simplified.json +++ b/pinky_simplified.json @@ -388,12 +388,12 @@ "subdeck": true } ], - "default column color": "red", + "default column color": "#9d003f", "do color empty": true, "do color marked": true, "dot in numbers": true, "end symbol": ";", - "ended marked background color": "red", + "ended marked background color": "#9d003f", "given up symbol": "/", "hide values of parent decks when subdecks are shown": false, "marked background color": "null", diff --git a/template_simplified.json b/template_simplified.json index 7ccfb7b..49c8a3e 100644 --- a/template_simplified.json +++ b/template_simplified.json @@ -388,12 +388,12 @@ "subdeck": true } ], - "default column color": "red", + "default column color": "color_6", "do color empty": true, "do color marked": true, "dot in numbers": true, "end symbol": ";", - "ended marked background color": "red", + "ended marked background color": "color_6", "given up symbol": "/", "hide values of parent decks when subdecks are shown": false, "marked background color": "null",