From bc5b5a2f6ba77b17617b0b11ab85518669467dd5 Mon Sep 17 00:00:00 2001
From: fredhicks <evilhat@gmail.com>
Date: Mon, 6 Jul 2020 13:19:50 -0400
Subject: [PATCH] Game settings tweak

Unchecked boxes in game settings allow defaulting to the wrong value on individual sheets.
---
 Fate/sheet.json       | 202 +++++++++++++++++++++++-------------------
 Fate/translation.json |   2 +
 2 files changed, 114 insertions(+), 90 deletions(-)

diff --git a/Fate/sheet.json b/Fate/sheet.json
index fde2a2df5f..098c9ed6e4 100644
--- a/Fate/sheet.json
+++ b/Fate/sheet.json
@@ -50,126 +50,148 @@
 			"descriptiontranslationkey": "theme-desc"
 		},
 		{
-			"attribute": "Show-Aspects",
-			"displayname": "Show Aspects",
-			"displaytranslationkey": "show-aspects",
-			"type": "checkbox",
-			"value": "1",
-			"checked": "checked"
+			"attribute": "Aspects",
+			"displayname": "Aspects",
+			"displaytranslationkey": "aspects",
+			"type": "select",
+			"options": [ "Show|1", "Hide|0" ],
+			"optiontranslationkeys": [ "show", "hide" ],
+			"default": "1"
 		},
 		{
-			"attribute": "Show-Conditions",
-			"displayname": "Show Conditions",
-			"displaytranslationkey": "show-conditions",
-			"type": "checkbox",
-			"value": "1",
-			"checked": "checked"
+			"attribute": "Conditions",
+			"displayname": "Conditions",
+			"displaytranslationkey": "conditions",
+			"type": "select",
+			"options": [ "Show|1", "Hide|0" ],
+			"optiontranslationkeys": [ "show", "hide" ],
+			"default": "1"
 		},
 		{
-			"attribute": "Show-Consequences",
-			"displayname": "Show Consequences",
-			"displaytranslationkey": "show-consequences",
-			"type": "checkbox",
-			"value": "1",
-			"checked": "checked"
+			"attribute": "Consequences",
+			"displayname": "Consequences",
+			"displaytranslationkey": "consequences",
+			"type": "select",
+			"options": [ "Show|1", "Hide|0" ],
+			"optiontranslationkeys": [ "show", "hide" ],
+			"default": "1"
 		},
 		{
-			"attribute": "Show-Corruption",
-			"displayname": "Show Corruption",
-			"displaytranslationkey": "show-corruption",
-			"type": "checkbox",
-			"value": "1"
+			"attribute": "Corruption",
+			"displayname": "Corruption",
+			"displaytranslationkey": "corruption",
+			"type": "select",
+			"options": [ "Show|1", "Hide|0" ],
+			"optiontranslationkeys": [ "show", "hide" ],
+			"default": "0"
 		},
 		{
-			"attribute": "Show-Extras",
-			"displayname": "Show Extras",
-			"displaytranslationkey": "show-extras",
-			"type": "checkbox",
-			"value": "1"
+			"attribute": "Extras",
+			"displayname": "Extras",
+			"displaytranslationkey": "extras",
+			"type": "select",
+			"options": [ "Show|1", "Hide|0" ],
+			"optiontranslationkeys": [ "show", "hide" ],
+			"default": "0"
 		},
 		{
-			"attribute": "Show-FP",
-			"displayname": "Show Fate Points",
-			"displaytranslationkey": "show-fp",
-			"type": "checkbox",
-			"value": "1",
-			"checked": "checked"
+			"attribute": "FP",
+			"displayname": "Fate Points",
+			"displaytranslationkey": "fp",
+			"type": "select",
+			"options": [ "Show|1", "Hide|0" ],
+			"optiontranslationkeys": [ "show", "hide" ],
+			"default": "1"
 		},
 		{
-			"attribute": "Show-Modes",
-			"displayname": "Show Modes",
-			"displaytranslationkey": "show-modes",
-			"type": "checkbox",
-			"value": "1"
+			"attribute": "Modes",
+			"displayname": "Modes",
+			"displaytranslationkey": "modes",
+			"type": "select",
+			"options": [ "Show|1", "Hide|0" ],
+			"optiontranslationkeys": [ "show", "hide" ],
+			"default": "0"
 		},
 		{
-			"attribute": "Show-Notes",
-			"displayname": "Show Notes",
-			"displaytranslationkey": "show-notes",
-			"type": "checkbox",
-			"value": "1",
-			"checked": "checked"
+			"attribute": "Notes",
+			"displayname": "Notes",
+			"displaytranslationkey": "notes",
+			"type": "select",
+			"options": [ "Show|1", "Hide|0" ],
+			"optiontranslationkeys": [ "show", "hide" ],
+			"default": "1"
 		},
 		{
-			"attribute": "Show-Powers",
-			"displayname": "Show Powers",
-			"displaytranslationkey": "show-powers",
-			"type": "checkbox",
-			"value": "1"
+			"attribute": "Powers",
+			"displayname": "Powers",
+			"displaytranslationkey": "powers",
+			"type": "select",
+			"options": [ "Show|1", "Hide|0" ],
+			"optiontranslationkeys": [ "show", "hide" ],
+			"default": "0"
 		},
 		{
-			"attribute": "Show-Refresh",
-			"displayname": "Show Refresh",
-			"displaytranslationkey": "show-refresh",
-			"type": "checkbox",
-			"value": "1",
-			"checked": "checked"
+			"attribute": "Refresh",
+			"displayname": "Refresh",
+			"displaytranslationkey": "refresh",
+			"type": "select",
+			"options": [ "Show|1", "Hide|0" ],
+			"optiontranslationkeys": [ "show", "hide" ],
+			"default": "1"
 		},
 		{
-			"attribute": "Show-Roles",
-			"displayname": "Show Roles",
-			"displaytranslationkey": "show-roles",
-			"type": "checkbox",
-			"value": "1"
+			"attribute": "Roles",
+			"displayname": "Roles",
+			"displaytranslationkey": "roles",
+			"type": "select",
+			"options": [ "Show|1", "Hide|0" ],
+			"optiontranslationkeys": [ "show", "hide" ],
+			"default": "0"
 		},
 		{
-			"attribute": "Show-RollableAspects",
-			"displayname": "Show Rollable Aspects",
-			"displaytranslationkey": "show-rollable-aspects",
-			"type": "checkbox",
-			"value": "1"
+			"attribute": "RollableAspects",
+			"displayname": "Rollable Aspects",
+			"displaytranslationkey": "rollable-aspects",
+			"type": "select",
+			"options": [ "Show|1", "Hide|0" ],
+			"optiontranslationkeys": [ "show", "hide" ],
+			"default": "0"
 		},
 		{
-			"attribute": "Show-Skills",
-			"displayname": "Show Skills",
-			"displaytranslationkey": "show-skills",
-			"type": "checkbox",
-			"value": "1",
-			"checked": "checked"
+			"attribute": "Skills",
+			"displayname": "Skills",
+			"displaytranslationkey": "skills",
+			"type": "select",
+			"options": [ "Show|1", "Hide|0" ],
+			"optiontranslationkeys": [ "show", "hide" ],
+			"default": "1"
 		},
 		{
-			"attribute": "Show-Stress",
-			"displayname": "Show Stress",
-			"displaytranslationkey": "show-stress",
-			"type": "checkbox",
-			"value": "1",
-			"checked": "checked"
+			"attribute": "Stress",
+			"displayname": "Stress",
+			"displaytranslationkey": "stress",
+			"type": "select",
+			"options": [ "Show|1", "Hide|0" ],
+			"optiontranslationkeys": [ "show", "hide" ],
+			"default": "1"
 		},
 		{
-			"attribute": "Show-Stunts",
-			"displayname": "Show Stunts",
-			"displaytranslationkey": "show-stunts",
-			"type": "checkbox",
-			"value": "1",
-			"checked": "checked"
+			"attribute": "Stunts",
+			"displayname": "Stunts",
+			"displaytranslationkey": "stunts",
+			"type": "select",
+			"options": [ "Show|1", "Hide|0" ],
+			"optiontranslationkeys": [ "show", "hide" ],
+			"default": "1"
 		},
 		{
-			"attribute": "Show-TempAspects",
-			"displayname": "Show Situation Aspects",
-			"displaytranslationkey": "show-situation-aspects",
-			"type": "checkbox",
-			"value": "1",
-			"checked": "checked"
+			"attribute": "TempAspects",
+			"displayname": "Situation Aspects",
+			"displaytranslationkey": "situation-aspects",
+			"type": "select",
+			"options": [ "Show|1", "Hide|0" ],
+			"optiontranslationkeys": [ "show", "hide" ],
+			"default": "1"
 		},
 		{
 			"attribute": "custom-aspects",
diff --git a/Fate/translation.json b/Fate/translation.json
index c8285120ab..a9f8fe8ac6 100644
--- a/Fate/translation.json
+++ b/Fate/translation.json
@@ -289,5 +289,7 @@
 	"rollmod-prompt": "Roll Modifier Prompt",
 	"color-theme": "Color Theme",
 	"theme-desc": "Choose a color theme. Players can change it later own to suit their preferences. Some preloaded game settings will override this.",
+	"show": "Show",
+	"hide": "Hide",
 	"zzzz-end-of-json": "<!-- End of JSON File -->"
 }
\ No newline at end of file