diff --git a/devNotes/colorCSS.txt b/devNotes/colorCSS.txt
index f600048bb5d7ed32fb438d6f93f722c89c13857a..c330bbbb66a152a2454cf35ffd69481318c4a359 100644
--- a/devNotes/colorCSS.txt
+++ b/devNotes/colorCSS.txt
@@ -6,12 +6,30 @@ CLASS - COLOR
DEVOTION
.devotion.inc - hotpink
.devotion.dec - mediumorchid
-
-TRUST
+.devotion.hateful - darkviolet ( < -50) (there is also very hateful, but they are the same color, so same class for now)
+.devotion.resistant - mediumorchid ( < -20)
+.devotion.ambivalent - yellow ( <= 20)
+.devotion.accept - hotpink ( <= 50)
+.devotion.devoted - deeppink ( <= 95)
+.devotion.worship - magenta ( > 95)
+
+TRUST (defiant versions for devotion < -20)
.trust.inc - mediumaquamarine
+.defiant.inc - orangered (trust > -20)
.trust.dec - gold
-.defiant - darkred
-.trust.inc-defiant - orangered (trust increase without enough devotion)
+.trust.extremely-terrified - darkgoldenrod ( < - 95)
+.trust.terrified - goldenrod ( < -50)
+.trust.frightened - gold ( < -20)
+.trust.fearful - yellow ( <= 20)
+.trust.careful - mediumaquamarine ( <= 50)
+.defiant.careful - orange
+.trust.trusting - mediumseagreen ( <= 95)
+.defiant.bold - orangered
+.trust.prof-trusting - seagreen ( > 95)
+.defiant.full - darkred
+
+MINDBROKEN
+.mindbroken - red
SKILL (not final)
- Player
diff --git a/src/gui/css/mainStyleSheet.css b/src/gui/css/mainStyleSheet.css
index e757fc057df3c13b1781c131e548c1a8acb58a8c..5db722676d7d00d1e46bfc224fdc05fcafb0bff0 100644
--- a/src/gui/css/mainStyleSheet.css
+++ b/src/gui/css/mainStyleSheet.css
@@ -184,19 +184,19 @@ span.zeroButton > a:hover { text-decoration: none; }
.aquamarine, .aquamarine a, .skill, .skill a { color: aquamarine }
.coral, .coral a, .fetish.loss, .fetish.loss a { color: coral }
.cyan, .cyan a { color: cyan } /* used for aphrodisiac & neighbor arcs */
-.darkgoldenrod, .darkgoldenrod a { color: darkgoldenrod }
-.darkred, .darkred a, .defiant, .defiant a { color: darkred }
-.darkviolet, .darkviolet a { color: darkviolet }
-.deeppink, .deeppink a { color: deeppink } /* used for devotion once & agent */
+.darkgoldenrod, .darkgoldenrod a, .trust.extremely-terrified, .trust.extremely-terrified a { color: darkgoldenrod }
+.darkred, .darkred a, .defiant.full, .defiant.full a { color: darkred }
+.darkviolet, .darkviolet a, .devotion.hateful, .devotion.hateful a { color: darkviolet }
+.deeppink, .deeppink a, .devotion.devoted, .devotion.devoted a { color: deeppink } /* used for devotion once & agent */
.steelblue, .steelblue a { color: steelblue }
.deepskyblue, .deepskyblue a, .intelligent, .intelligent a { color: deepskyblue }
.dodgerblue, .dodgerblue a { color: dodgerblue }
.blue, .blue a { color: blue }
-.gold, .gold a, .trust.dec, .trust.dec a { color: gold }
-.goldenrod, .goldenrod a { color: goldenrod }
+.gold, .gold a, .trust.dec, .trust.dec a, .trust.frightened, .trust.frightened a { color: gold }
+.goldenrod, .goldenrod a, .trust.terrified, .trust.terrified a { color: goldenrod }
.gray, .gray a { color: gray }
.green, .green a, .reputation.inc, .reputation.inc a, .improvement, .improvement a { color: green }
-.hotpink, .hotpink a, .devotion.inc, .devotion.inc a { color: hotpink }
+.hotpink, .hotpink a, .devotion.inc, .devotion.inc a, .devotion.accept, .devotion.accept a { color: hotpink }
.lawngreen, .lawngreen a { color: lawngreen }
.lightblue, .lightblue a { color: lightblue }
.lightcoral, .lightcoral a, .fetish.gain, .fetish.gain a { color: lightcoral } /* compare pink for fetish */
@@ -205,23 +205,23 @@ span.zeroButton > a:hover { text-decoration: none; }
.lightsalmon, .lightsalmon a, .fetish.inc, .fetish.inc a { color: lightsalmon }
.lime, .lime a, .change.positive, .change.positive a, .virginity.loss, .virginity.loss a, .pregnant, .pregnant a { color: lime } /* tight orifices, breast changes, take virginity, not sure on good aliases */
.limegreen, .limegreen a { color: limegreen } /* multiple questionable uses */
-.magenta, .magenta a { color: magenta }
-.mediumaquamarine, .mediumaquamarine a, .trust.inc, .trust.inc a { color: mediumaquamarine }
-.mediumorchid, .mediumorchid a, .devotion.dec, .devotion.dec a { color: mediumorchid }
-.mediumseagreen, .mediumseagreen a { color: mediumseagreen }
-.orange, .orange a, .stupid, .stupid a, .change.negative, .change.negative a { color: orange } /* generally between red and green, and a lot of other places */
-.orangered, .orangered a, .trust.inc-defiant, .trust.inc-defiant a { color: orangered }
+.magenta, .magenta a, .devotion.worship, .devotion.worship a { color: magenta }
+.mediumaquamarine, .mediumaquamarine a, .trust.inc, .trust.inc a, .trust.careful, .trust.careful a { color: mediumaquamarine }
+.mediumorchid, .mediumorchid a, .devotion.dec, .devotion.dec a, .devotion.resistant, .devotion.resistant a { color: mediumorchid }
+.mediumseagreen, .mediumseagreen a, .trust.trusting, .trust.trusting a { color: mediumseagreen }
+.orange, .orange a, .stupid, .stupid a, .change.negative, .change.negative a, .defiant.careful, .defiant.careful a { color: orange } /* generally between red and green, and a lot of other places */
+.orangered, .orangered a, .defiant.inc, .defiant.inc a, .defiant.bold, .defiant.bold a { color: orangered }
.orchid, .orchid a { color: orchid } /* used once (wrong? */
.pink, .pink a { color: pink } /* also fetish start ??? , and a lot of other stuff */
.red, .red a, .health.dec, .health.dec a, .cash.dec, .cash.dec a, .flaw.gain, .flaw.gain a, .error, .error a, .elites.loss, .elites.loss a { color: red } /* also generally bad stuff */
-.seagreen, .seagreen a { color: seagreen }
+.seagreen, .seagreen a, .trust.prof-trusting, .trust.prof-trusting a { color: seagreen }
.springgreen, .springgreen a, .skill.advantage, .skill.advantage a { color: springgreen }
.tan, .tan a { color: tan } /* some ethnicity */
.chocolate, .chocolate a { color: chocolate }
.saddlebrown, .saddlebrown a { color: saddlebrown }
.teal, .teal a { color: teal }
-.yellow, .yellow a, .noteworthy, .noteworthy a { color: yellow }
-.yellowgreen, .yellowgreen a, .cash.inc, .cash.inc a { color: yellowgreen } /* maybe only positive cash? */
+.yellow, .yellow a, .noteworthy, .noteworthy a, .devotion.ambivalent, .devotion.ambivalent a, .trust.fearful, .trust.fearful a { color: yellow }
+.yellowgreen, .yellowgreen a, .cash.inc, .cash.inc a { color: yellowgreen }
/*! <<checkvars>> macro for SugarCube 2.x */
#ui-dialog-body.checkvars{padding:1em}#ui-dialog-body.checkvars h1{font-size:1em;margin-top:0}#ui-dialog-body.checkvars table{border-collapse:collapse;border-spacing:0}#ui-dialog-body.checkvars thead tr{border-bottom:2px solid #444}#ui-dialog-body.checkvars tr:not(:first-child){border-top:1px solid #444}#ui-dialog-body.checkvars td,#ui-dialog-body.checkvars th{padding:.25em 1em}#ui-dialog-body.checkvars td:first-child,#ui-dialog-body.checkvars th:first-child{padding-left:.5em;border-right:1px solid #444}#ui-dialog-body.checkvars td:last-child,#ui-dialog-body.checkvars th:last-child{padding-right:.5em}#ui-dialog-body.checkvars th:first-child{text-align:center}#ui-dialog-body.checkvars td:first-child{font-weight:700;text-align:right}#ui-dialog-body.checkvars td{font-family:monospace,monospace;vertical-align:top;white-space:pre-wrap}#ui-dialog-body.checkvars .scroll-pad{margin:0;padding:0}
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index ea9d144efaf56176c8acbba7e9a1eb32a02d6b89..3f1d3a541b1098f76223a2e1840f8543e0a86b0b 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -272,49 +272,49 @@ window.SlaveSummaryUncached = (function() {
*/
function short_devotion(slave, c) {
if (slave.fetish === "mindbroken") {
- makeSpan(c, "MB", "red");
+ makeSpan(c, "MB", "mindbroken");
} else if (slave.devotion < -95) {
- makeSpan(c, "Hate", "darkviolet", true, slave.devotion);
+ makeSpan(c, "Hate", ["devotion", "hateful"], true, slave.devotion);
} else if (slave.devotion < -50) {
- makeSpan(c, "Hate", "darkviolet", true, slave.devotion);
+ makeSpan(c, "Hate", ["devotion", "hateful"], true, slave.devotion);
} else if (slave.devotion < -20) {
- makeSpan(c, "Res", "mediumorchid", true, slave.devotion);
+ makeSpan(c, "Res", ["devotion", "resistant"], true, slave.devotion);
} else if (slave.devotion <= 20) {
- makeSpan(c, "Ambiv", "yellow", true, slave.devotion);
+ makeSpan(c, "Ambiv", ["devotion", "ambivalent"], true, slave.devotion);
} else if (slave.devotion <= 50) {
- makeSpan(c, "Accept", "hotpink", true, slave.devotion);
+ makeSpan(c, "Accept", ["devotion", "accept"], true, slave.devotion);
} else if (slave.devotion <= 95) {
- makeSpan(c, "Devo", "deeppink", true, slave.devotion);
+ makeSpan(c, "Devo", ["devotion", "devoted"], true, slave.devotion);
} else {
- makeSpan(c, "Wor", "magenta", true, slave.devotion);
+ makeSpan(c, "Wor", ["devotion", "worship"], true, slave.devotion);
}
if (slave.fetish === "mindbroken") {
return;
} else if (slave.trust < -95) {
- makeSpan(c, "ETerr", "darkgoldenrod", true, slave.trust);
+ makeSpan(c, "ETerr", ["trust", "extremely-terrified"], true, slave.trust);
} else if (slave.trust < -50) {
- makeSpan(c, "Terr", "goldenrod", true, slave.trust);
+ makeSpan(c, "Terr", ["trust", "terrified"], true, slave.trust);
} else if (slave.trust < -20) {
- makeSpan(c, "Fright", "gold", true, slave.trust);
+ makeSpan(c, "Fright", ["trust", "frightened"], true, slave.trust);
} else if (slave.trust <= 20) {
- makeSpan(c, "Fear", "yellow", true, slave.trust);
+ makeSpan(c, "Fear", ["trust", "fearful"], true, slave.trust);
} else if (slave.trust <= 50) {
if (slave.devotion < -20) {
- makeSpan(c, "Caref", "orange", true, slave.trust);
+ makeSpan(c, "Caref", ["defiant", "careful"], true, slave.trust);
} else {
- makeSpan(c, "Caref", "mediumaquamarine", true, slave.trust);
+ makeSpan(c, "Caref", ["trust", "careful"], true, slave.trust);
}
} else if (slave.trust < 95) {
if (slave.devotion < -20) {
- makeSpan(c, "Bold", "orangered", true, slave.trust);
+ makeSpan(c, "Bold", ["defiant", "bold"], true, slave.trust);
} else {
- makeSpan(c, "Trust", "mediumseagreen", true, slave.trust);
+ makeSpan(c, "Trust", ["trust", "trusting"], true, slave.trust);
}
} else {
if (slave.devotion < -20) {
- makeSpan(c, "Defiant", "darkred", true, slave.trust);
+ makeSpan(c, "Defiant", ["defiant", "full"], true, slave.trust);
} else {
- makeSpan(c, "VTrust", "seagreen", true, slave.trust);
+ makeSpan(c, "VTrust", ["trust", "prof-trusting"], true, slave.trust);
}
}
}
@@ -326,49 +326,49 @@ window.SlaveSummaryUncached = (function() {
*/
function long_devotion(slave, c) {
if (slave.fetish === "mindbroken") {
- makeSpan(c, "Mindbroken.", "red");
+ makeSpan(c, "Mindbroken.", "mindbroken");
} else if (slave.devotion < -95) {
- makeSpan(c, "Very hateful", "darkviolet", true, slave.devotion);
+ makeSpan(c, "Very hateful", ["devotion", "hateful"], true, slave.devotion);
} else if (slave.devotion < -50) {
- makeSpan(c, "Hateful", "darkviolet", true, slave.devotion);
+ makeSpan(c, "Hateful", ["devotion", "hateful"], true, slave.devotion);
} else if (slave.devotion < -20) {
- makeSpan(c, "Resistant", "mediumorchid", true, slave.devotion);
+ makeSpan(c, "Resistant", ["devotion", "resistant"], true, slave.devotion);
} else if (slave.devotion <= 20) {
- makeSpan(c, "Ambivalent", "yellow", true, slave.devotion);
+ makeSpan(c, "Ambivalent", ["devotion", "ambivalent"], true, slave.devotion);
} else if (slave.devotion <= 50) {
- makeSpan(c, "Accepting", "hotpink", true, slave.devotion);
+ makeSpan(c, "Accepting", ["devotion", "accept"], true, slave.devotion);
} else if (slave.devotion <= 95) {
- makeSpan(c, "Devoted", "deeppink", true, slave.devotion);
+ makeSpan(c, "Devoted", ["devotion", "devoted"], true, slave.devotion);
} else {
- makeSpan(c, "Worshipful", "magenta", true, slave.devotion);
+ makeSpan(c, "Worshipful", ["devotion", "worship"], true, slave.devotion);
}
if (slave.fetish === "mindbroken") {
return;
} else if (slave.trust < -95) {
- makeSpan(c, "Extremely terrified", "darkgoldenrod", true, slave.trust);
+ makeSpan(c, "Extremely terrified", ["trust", "extremely-terrified"], true, slave.trust);
} else if (slave.trust < -50) {
- makeSpan(c, "Terrified", "goldenrod", true, slave.trust);
+ makeSpan(c, "Terrified", ["trust", "terrified"], true, slave.trust);
} else if (slave.trust < -20) {
- makeSpan(c, "Frightened", "gold", true, slave.trust);
+ makeSpan(c, "Frightened", ["trust", "frightened"], true, slave.trust);
} else if (slave.trust <= 20) {
- makeSpan(c, "Fearful", "yellow", true, slave.trust);
+ makeSpan(c, "Fearful", ["trust", "fearful"], true, slave.trust);
} else if (slave.trust <= 50) {
if (slave.devotion < -20) {
- makeSpan(c, "Careful", "orange", true, slave.trust);
+ makeSpan(c, "Careful", ["defiant", "careful"], true, slave.trust);
} else {
- makeSpan(c, "Careful", "mediumaquamarine", true, slave.trust);
+ makeSpan(c, "Careful", ["trust", "careful"], true, slave.trust);
}
- } else if (slave.trust < 95) {
+ } else if (slave.trust <= 95) {
if (slave.devotion < -20) {
- makeSpan(c, "Bold", "orangered", true, slave.trust);
+ makeSpan(c, "Bold", ["defiant", "bold"], true, slave.trust);
} else {
- makeSpan(c, "Trusting", "mediumseagreen", true, slave.trust);
+ makeSpan(c, "Trusting", ["trust", "trusting"], true, slave.trust);
}
} else {
if (slave.devotion < -20) {
- makeSpan(c, "Defiant", "darkred", true, slave.trust);
+ makeSpan(c, "Defiant", ["defiant", "full"], true, slave.trust);
} else {
- makeSpan(c, "Profoundly trusting", "seagreen", true, slave.trust);
+ makeSpan(c, "Profoundly trusting", ["trust", "prof-trusting"], true, slave.trust);
}
}
}