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 bbaee44babb1af4a845284118b9112eaf7a0a492..fd4791e0d7b58a8b2ecc51650d17a8b97f477b11 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); }