From 6f6e0f03c79ee54bf2e67f67cb0f0f01dca3147b Mon Sep 17 00:00:00 2001
From: Brian Miyaji <brian@themeboy.com>
Date: Mon, 25 Aug 2014 00:12:51 +1000
Subject: [PATCH] Tweak presets

---
 presets/rugby.json        | 6 +++---
 presets/snooker.json      | 8 ++++----
 presets/squash.json       | 9 +++++----
 presets/table-tennis.json | 6 +++---
 presets/tennis.json       | 7 ++++---
 5 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/presets/rugby.json b/presets/rugby.json
index 5e2b9d4a..4b54862e 100644
--- a/presets/rugby.json
+++ b/presets/rugby.json
@@ -22,11 +22,11 @@
 						{ "name" : "W", "equation" : "$win", "description" : "Matches won" },
 						{ "name" : "L", "equation" : "$loss", "description" : "Matches lost" },
 						{ "name" : "D", "equation" : "$draw", "description" : "Matches drawn" },
-						{ "name" : "PF", "equation" : "$pointsfor", "description" : "Points for" },
+						{ "name" : "PF", "equation" : "$pointsfor", "description" : "Points for", "priority" : 3 },
 						{ "name" : "PA", "equation" : "$pointsagainst", "description" : "Points against" },
-						{ "name" : "PD", "equation" : "$pointsfor - $pointsagainst", "description" : "Points difference" },
+						{ "name" : "PD", "equation" : "$pointsfor - $pointsagainst", "description" : "Points difference", "priority" : 2 },
 						{ "name" : "BP", "equation" : "$bp", "description" : "Bonus points" },
-						{ "name" : "Pts", "equation" : "$points", "description" : "Total points" }
+						{ "name" : "Pts", "equation" : "$points", "description" : "Total points", "priority" : 1 }
 	],
 	"metrics": [
 						"Height",
diff --git a/presets/snooker.json b/presets/snooker.json
index ddfb86d7..b77c2a18 100644
--- a/presets/snooker.json
+++ b/presets/snooker.json
@@ -6,7 +6,7 @@
 						"Loss"
 	],
 	"results": [
-						{ "name" : "Score", "description" : "Total points", "main" : 1 }
+						{ "name" : "Score", "description" : "Total points", "primary" : 1 }
 	],
 	"performance": [
 						"1st Frame",
@@ -17,10 +17,10 @@
 						{ "name" : "W", "equation" : "$win", "priority" : 2, "description" : "Wins" },
 						{ "name" : "D", "equation" : "$draw", "description" : "Draws" },
 						{ "name" : "L", "equation" : "$loss", "description" : "Losses" },
-						{ "name" : "F", "equation" : "$scorefor", "description" : "Points for" },
+						{ "name" : "F", "equation" : "$scorefor", "description" : "Points for", "priority" : 3 },
 						{ "name" : "A", "equation" : "$scoreagainst", "description" : "Points against" },
-						{ "name" : "+-", "equation" : "$win - $loss", "description" : "Point difference" },
-						{ "name" : "PTS", "equation" : "$scorefor", "priority" : 1, "description" : "Points" }
+						{ "name" : "+-", "equation" : "$win - $loss", "description" : "Point difference", "priority" : 2 },
+						{ "name" : "PTS", "equation" : "$scorefor", "priority" : 1, "description" : "Points", "priority" : 1 }
 	],
 	"statistics": [
 						{ "name" : "Games Played", "equation" : "$eventsplayed" },
diff --git a/presets/squash.json b/presets/squash.json
index a7b4f74d..e59ef556 100644
--- a/presets/squash.json
+++ b/presets/squash.json
@@ -10,7 +10,8 @@
 						{ "name" : "G2", "description" : "2nd game" },
 						{ "name" : "G3", "description" : "3rd game" },
 						{ "name" : "G4", "description" : "4th game" },
-						{ "name" : "G5", "description" : "5th game" }
+						{ "name" : "G5", "description" : "5th game" },
+						{ "name" : "T", "id" : "points", "description" : "Total points", "primary" : 1 }
 	],
 	"performance": [
 	],
@@ -19,9 +20,9 @@
 						{ "name" : "W", "equation" : "$win", "priority" : 1, "description" : "Wins" },
 						{ "name" : "D", "equation" : "$draw", "description" : "Draws" },
 						{ "name" : "L", "equation" : "$loss", "description" : "Losses" },
-						{ "name" : "F", "equation" : "$gonefor + $gtwofor + $gthreefor + $gfourfor + $gfivefor", "priority" : 3, "description" : "Points for" },
-						{ "name" : "A", "equation" : "$goneagainst + $gtwoagainst + $gthreeagainst + $gfouragainst + $gfiveagainst", "description" : "Points against" },
-						{ "name" : "Pts", "equation" : "$gonefor + $gtwofor + $gthreefor + $gfourfor + $gfivefor - $goneagainst - $gtwoagainst - $gthreeagainst - $gfouragainst - $gfiveagainst", "priority" : 2, "description" : "Total points" }
+						{ "name" : "F", "equation" : "$pointsfor", "priority" : 3, "description" : "Points for" },
+						{ "name" : "A", "equation" : "$pointsagainst", "description" : "Points against" },
+						{ "name" : "Pts", "equation" : "$pointsfor - $pointsagainst", "priority" : 2, "description" : "Total points" }
 	],
 	"metrics": [
 						"Height",
diff --git a/presets/table-tennis.json b/presets/table-tennis.json
index 07a3c5e4..bb0fdc77 100644
--- a/presets/table-tennis.json
+++ b/presets/table-tennis.json
@@ -11,7 +11,7 @@
 						{ "name" : "3", "description" : "3rd set" },
 						{ "name" : "4", "description" : "4th set" },
 						{ "name" : "5", "description" : "5th set" },
-						{ "name" : "Sets", "description" : "Sets won" }
+						{ "name" : "Sets", "description" : "Sets won", "primary" : 1 }
 	],
 	"performance": [
 	],
@@ -21,8 +21,8 @@
 						{ "name" : "L", "equation" : "$loss", "description" : "Losses" },
 						{ "name" : "F", "equation" : "$setsfor", "description" : "Sets for" },
 						{ "name" : "A", "equation" : "$setsagainst", "description" : "Sets against" },
-						{ "name" : "%", "id" : "percent", "equation" : "$setsfor / $setsagainst * 1 0 0", "precision" : 2, "description" : "For/against ratio" },
-						{ "name" : "Points", "equation" : "$win * 3 + $loss" }
+						{ "name" : "%", "id" : "percent", "equation" : "$setsfor / $setsagainst * 1 0 0", "precision" : 2, "description" : "For/against ratio", "priority" : 2 },
+						{ "name" : "Points", "equation" : "$win * 3 + $loss", "priority" : 1 }
 	],
 	"metrics": [
 						"Height",
diff --git a/presets/tennis.json b/presets/tennis.json
index d786e418..7181b274 100644
--- a/presets/tennis.json
+++ b/presets/tennis.json
@@ -10,15 +10,16 @@
 						{ "name" : "S2", "description" : "2nd set" },
 						{ "name" : "S3", "description" : "3rd set" },
 						{ "name" : "S4", "description" : "4th set" },
-						{ "name" : "S5", "description" : "5th set" }
+						{ "name" : "S5", "description" : "5th set" },
+						{ "name" : "T", "id" : "points", "description" : "Total points", "primary" : 1 }
 	],
 	"performance": [
 	],
 	"columns": [
 						{ "name" : "Wins", "equation" : "$win", "description" : "Wins" },
 						{ "name" : "Losses", "equation" : "$loss", "description" : "Losses" },
-						{ "name" : "Win %", "id" : "winpct", "equation" : "$win / $eventsplayed * 1 0 0", "precision" : 2, "description" : "Win percentage" },
-						{ "name" : "Points", "equation" : "$win * 2 + $loss - $unfinished" }
+						{ "name" : "Win %", "id" : "winpct", "equation" : "$win / $eventsplayed * 1 0 0", "precision" : 2, "description" : "Win percentage", "priority" : 2 },
+						{ "name" : "Points", "equation" : "$win * 2 + $loss - $unfinished", "priority" : 1 }
 	],
 	"metrics": [
 						"Height",