diff --git a/src/003-assets/CSS/tooltip.css b/src/003-assets/CSS/tooltip.css index d5b0fca09bea871ccd1ef8af8e1134b2eedf6c71..8246aae0c3bc3309c15ea13f4ecfe92aac2b447f 100644 --- a/src/003-assets/CSS/tooltip.css +++ b/src/003-assets/CSS/tooltip.css @@ -3,69 +3,69 @@ * based on https://codeconvey.com/pure-html5-css-tooltips-using-title-data-attribute/ */ .exampleTooltip, .devotion, .trust, .defiant { - position: relative; - display: inline; + position: relative; + display: inline; } .exampleTooltip:after, .devotion:after, .trust:after, .defiant:after { - display: block; - visibility: hidden; - position: absolute; - font-size: smaller; - width: 20em; - height: auto; - background-color: slategray; - color: black; - text-decoration: none; - font-style: normal; - text-align: center; - border-radius: 3px; - padding: 5px; - z-index: 999; - bottom: 0; - left: 10px; + display: block; + visibility: hidden; + position: absolute; + font-size: smaller; + width: 20em; + height: auto; + background-color: slategray; + color: black; + text-decoration: none; + font-style: normal; + text-align: center; + border-radius: 3px; + padding: 5px; + z-index: 999; + bottom: 0; + left: 10px; } .exampleTooltip:after { - content: "I am a helpful tooltip. We are very rare because we are still in development."; + content: "I am a helpful tooltip. We are very rare because we are still in development."; } .devotion:after { - content: "Devotion is a measure of a slave's love for you."; + content: "Devotion is a measure of a slave's love for you."; } .trust:after { - content: "Trust is a measure of a slave's expectations of you and confidence to perform well."; + content: "Trust is a measure of a slave's expectations of you and confidence to perform well."; } .defiant:after { - content: "Defiant slaves will actively work against you."; + content: "Defiant slaves will actively work against you."; } /* makes the arrow */ .exampleTooltip:before, .devotion:before, .trust:before, .defiant:before { - position: absolute; - visibility: hidden; - width: 0; - height: 0; - left: 20px; - bottom: 0; - opacity: 0; - content: ""; - border-style: solid; - border-width: 6px 6px 0 6px; - border-color: slategray transparent transparent transparent; - z-index: 999; + position: absolute; + visibility: hidden; + width: 0; + height: 0; + left: 20px; + bottom: 0; + opacity: 0; + content: ""; + border-style: solid; + border-width: 6px 6px 0 6px; + border-color: slategray transparent transparent transparent; + z-index: 999; } body.tooltipsEnabled .exampleTooltip:hover:after, body.tooltipsEnabled .devotion:hover:after, body.tooltipsEnabled .trust:hover:after, body.tooltipsEnabled .defiant:hover:after { - visibility: visible; - opacity: 1; - bottom: 20px; + visibility: visible; + opacity: 1; + bottom: 20px; } body.tooltipsEnabled .exampleTooltip:hover:before, body.tooltipsEnabled .devotion:hover:before, body.tooltipsEnabled .trust:hover:before, body.tooltipsEnabled .defiant:hover:before { - visibility: visible; - opacity: 1; - bottom: 15px; + visibility: visible; + opacity: 1; + bottom: 15px; } diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw index e7ef433c6c8b121aa3e481d004b4d7e023fa978e..d3b45414bc2ebce927c388911cb4a76ce7a1a7d0 100644 --- a/src/events/intro/introSummary.tw +++ b/src/events/intro/introSummary.tw @@ -35,7 +35,7 @@ __''UI Settings''__ /* Accordion 000-250-006 */ <<options $useAccordion>> - Accordion effects on weekly reports are + Accordion effects on weekly reports are <<option 1 "Enable">> @@.cyan;ENABLED.@@ <<option 0 "Disable">> @@ -45,7 +45,7 @@ __''UI Settings''__ <br> <<options $useTabs>> - Economic Tabs on weekly reports are + Economic Tabs on weekly reports are <<option 1 "Enable">> @@.cyan;ENABLED.@@ <<option 0 "Disable">> diff --git a/src/interaction/prostheticLab.tw b/src/interaction/prostheticLab.tw index 8b15837a70cf9c6b76f07458b09a7b5a27c9ee49..3a50028de2018ba759713e0e559f1ce91df29514 100644 --- a/src/interaction/prostheticLab.tw +++ b/src/interaction/prostheticLab.tw @@ -71,7 +71,7 @@ //Facility is fully expanded.// <</if>> </div> - + <div style="padding-top:1em"> <<if ($researchLab.hired + $researchLab.menials) < $researchLab.maxSpace>> <div> diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js index 1f7a13f67cac6c82a1d6a2b23a8427a7e110054c..903f171f7800e541ba6f318404b7bf787772338f 100644 --- a/src/js/DefaultRules.js +++ b/src/js/DefaultRules.js @@ -1505,7 +1505,7 @@ window.DefaultRules = (function() { r += `<br>${slave.slaveName} is not eligible to fight.`; } else { if (!V.fighterIDs.includes(slave.ID)) { - V.fighterIDs.push(slave.ID); + V.fighterIDs.push(slave.ID); } r += `<br>${slave.slaveName} has been automatically assigned to fight in the pit.`; } diff --git a/src/js/utils.js b/src/js/utils.js index 2885e290d0761c5f6b1eb9c9931eab8e8409c562..4e51059a099180258057884edb03c5bbf979e8bf 100644 --- a/src/js/utils.js +++ b/src/js/utils.js @@ -308,10 +308,10 @@ window.getBestSlaves = function({part, count=3, smallest=false, filter=null}={}) filter = ()=>true; } return V.slaves.map((slave, index)=>({slave, index})) - .filter(slaveInfo=>filter(slaveInfo.slave)) - .map(slaveInfo=>{ slaveInfo.value = part(slaveInfo.slave); return slaveInfo; }) - .sort(sortMethod) - .slice(0, count); + .filter(slaveInfo=>filter(slaveInfo.slave)) + .map(slaveInfo=>{ slaveInfo.value = part(slaveInfo.slave); return slaveInfo; }) + .sort(sortMethod) + .slice(0, count); }; window.getBestSlavesIndices= function(info) { return getBestSlaves(info).map(slaveInfo => slaveInfo.index); diff --git a/src/pregmod/analyzePlayerPregnancy.tw b/src/pregmod/analyzePlayerPregnancy.tw index 1df3b738b7e6387b00249fed1ae45271f463aab3..fb8a2b2a0b46d8cb79ecbf2195c0888e295c39a7 100644 --- a/src/pregmod/analyzePlayerPregnancy.tw +++ b/src/pregmod/analyzePlayerPregnancy.tw @@ -15,7 +15,7 @@ <p class="scene-intro"> You make yourself comfortable and prep your stomach for examination. <<PlayerBelly>> </p> - + <p> <h2>Furthest developed pregnancy</h2> <div class="indent"> diff --git a/src/pregmod/analyzePregnancy.tw b/src/pregmod/analyzePregnancy.tw index 84f66bfe11da41320f238ffc04e9fe7113c86877..03a2a23659fdc8dd0237c2bb1213100f7c273b23 100644 --- a/src/pregmod/analyzePregnancy.tw +++ b/src/pregmod/analyzePregnancy.tw @@ -100,7 +100,7 @@ <<for _ap = 0; _ap < _WL; _ap++>> <hr style="margin:0"> <p> - <<capture _ap>> + <<capture _ap>> <<if $activeSlave.womb[_ap].age >=2 >> <div class="indent"> Ova: $activeSlave.womb[_ap].genetics.name diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw index b07d7e83521daae45cbbd36837bde6e86b3db88d..1c5fa8578f3ccb2d1bb6d7e9a4f0d78a5c989072 100644 --- a/src/uncategorized/RESS.tw +++ b/src/uncategorized/RESS.tw @@ -7932,7 +7932,6 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He <<set $activeSlave.devotion -= 50, $activeSlave.trust -= 50>> <<run eyeSurgery($activeSlave, "both", "blind"), surgeryDamage($activeSlave, 20)>> <<set $slaves.forEach(function(s) { if (s.devotion <= 20) { s.trust -= 10; } })>> - <</replace>> <</link>> <</if>> diff --git a/src/uncategorized/buySlaves.tw b/src/uncategorized/buySlaves.tw index a23f82e69d3bb9eac98bbc4837b135db66ea2adc..6d0ef97c3ca5b78d17f618c24da06c7c3a3a8784 100644 --- a/src/uncategorized/buySlaves.tw +++ b/src/uncategorized/buySlaves.tw @@ -363,7 +363,7 @@ <</if>> </div> - + <h2>Selling slaves</h2> <div> While you are at the market, you may want to [[look at your own underperforming slaves|Underperforming Slaves]]. diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw index b5b7bbd57e05fee749764466ae9bb2c0be9d5417..ff4909a27cc9c813e9f90d76a0c687ab285a5f1b 100644 --- a/src/uncategorized/clinicReport.tw +++ b/src/uncategorized/clinicReport.tw @@ -246,7 +246,7 @@ <<if $slaves[$i].trust < 45>> <<set $slaves[$i].trust += 4>> <</if>> - + <<if ($slaves[$i].health.condition < -80)>> <<run improveCondition($slaves[$i], (20 + ($curativeUpgrade * 10) + _healthBonus))>> <<elseif ($slaves[$i].health.condition < -40)>> diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw index 2e312a971cb4daabba934ce1b4fa2700d316771f..68b72f0703ade421d20a4cb66403baa7c4de935f 100644 --- a/src/uncategorized/longSlaveDescription.tw +++ b/src/uncategorized/longSlaveDescription.tw @@ -2374,7 +2374,7 @@ $He is <</if>> <</if>> <<else>> - aphrodisiacs and is not allowed to masturbate so as $he <<if hasAnyLegs($activeSlave)>>stands<<else>>sits<</if>> before you $he desperately presents $his open mouth, $his + aphrodisiacs and is not allowed to masturbate so as $he <<if hasAnyLegs($activeSlave)>>stands<<else>>sits<</if>> before you $he desperately presents $his open mouth, $his <<if $activeSlave.boobs >= 300>> breasts, <<else>> @@ -2450,7 +2450,7 @@ $He is <</if>> <</if>> <<else>> - aphrodisiacs and is not allowed to masturbate so as $he <<if hasAnyLegs($activeSlave)>>stands<<else>>sits<</if>> before you $he desperately presents $his open mouth, $his + aphrodisiacs and is not allowed to masturbate so as $he <<if hasAnyLegs($activeSlave)>>stands<<else>>sits<</if>> before you $he desperately presents $his open mouth, $his <<if $activeSlave.boobs >= 300>> breasts, <<else>> @@ -2524,7 +2524,7 @@ $He is <</if>> <</if>> <<else>> - aphrodisiacs and is not allowed to masturbate so as $he <<if hasAnyLegs($activeSlave)>>stands<<else>>sits<</if>> before you $he desperately presents $his open mouth, $his + aphrodisiacs and is not allowed to masturbate so as $he <<if hasAnyLegs($activeSlave)>>stands<<else>>sits<</if>> before you $he desperately presents $his open mouth, $his <<if $activeSlave.boobs >= 300>> breasts, <<else>> diff --git a/src/uncategorized/reShelterInspection.tw b/src/uncategorized/reShelterInspection.tw index c36320182e49d5ef3a6f787fe490b976b7d07188..ae35368f27a4a82856bb6043b4a399731fb24b07 100644 --- a/src/uncategorized/reShelterInspection.tw +++ b/src/uncategorized/reShelterInspection.tw @@ -300,7 +300,7 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema <<if canAchieveErection(_Inspectee)>> "It even work<<s>>, that'<<s>> lovely." The inspector looks deflated, and reluctantly makes a positive note on _his2 tablet. <<else>> - "It <<s>>eem<<s>> to be non-functional, but it'<<s>> a ni<<c>>e gesture at lea<<s>>t." The inspector looks deflated, and reluctantly makes a positive note on _his2 tablet. + "It <<s>>eem<<s>> to be non-functional, but it'<<s>> a ni<<c>>e ge<<s>>ture at lea<<s>>t." The inspector looks deflated, and reluctantly makes a positive note on _his2 tablet. <</if>> <<set _inspectionResult-->> <</if>> diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw index 914773d494608fe50e4b012333f58b5851d01857..0e666287ad575e4318e95909917ff57fe6844db6 100644 --- a/src/uncategorized/remoteSurgery.tw +++ b/src/uncategorized/remoteSurgery.tw @@ -1767,7 +1767,7 @@ [[Induced albinism treatment|Surgery Degradation][$activeSlave.geneticQuirks.albinism = 2,cashX(forceNeg($surgeryCost*10), "slaveSurgery", $activeSlave), surgeryDamage($activeSlave,40), $activeSlave.chem += 40,$surgeryType = "gene treatment"]] //This will induce @@.orange;albinism@@ in $his genetic code// <</if>> </div> - + <div class="indent"> <<if $activeSlave.geneticQuirks.androgyny == 2>> [[Androgyny correction treatment|Surgery Degradation][$activeSlave.geneticQuirks.androgyny = 0,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), surgeryDamage($activeSlave,40), $activeSlave.chem += 100,$surgeryType = "gene treatment"]] diff --git a/src/uncategorized/saChoosesOwnJob.tw b/src/uncategorized/saChoosesOwnJob.tw index 13d112bfe32b1bb5f80268b7bb0703465bdeeaed..f69d8ea9cf35d4aa69a19df2ea11f3c24fac4784 100644 --- a/src/uncategorized/saChoosesOwnJob.tw +++ b/src/uncategorized/saChoosesOwnJob.tw @@ -29,7 +29,7 @@ <<set $slaves[$i].choosesOwnAssignmentText += " is ill, so $he decides to rest.">> <<= removeJob($slaves[$i], $slaves[$i].assignment)>> <</if>> - + <<elseif ($slaves[$i].health.condition < 20)>> <<if ($universalRulesAssignsSelfFacility == 1) && ($spa > _spaL)>> <<set $slaves[$i].choosesOwnAssignmentText += " is unhealthy, so $he decides to get recover at $spaName.">> diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw index 068d5642350c8cbae9f787799b02621fce0ba898..912fffb0399344a98f984ade8919101243d99129 100644 --- a/src/uncategorized/slaveInteract.tw +++ b/src/uncategorized/slaveInteract.tw @@ -1539,7 +1539,7 @@ Hormones: <strong><span id="hormones"> <<link "Drugs">><<set $activeSlave.rules.reward = "drugs">><<replace "#standardReward">>$activeSlave.rules.reward<</replace>><</link>> | <<link "Orgasm">><<set $activeSlave.rules.reward = "orgasm">><<replace "#standardReward">>$activeSlave.rules.reward<</replace>><</link>> | <<link "Situational">><<set $activeSlave.rules.reward = "situational">><<replace "#standardReward">>$activeSlave.rules.reward<</replace>><</link>> - + <<if setup.facilityHeads.includes($activeSlave.assignment)>> <<if $activeSlave.lactation != 2>> <br>Lactation maintenance for facility heads: ''<span id="lactationRules">$activeSlave.rules.lactation</span>.'' diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw index 2ee8ae586da071382063efc137ae13927f06f8f1..3c4e29e0a7e85c93f365e016dde206891e653284 100644 --- a/src/uncategorized/surgeryDegradation.tw +++ b/src/uncategorized/surgeryDegradation.tw @@ -454,7 +454,7 @@ As the remote surgery's long recovery cycle completes, <</if>> <<case "newEars">> - The implant surgery is @@.red;invasive@@ and $he spends some time in the autosurgery recovering. As soon as the bandages around $his ears are removed, $he + The implant surgery is @@.red;invasive@@ and $he spends some time in the autosurgery recovering. As soon as the bandages around $his ears are removed, $he <<if $activeSlave.fetish == "mindbroken">> returns to his normal activities, none the wiser. <<else>> diff --git a/src/utility/saRulesWidgets.tw b/src/utility/saRulesWidgets.tw index 7516e157a112ff313e3da615aed7e17a2f283338..9b46f5a999e9acdee547906337d8c7681ef8263d 100644 --- a/src/utility/saRulesWidgets.tw +++ b/src/utility/saRulesWidgets.tw @@ -43,7 +43,7 @@ and <<if ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetishStrength > 60)>> <<switch $slaves[$i].fetish>> <<case "submissive">> - hold $him down and + hold $him down and <<if $slaves[$i].vagina <= 0 && $slaves[$i].anus <= 0>> use $his body <<else>> @@ -959,7 +959,7 @@ and is forbidden to masturbate or seek sexual release, which @@.mediumorchid;highly frustrates@@ $him. <<set $slaves[$i].devotion -= 2>> <</if>> - + <</widget>> <<widget "saRulesNoReleaseDrugEffects">>