diff --git a/devTools/FC.d.ts b/devTools/FC.ts
similarity index 96%
rename from devTools/FC.d.ts
rename to devTools/FC.ts
index e3e9a5ef4190bf9e15bc27882b2b5abf89c863d8..82253b74720e3fe501b5873ffae1b933b0fbc6e1 100644
--- a/devTools/FC.d.ts
+++ b/devTools/FC.ts
@@ -1,4 +1,5 @@
-declare namespace App {
+/// <reference path="../js/002-config/fc-js-init.js" />
+namespace App {
namespace Art {}
namespace Corporate {}
@@ -262,7 +263,7 @@ declare namespace App {
labelTagsClear: boolean;
}
- class Rule {
+ declare interface Rule {
ID: string;
name: string;
condition: RuleConditions;
@@ -277,12 +278,12 @@ declare namespace App {
namespace DOM {
namespace Widgets { }
- function makeElement<K extends keyof HTMLElementTagNameMap>(tag: K, content: string | Node, classNames?: string | string[]): HTMLElementTagNameMap[K];
- function appendNewElement<K extends keyof HTMLElementTagNameMap>(tag: K, parent: ParentNode, content?: string | Node, classNames?: string | string[]): HTMLElementTagNameMap[K];
+ declare function makeElement<K extends keyof HTMLElementTagNameMap>(tag: K, content: string | Node, classNames?: string | string[]): HTMLElementTagNameMap[K];
+ declare function appendNewElement<K extends keyof HTMLElementTagNameMap>(tag: K, parent: ParentNode, content?: string | Node, classNames?: string | string[]): HTMLElementTagNameMap[K];
}
namespace View { }
namespace SlaveSummary {
- type AppendRenderer = (slave: App.Entity.SlaveState, parentNode: Node) => void;
+ type AppendRenderer = (slave: FC.SlaveState, parentNode: Node) => void;
class AbbreviationState {
clothes: number;
@@ -561,7 +562,7 @@ declare namespace FC {
enum NoObject {
Value = 0
- };
+ }
type SlaveStateOrZero = SlaveState | NoObject;
@@ -570,4 +571,4 @@ declare namespace FC {
interface GameVariables extends DefaultGameStateVariables, ResetOnNGPVariables {}
}
-const V: FC.GameVariables;
+declare const V: FC.GameVariables;
diff --git a/src/003-assets/CSS/slaveList.css b/src/003-assets/CSS/slaveList.css
index cee97eac754fe69f14962adf43c61c0cd03c4111..dab490489701ec1f77718d5cf17d8085fff3f596 100644
--- a/src/003-assets/CSS/slaveList.css
+++ b/src/003-assets/CSS/slaveList.css
@@ -15,11 +15,6 @@ span.freeAssignment {
font-weight: bold;
}
-/* Slave Summary Item */
-.ssi {
- margin-right: 0.25em;
-}
-
/* Slave Summary Block */
.ssb {
margin-right: 2em;
diff --git a/src/events/RESS/moistPussy.js b/src/events/RESS/moistPussy.js
index bb5f9d8d825f7fba8c696e8ce57a494f970ad95b..7cda22b7ae5ff55b60bec651b8daa4edc739e999 100644
--- a/src/events/RESS/moistPussy.js
+++ b/src/events/RESS/moistPussy.js
@@ -51,7 +51,7 @@ App.Events.RESSMoistPussy = class RESSMoistPussy extends App.Events.BaseEvent {
} else {
t.push(`Despite ${his} weak libido, ${he}'s been a sex slave long enough that ${his} body knows that it may be called upon to render sexual service soon.`);
}
- t.push(`he consequences of the special qualities of ${his} womanhood soon become apparent.`);
+ t.push(`The consequences of the special qualities of ${his} womanhood soon become apparent.`);
App.Events.addParagraph(node, t);
t = [];
diff --git a/src/js/slaveSummaryHelpers.js b/src/js/slaveSummaryHelpers.js
index 19630f896b9cf5fcf50033575d496104d3ef9afb..9cf5433d3d6e0da4564cba348d6ac72c80528d86 100644
--- a/src/js/slaveSummaryHelpers.js
+++ b/src/js/slaveSummaryHelpers.js
@@ -31,12 +31,11 @@ App.UI.SlaveSummaryImpl = function() {
*/
function makeSpan(container, text, classNames, stdDecor = false, value) {
let r = document.createElement("span");
- r.classList.add("ssi");
_addClassNames(r, classNames);
if (value != undefined && V.summaryStats) { /* eslint-disable-line eqeqeq */
text += `[${value}]`;
}
- r.textContent = stdDecor ? `${capFirstChar(text)}.` : text;
+ r.textContent = stdDecor ? `${capFirstChar(text)}. ` : text + ' ';
if (container) {
container.appendChild(r);
}
diff --git a/src/npc/interaction/fAbuse.tw b/src/npc/interaction/fAbuse.tw
index 3576b3642a3f38bab98acd39ecb32b7edf812c50..34bec7207e359d2f668dc1736df19e1a53c97f16 100644
--- a/src/npc/interaction/fAbuse.tw
+++ b/src/npc/interaction/fAbuse.tw
@@ -126,7 +126,7 @@
<<case "attractive lingerie">>
$He almost tears $his delicate lingerie in $his haste to avoid punishment.
<<case "a succubus outfit">>
- <<if !["a corset", "an extreme corest"].includes(getSlave($AS).bellyAccessory)>>
+ <<if ["a corset", "an extreme corset"].includes(getSlave($AS).bellyAccessory)>>
$He struggles with $his leather corset.
<<else>>
Panic sets in as $he hastily sheds what's left of $his outfit.
@@ -302,7 +302,7 @@
<<case "slutty jewelry">>
$He hurriedly strips fine jewelry from $his neck, wrist<<if hasBothArms(getSlave($AS))>>s<</if>> and ankle<<if hasBothLegs(getSlave($AS))>>s<</if>>.
<<case "a courtesan dress">>
- <<if !["a corset", "an extreme corest"].includes(getSlave($AS).bellyAccessory)>>
+ <<if ["a corset", "an extreme corset"].includes(getSlave($AS).bellyAccessory)>>
$His fingers fumble desperately with the straps of $his corset, knowing there is still a lot of dress left to remove after it.
<<else>>
Panic sets in as $he realizes just how much dress is left to remove. In $his haste, $he hooks a sleeve with $his foot and falls flat, exposing $his bare ass.
@@ -313,10 +313,10 @@
<</if>>
<</if>>
-<<if (getSlave($AS).fetish == "masochist") && (getSlave($AS).fetishKnown == 1) && (getSlave($AS).fetishStrength > 60)>>
- $He seems to be a bit expectant of what is to come.
-<<elseif (getSlave($AS).fetish == "masochist") && (getSlave($AS).fetishKnown == 1) && (getSlave($AS).fetishStrength > 95)>>
+<<if (getSlave($AS).fetish == "masochist") && (getSlave($AS).fetishKnown == 1) && (getSlave($AS).fetishStrength > 95)>>
The slap seems to have excited $him, seeing $his hard nipples and wet pussy, and $his eyes practically beg for more.
+<<elseif (getSlave($AS).fetish == "masochist") && (getSlave($AS).fetishKnown == 1) && (getSlave($AS).fetishStrength > 60)>>
+ $He seems to be a bit expectant of what is to come.
<</if>>
<<if ($PC.dick != 0)>>
@@ -324,10 +324,10 @@
<<else>>
<<if hasAnyArms(getSlave($AS)) && (getSlave($AS).clothes !== "no clothing")>>While $he strips, you<<else>>You<</if>> don a cruelly large strap-on, earning
<</if>>
-<<if (getSlave($AS).fetish == "masochist") && (getSlave($AS).fetishKnown == 1) && (getSlave($AS).fetishStrength > 60)>>
- a shy look
-<<elseif (getSlave($AS).fetish == "masochist") && (getSlave($AS).fetishKnown == 1) && (getSlave($AS).fetishStrength > 95)>>
+<<if (getSlave($AS).fetish == "masochist") && (getSlave($AS).fetishKnown == 1) && (getSlave($AS).fetishStrength > 95)>>
a sultry look
+<<elseif (getSlave($AS).fetish == "masochist") && (getSlave($AS).fetishKnown == 1) && (getSlave($AS).fetishStrength > 60)>>
+ a shy look
<<else>>
a frightened glance
<</if>>