Merge branch 'issue-1793' into 'pregmod-master'

Fix conditions for displaying chubby slaves in slave summary

Closes #1793

See merge request pregmodfan/fc-pregmod!6793

js/003-data/slaveSummaryData.js

@@ -130,7 +130,7 @@ App.Data.SlaveSummary = {
 					999: {desc: "Hyper T&A.", style: "pink"}
 				}
 			},
-			weight: { // indices: [weigh + 100, FSHedonisticDecadence (0,1), hips + 2, ]
+			weight: { // indices: [weigh + 100, FSHedonisticDecadence (0,1), hips + 2]
 				4: {desc: "Emaciated", style: "red"},
 				69: {
 					2: { // FSHedonisticDecadence doesn't matter
@@ -142,18 +142,18 @@ App.Data.SlaveSummary = {
 				110: {desc: "Trim"},
 				130: {desc: "Plush"},
 				195: {
-					0: {desc: "Overweight", style: "red"},
-					1: {
+					0: {
 						3: {desc: "Overweight", style: "red"},
-						5: {desc: "Nicely chubby"}
-					}
+						99: {desc: "Nicely chubby"}
+					},
+					1: {desc: "Nicely chubby"}
 				},
 				230: {
-					0: {desc: "Fat", style: "red"},
-					1: {
+					0: {
 						4: {desc: "Fat", style: "red"},
-						5: {desc: "Pleasantly soft and shapely"}
-					}
+						99: {desc: "Pleasantly soft and shapely"}
+					},
+					1: {desc: "Pleasantly soft and shapely"}
 				},
 				260: {
 					0: {desc: "Obese", style: "red"},
@@ -773,7 +773,7 @@ App.Data.SlaveSummary = {
 					999: {desc:	"T&A+++", style: "pink"}
 				}
 			},
-			weight: { // indices: [weigh + 100, FSHedonisticDecadence (0,1), hips + 2, ]
+			weight: { // indices: [weigh + 100, FSHedonisticDecadence (0,1), hips + 2]
 				4: {desc: "W---", style: ["red", "strong"]},
 				69: {
 					99: { // FSHedonisticDecadence doesn't matter
@@ -785,18 +785,18 @@ App.Data.SlaveSummary = {
 				110: {desc: "W", style: "strong"},
 				130: {desc: "W+", style: "strong"},
 				195: {
-					0: {desc: "W++", style: ["red", "strong"]},
-					1: {
+					0: {
 						3: {desc: "W++", style: ["red", "strong"]},
-						5: {desc: "W++", style: "strong"}
-					}
+						99: {desc: "W++", style: "strong"}
+					},
+					1: {desc: "W++", style: "strong"}
 				},
 				230: {
-					0: {desc: "W+++", style: ["red", "strong"]},
-					1: {
+					0: {
 						4: {desc: "W+++", style: ["red", "strong"]},
-						5: {desc: "W+++", style: "strong"}
-					}
+						99: {desc: "W+++", style: "strong"}
+					},
+					1: {desc: "W+++", style: "strong"},
 				},
 				260: {
 					0: {desc: "W++++", style: ["red", "strong"]},