diff --git a/README.md b/README.md index c0ec961ee0da5790afa4846358cf05894b22ff15..b33a96a73bd2b9a825f399b67dbc87dcf98cfb70 100644 --- a/README.md +++ b/README.md @@ -31,12 +31,12 @@ How to mod (basic doc): 1. All sources now in the src subdir, in separate files. 1 passage = 1 file. 2. Special files and dir's: - - src/config - configuration of the story is here. - - src/config/start.tw - contains list of .tw passage files, regenerated automatic, by building scripts. Do not change by hands. (original passage Start from pregmod renamed and moved to src/events/intro/introSummary.tw) + - src/config - configuration of the story is here. + - src/config/start.tw - contains list of .tw passage files, regenerated automatic, by building scripts. Do not change by hands. (original passage Start from pregmod renamed and moved to src/events/intro/introSummary.tw) - src/js/storyJS.tw - special passage with [script] tag - contain all native JavaScript from pregmod. - devTools/tweeGo/targets/sugarcube-2/userlib.js - on original FC JS moved here (I deleted it after moving JS to storyJS.tw). Compare to storyJS.tw but do not copy file here. May conflict with src/js/storyJS.tw if copied. - - src/pregmod - I put all pregmod-only passages here. - - .gitignore - special file for git - to ignore some files. For example - compilation results. + - src/pregmod - I put all pregmod-only passages here. + - .gitignore - special file for git - to ignore some files. For example - compilation results. 3. Compilation: diff --git a/devNotes/sugarcube stuff/sugarcube-fc-changes-2-24.0.patch b/devNotes/sugarcube stuff/sugarcube-fc-changes-2-24.0.patch index c7d32d1dc9a8bfdc584a7fd2b1636395b3a9b9e6..e862341c89fd58d67bc72c1e5217d6ac06f89992 100644 --- a/devNotes/sugarcube stuff/sugarcube-fc-changes-2-24.0.patch +++ b/devNotes/sugarcube stuff/sugarcube-fc-changes-2-24.0.patch @@ -2,65 +2,65 @@ diff -r cd5d732c8669 src/lib/jquery-plugins.js --- a/src/lib/jquery-plugins.js Fri Mar 09 07:43:39 2018 -0600 +++ b/src/lib/jquery-plugins.js Fri Jan 25 18:37:15 2019 +0100 @@ -37,6 +37,10 @@ - return function () { - const $this = jQuery(this); + return function () { + const $this = jQuery(this); + const dataPassage = $this.attr('data-passage'); + const initialDataPassage = window && window.SugarCube && window.SugarCube.State && window.SugarCube.State.passage; + const savedYOffset = window.pageYOffset; + - // Toggle "aria-pressed" status, if the attribute exists. - if ($this.is('[aria-pressed]')) { - $this.attr('aria-pressed', $this.attr('aria-pressed') === 'true' ? 'false' : 'true'); + // Toggle "aria-pressed" status, if the attribute exists. + if ($this.is('[aria-pressed]')) { + $this.attr('aria-pressed', $this.attr('aria-pressed') === 'true' ? 'false' : 'true'); @@ -44,6 +48,11 @@ - // Call the true handler. - fn.apply(this, arguments); + // Call the true handler. + fn.apply(this, arguments); + + const doJump = function(){ window.scrollTo(0, savedYOffset); } + if ( dataPassage && (window.lastDataPassageLink === dataPassage || initialDataPassage === dataPassage)) + doJump(); + window.lastDataPassageLink = dataPassage; - }; - } + }; + } diff -r cd5d732c8669 src/lib/simplestore/adapters/webstorage.js --- a/src/lib/simplestore/adapters/webstorage.js Fri Mar 09 07:43:39 2018 -0600 +++ b/src/lib/simplestore/adapters/webstorage.js Fri Jan 25 18:37:15 2019 +0100 @@ -192,11 +192,11 @@ - } + } - static _serialize(obj) { + static _serialize(obj) { - return LZString.compressToUTF16(JSON.stringify(obj)); + return JSON.stringify(obj); - } + } - static _deserialize(str) { + static _deserialize(str) { - return JSON.parse(LZString.decompressFromUTF16(str)); + return JSON.parse((!str || str[0] == "{") ? str : LZString.decompressFromUTF16(str)); - } - } + } + } diff -r cd5d732c8669 src/state.js --- a/src/state.js Fri Mar 09 07:43:39 2018 -0600 +++ b/src/state.js Fri Jan 25 18:37:15 2019 +0100 @@ -104,7 +104,7 @@ - } + } - if (_expired.length > 0) { + if (_expired.length > 0) { - stateObj.expired = [..._expired]; + stateObj.expired = []; - } + } - if (_prng !== null) { + if (_prng !== null) { diff -r cd5d732c8669 src/ui.js --- a/src/ui.js Fri Mar 09 07:43:39 2018 -0600 +++ b/src/ui.js Fri Jan 25 18:37:15 2019 +0100 @@ -337,6 +337,7 @@ - if (saves.slots[i]) { - // Add the load button. - $tdLoad.append( + if (saves.slots[i]) { + // Add the load button. + $tdLoad.append( + createButton('save', 'ui-close', L10n.get('savesLabelSave'), i, Save.slots.save), - createButton('load', 'ui-close', L10n.get('savesLabelLoad'), i, slot => { - jQuery(document).one(':dialogclose', () => Save.slots.load(slot)); - }) + createButton('load', 'ui-close', L10n.get('savesLabelLoad'), i, slot => { + jQuery(document).one(':dialogclose', () => Save.slots.load(slot)); + }) diff --git a/devNotes/sugarcube stuff/sugarcube-fc-changes.patch b/devNotes/sugarcube stuff/sugarcube-fc-changes.patch index 585ab60823a7297f404bc940a4fb95dbc68199d3..c34da2f36d0ec05dba22ae7e126b2adcc37f808e 100644 --- a/devNotes/sugarcube stuff/sugarcube-fc-changes.patch +++ b/devNotes/sugarcube stuff/sugarcube-fc-changes.patch @@ -2,8 +2,8 @@ diff -r df721eb4cd55 src/lib/jquery-plugins.js --- a/src/lib/jquery-plugins.js Sun Dec 16 04:39:00 2018 -0600 +++ b/src/lib/jquery-plugins.js Fri Jan 25 00:54:01 2019 +0100 @@ -43,14 +43,9 @@ - return function () { - const $this = jQuery(this); + return function () { + const $this = jQuery(this); - // Exit if the element is disabled. - // @@ -17,57 +17,57 @@ diff -r df721eb4cd55 src/lib/jquery-plugins.js + const initialDataPassage = window && window.SugarCube && window.SugarCube.State && window.SugarCube.State.passage; + const savedYOffset = window.pageYOffset; - // Toggle "aria-pressed" status, if the attribute exists. - if ($this.is('[aria-pressed]')) { + // Toggle "aria-pressed" status, if the attribute exists. + if ($this.is('[aria-pressed]')) { @@ -59,6 +54,11 @@ - // Call the true handler. - fn.apply(this, arguments); + // Call the true handler. + fn.apply(this, arguments); + + const doJump = function(){ window.scrollTo(0, savedYOffset); } + if ( dataPassage && (window.lastDataPassageLink === dataPassage || initialDataPassage === dataPassage)) + doJump(); + window.lastDataPassageLink = dataPassage; - }; - } + }; + } diff -r df721eb4cd55 src/lib/simplestore/adapters/webstorage.js --- a/src/lib/simplestore/adapters/webstorage.js Sun Dec 16 04:39:00 2018 -0600 +++ b/src/lib/simplestore/adapters/webstorage.js Fri Jan 25 00:54:01 2019 +0100 @@ -189,11 +189,11 @@ - } + } - static _serialize(obj) { + static _serialize(obj) { - return LZString.compressToUTF16(JSON.stringify(obj)); + return JSON.stringify(obj); - } + } - static _deserialize(str) { + static _deserialize(str) { - return JSON.parse(LZString.decompressFromUTF16(str)); + return JSON.parse((!str || str[0] == "{") ? str : LZString.decompressFromUTF16(str)); - } - } + } + } diff -r df721eb4cd55 src/state.js --- a/src/state.js Sun Dec 16 04:39:00 2018 -0600 +++ b/src/state.js Fri Jan 25 00:54:01 2019 +0100 @@ -104,7 +104,7 @@ - } + } - if (_expired.length > 0) { + if (_expired.length > 0) { - stateObj.expired = [..._expired]; + stateObj.expired = []; - } + } - if (_prng !== null) { + if (_prng !== null) { diff -r df721eb4cd55 src/ui.js --- a/src/ui.js Sun Dec 16 04:39:00 2018 -0600 +++ b/src/ui.js Fri Jan 25 00:54:01 2019 +0100 @@ -334,6 +334,7 @@ - if (saves.slots[i]) { - // Add the load button. - $tdLoad.append( + if (saves.slots[i]) { + // Add the load button. + $tdLoad.append( + createButton('save', 'ui-close', L10n.get('savesLabelSave'), i, Save.slots.save), - createButton('load', 'ui-close', L10n.get('savesLabelLoad'), i, slot => { - jQuery(document).one(':dialogclose', () => Save.slots.load(slot)); - }) + createButton('load', 'ui-close', L10n.get('savesLabelLoad'), i, slot => { + jQuery(document).one(':dialogclose', () => Save.slots.load(slot)); + }) diff --git a/devTools/sugarcube.d.ts b/devTools/sugarcube.d.ts index b7a10f44290810d8e3bd2453cdd2d7445d3d27d8..8ecc4ea5dbeb387749a9c2ab70e58e103a97eb0b 100644 --- a/devTools/sugarcube.d.ts +++ b/devTools/sugarcube.d.ts @@ -204,7 +204,7 @@ declare namespace SugarCubeLib { * Config.addVisitedLinkClass = true; * // An example style: (Twine 2: goes in Story Stylesheet; Twine 1/Twee: goes in a stylesheet-tagged passage) * .link-visited { - * color: purple; + * color: purple; * } */ addVisitedLinkClass: boolean; @@ -269,8 +269,8 @@ declare namespace SugarCubeLib { * @param targets The DOM element(s) to attach the handler to—may be either an HTMLElement object, a jQuery object, * or a jQuery-style selector set. * @param options he options object; the currently understood properties are: - * top: Top y-coordinate of the dialog (default: 50; in pixels, but without the unit). - * opacity: Opacity of the overlay (default: 0.8). + * top: Top y-coordinate of the dialog (default: 50; in pixels, but without the unit). + * opacity: Opacity of the overlay (default: 0.8). * @param tartFn The function to execute at the start of Dialog.addClickHandler(). This is commonly used to setup * the dialog. * @param doneFn The function to execute at the end of Dialog.addClickHandler(). @@ -322,11 +322,11 @@ declare namespace SugarCubeLib { * @since 2.0.0 * @example * if (Dialog.isOpen()) { - * // code to execute if the dialog is open... + * // code to execute if the dialog is open... * } * @example * if (Dialog.isOpen("saves")) { - * // code to execute if the Saves dialog is open + * // code to execute if the Saves dialog is open * } */ isOpen(classNames?: string): boolean; @@ -389,10 +389,10 @@ declare namespace SugarCubeLib { /** * Returns the current state of the engine ("idle", "playing", "rendering"). * States: - * "idle": The engine is idle, awaiting the triggering of passage navigation—the default state. - * "playing": Passage navigation has been triggered and a turn is being processed. - * "rendering": The incoming passage is being rendered and added to the page—takes place during turn processing, - * so implies "playing". + * "idle": The engine is idle, awaiting the triggering of passage navigation—the default state. + * "playing": Passage navigation has been triggered and a turn is being processed. + * "rendering": The incoming passage is being rendered and added to the page—takes place during turn processing, + * so implies "playing". * @since 2.7.0 */ state: string; @@ -635,24 +635,24 @@ declare namespace SugarCubeLib { * @example * // Example of a very simple/naive <<if>>/<<elseif>>/<<else>> macro implementation. * Macro.add('if', { - * skipArgs: true, - * tags: ['elseif', 'else'], - * handler: function () { - * try { - * for (var i = 0, len = this.payload.length; i < len; ++i) { - * if ( - * this.payload[i].name === 'else' || - * !!Scripting.evalJavaScript(this.payload[i].args.full) - * ) { - * jQuery(this.output).wiki(this.payload[i].contents); - * break; - * } - * } - * } - * catch (ex) { - * return this.error('bad conditional expression: ' + ex.message); - * } - * } + * skipArgs: true, + * tags: ['elseif', 'else'], + * handler: function () { + * try { + * for (var i = 0, len = this.payload.length; i < len; ++i) { + * if ( + * this.payload[i].name === 'else' || + * !!Scripting.evalJavaScript(this.payload[i].args.full) + * ) { + * jQuery(this.output).wiki(this.payload[i].contents); + * break; + * } + * } + * } + * catch (ex) { + * return this.error('bad conditional expression: ' + ex.message); + * } + * } * }); */ add(name: string | string[], @@ -1519,8 +1519,8 @@ declare global { * // Use the returned Promise later on to ensure that the script has been fully * // loaded before executing dependent code * setup.aScriptImport - * .then(function () { - * // Code that depends on the script goes here. + * .then(function () { + * // Code that depends on the script goes here. * }) * .catch(function (err) { * // There was an error loading the script, log it to the console. @@ -1542,29 +1542,29 @@ declare global { * @example <caption>Basic usage</caption> * // Import all stylesheets concurrently * importStyles( - * "https://somesite/a/path/a.css", - * "https://somesite/a/path/b.css", - * "https://somesite/a/path/c.css", - * "https://somesite/a/path/d.css" + * "https://somesite/a/path/a.css", + * "https://somesite/a/path/b.css", + * "https://somesite/a/path/c.css", + * "https://somesite/a/path/d.css" * ); * * // Import all stylesheets sequentially * importStyles([ - * "https://somesite/a/path/a.css", - * "https://somesite/a/path/b.css", - * "https://somesite/a/path/c.css", - * "https://somesite/a/path/d.css" + * "https://somesite/a/path/a.css", + * "https://somesite/a/path/b.css", + * "https://somesite/a/path/c.css", + * "https://somesite/a/path/d.css" * ]); * * // Import stylesheets a.css, b.css, and the c.css/d.css group concurrently, * // while importing c.css and d.css sequentially relative to each other * importStyles( - * "https://somesite/a/path/a.css", - * "https://somesite/a/path/b.css", - * [ - * "https://somesite/a/path/c.css", - * "https://somesite/a/path/d.css" - * ] + * "https://somesite/a/path/a.css", + * "https://somesite/a/path/b.css", + * [ + * "https://somesite/a/path/c.css", + * "https://somesite/a/path/d.css" + * ] * ); * * @example <caption>Basic usage with the returned Promise object</caption> @@ -1574,9 +1574,9 @@ declare global { * // Import a stylesheet while using the returned Promise to ensure that the * // stylesheet has been fully loaded before unlocking the loading screen * importStyles("https://somesite/a/path/a.css") - * .then(function () { + * .then(function () { * // The stylesheet has been loaded, release the loading screen lock. - * LoadScreen.unlock(lsLockId); + * LoadScreen.unlock(lsLockId); * }) * .catch(function (err) { * // There was an error loading the stylesheet, log it to the console. @@ -1688,12 +1688,12 @@ declare global { * In the darkness, something wicked this way comes. Quickly! Do you \ * <<link "try to run back into the light">> * <<if time() lt 5000>> - * /% The player clicked the link in under 5s, so they escape %/ - * <<goto "Well lit passageway">> + * /% The player clicked the link in under 5s, so they escape %/ + * <<goto "Well lit passageway">> * <<else>> - * /% Else, they're eaten by a grue %/ - * <<goto "Eaten by a grue">> - * <</if>> + * /% Else, they're eaten by a grue %/ + * <<goto "Eaten by a grue">> + * <</if>> * <</link>> \ * or [[stand your ground|Eaten by a grue]]? */ @@ -1812,7 +1812,7 @@ declare global { * // and now $fruits is ["Apples", "Oranges"] * * $fruits.deleteWith(function (val) { - * return val.startsWith("Ap"); + * return val.startsWith("Ap"); * }) // Returns ["Apples", "Apricots"]; * // and now $fruits is ["Oranges"] * diff --git a/resources/vector/outfit/ball gag fore.svg b/resources/vector/outfit/ball gag fore.svg index cee02bd60401faa681a61ec81fd3f6fcb2ec41e3..78cb74192280ba95ae781dd59733c006f1314f5c 100644 --- a/resources/vector/outfit/ball gag fore.svg +++ b/resources/vector/outfit/ball gag fore.svg @@ -15,7 +15,7 @@ <g id="Gag"> <path id="XMLID_867_" inkscape:connector-curvature="0" class="st0" d="M498,167.3c2.6,3.9,7.6,0.9,14,5.1c7.8,5,8.1,14,13.2,14 c1.7,0,3.5-1,4.3-2.4c4.5-7.7-18.1-34.7-27.5-31.1C497.6,154.6,495.3,163.1,498,167.3z"/> - <polygon id="XMLID_892_" class="st1" points="541.3,165 489,163.9 486.4,157.1 545.1,157.1 "/> + <polygon id="XMLID_892_" class="st1" points="541.3,165 489,163.9 486.4,157.1 545.1,157.1 "/> <ellipse id="XMLID_893_" class="st2" cx="502.8" cy="161.1" rx="7.6" ry="8.7"/> </g> </svg> diff --git a/resources/vector/outfit/cruel retirement counter.svg b/resources/vector/outfit/cruel retirement counter.svg index 1be1c7994179eb951591c58af432591fcc20b11a..0a9a5bafa0e7160d3b11a36681ad0578e7e13400 100644 --- a/resources/vector/outfit/cruel retirement counter.svg +++ b/resources/vector/outfit/cruel retirement counter.svg @@ -21,7 +21,7 @@ </g> </g> <g> - <polygon points="523.1,193.8 516.9,193.8 516.4,190.9 523.6,190.9 "/> + <polygon points="523.1,193.8 516.9,193.8 516.4,190.9 523.6,190.9 "/> <path class="st0" d="M523.1,191.4v2.4H517v-2.4H523.1 M523.6,190.9l-7.3-0.1l0.2,3h7.1V190.9L523.6,190.9z"/> </g> <text transform="matrix(1 0 0 1 517.1331 193.5328)" class="st1 st2 st3">8888</text> diff --git a/resources/vector/outfit/dildo gag.svg b/resources/vector/outfit/dildo gag.svg index 83369c4c4b26f710105b25fbece20a038cc16266..ddff2ca5ce452703fa96bd54fdbf15f6e2d9e5bb 100644 --- a/resources/vector/outfit/dildo gag.svg +++ b/resources/vector/outfit/dildo gag.svg @@ -10,7 +10,7 @@ <g id="Gag"> <path id="XMLID_3_" class="st0" d="M498,167.3c2.6,3.9,7.6,0.9,14,5.1c7.8,5,8.1,14,13.2,14c1.7,0,3.5-1,4.3-2.4 c4.5-7.7-18.1-34.7-27.5-31.1C497.6,154.6,495.3,163.1,498,167.3z"/> - <polygon id="XMLID_2_" class="st1" points="486.4,157.1 545.1,157.1 541.3,165 489,163.9 "/> + <polygon id="XMLID_2_" class="st1" points="486.4,157.1 545.1,157.1 541.3,165 489,163.9 "/> <ellipse id="XMLID_309_" class="st2" cx="502.8" cy="161.1" rx="7.6" ry="8.7"/> </g> </svg> diff --git a/resources/vector/outfit/gag.svg b/resources/vector/outfit/gag.svg index 83369c4c4b26f710105b25fbece20a038cc16266..ddff2ca5ce452703fa96bd54fdbf15f6e2d9e5bb 100644 --- a/resources/vector/outfit/gag.svg +++ b/resources/vector/outfit/gag.svg @@ -10,7 +10,7 @@ <g id="Gag"> <path id="XMLID_3_" class="st0" d="M498,167.3c2.6,3.9,7.6,0.9,14,5.1c7.8,5,8.1,14,13.2,14c1.7,0,3.5-1,4.3-2.4 c4.5-7.7-18.1-34.7-27.5-31.1C497.6,154.6,495.3,163.1,498,167.3z"/> - <polygon id="XMLID_2_" class="st1" points="486.4,157.1 545.1,157.1 541.3,165 489,163.9 "/> + <polygon id="XMLID_2_" class="st1" points="486.4,157.1 545.1,157.1 541.3,165 489,163.9 "/> <ellipse id="XMLID_309_" class="st2" cx="502.8" cy="161.1" rx="7.6" ry="8.7"/> </g> </svg> diff --git a/resources/vector/outfit/leather with cowbell.svg b/resources/vector/outfit/leather with cowbell.svg index 84b437e6fda9bcc4c4b22a98f52e3be5be5e2859..814b66e8eac9e64b4a83abae4abdcc2a5e9201fa 100644 --- a/resources/vector/outfit/leather with cowbell.svg +++ b/resources/vector/outfit/leather with cowbell.svg @@ -15,10 +15,10 @@ c-5.2,0-7.1-1.8-7.6-2.5c-0.1-0.1-0.1-0.3-0.1-0.4l0.9-3.4C513.2,189,513.5,188.9,513.8,189z"/> </g> <g id="Layer_13"> - <polygon points="530.4,221.7 507.9,220.9 504.2,215.8 514.5,198 524.6,199 "/> + <polygon points="530.4,221.7 507.9,220.9 504.2,215.8 514.5,198 524.6,199 "/> <path d="M522.8,204.6L516,204l1.1-11.5l6.8,0.7L522.8,204.6z M517.2,202.8l4.5,0.4l0.9-9l-4.5-0.4L517.2,202.8z"/> <path class="st0" d="M522.3,203.5l-7-0.7l1-10.7l7,0.7L522.3,203.5z M516.6,201.8l4.6,0.4l0.8-8.3l-4.6-0.4L516.6,201.8z"/> - <polygon class="st0" points="528.1,216.8 504.2,215.8 514.4,198 524,198.9 "/> + <polygon class="st0" points="528.1,216.8 504.2,215.8 514.4,198 524,198.9 "/> <line class="st1" x1="520.1" y1="191.4" x2="519.8" y2="194.8"/> </g> </g> diff --git a/resources/vector/outfit/nice retirement counter.svg b/resources/vector/outfit/nice retirement counter.svg index 19260feab80ba2168bbb40de2c3300501db98cde..ca5005bd944a3593286ef021a1263cee98d7b385 100644 --- a/resources/vector/outfit/nice retirement counter.svg +++ b/resources/vector/outfit/nice retirement counter.svg @@ -49,7 +49,7 @@ <path d="M534.3,193.3c-0.2,0.2-0.3,0.5-0.6,0.9c-0.2,0.4-0.4,0.7-0.5,0.9c0.2-0.2,0.3-0.5,0.6-0.9l0,0 C534,193.9,534.2,193.5,534.3,193.3z"/> <g> - <polygon points="521,216.1 513.7,215.7 513.9,212.1 521.2,212.6 "/> + <polygon points="521,216.1 513.7,215.7 513.9,212.1 521.2,212.6 "/> <path d="M514.4,212.7l6.3,0.4l-0.1,2.5l-6.3-0.4L514.4,212.7 M513.9,212.1l-0.2,3.6l7.3,0.4l0.2-3.6L513.9,212.1L513.9,212.1z"/> </g> <g> diff --git a/resources/vector/outfit/stylish leather.svg b/resources/vector/outfit/stylish leather.svg index 91dc359df441f647dbc59b31e5f64e4b5ac38c95..d73b6d7d4615c98f672bed4783e80e9a5cb8a068 100644 --- a/resources/vector/outfit/stylish leather.svg +++ b/resources/vector/outfit/stylish leather.svg @@ -14,7 +14,7 @@ c-5.2,0-7.1-1.8-7.6-2.5c-0.1-0.1-0.1-0.3-0.1-0.4l0.9-3.4C513.1,188.8,513.4,188.6,513.7,188.8z"/> </g> <polygon class="st0" points="522.9,196.2 517.5,196.2 517.5,189.2 522.9,189.2 522.9,190.5 521.9,190.6 521.9,190.1 518.5,190.1 - 518.5,195.3 521.9,195.3 521.9,194.7 522.9,194.7 "/> + 518.5,195.3 521.9,195.3 521.9,194.7 522.9,194.7 "/> <rect x="517.4" y="191.4" transform="matrix(3.349746e-02 -0.9994 0.9994 3.349746e-02 307.9673 703.8356)" class="st0" width="1" height="2.5"/> </g> diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt index 477a44f14ee1bf6953d39b5505fe0d972ad7dddb..1af42e954557b838aa58704757de0d6ef98c8f3f 100644 --- a/slave variables documentation - Pregmod.txt +++ b/slave variables documentation - Pregmod.txt @@ -3631,10 +3631,10 @@ Once finished, add it into "customSlavesDatabase". To test if your slave is functioning, start up a normal game, swap to cheat mode, max your rep, and view other slaveowner's stock in the slave market. If you cannot find your slave in the list, and you didn't start the game with your slave, you should double check your slave for errors. If a slave named "Blank" is present, then you likely messed up. Once you find your slave, check their description to make sure it is correct. If it is not, you messed up somewhere in setting them up. -@@.green; - something good or health/libido/attraction gain -@@.red; - something bad or health/libido/attraction loss +@@.green; - something good or health/libido/attraction gain +@@.red; - something bad or health/libido/attraction loss @@.hotpink; - devotion gain -@@.mediumorchid; - devotion loss +@@.mediumorchid; - devotion loss @@.mediumaquamarine; - trust gain @@.gold; - trust loss @@.coral; - notable change and fetish loss @@ -3732,8 +3732,8 @@ or Property list: - type - name of species. Should math slave.ovaType - normalOvaMin - normal/base ova count on ovulation (minimal) + type - name of species. Should math slave.ovaType + normalOvaMin - normal/base ova count on ovulation (minimal) normalOvaMax - normal/base ova count on ovulation (maximal) normalBirth - typical normal pregnancy length in weeks minLiveBirth - typical weeks that guarantee at least 90% chance to fetus survival if normal birth occur. diff --git a/src/SecExp/attackHandler.tw b/src/SecExp/attackHandler.tw index 75abf368f29948f0bf93ec5b605b191cca57f4af..26bc7714d21d1db40fc983c89b44cd08aaf36e36 100644 --- a/src/SecExp/attackHandler.tw +++ b/src/SecExp/attackHandler.tw @@ -77,7 +77,7 @@ <<set _enemyHp = 0>> <<set _enemyBaseHp = 0>> <<set _woundChance = 5>> /* leader has a base chance of 5% to get wounded */ - <<set _tacChance = 0.5>> /* by default tactics have a 50% chance of succeeding */ + <<set _tacChance = 0.5>> /* by default tactics have a 50% chance of succeeding */ <<set _atkMod = 1>> <<set _defMod = 1>> <<set _militiaMod = 1>> diff --git a/src/SecExp/rebellionGenerator.tw b/src/SecExp/rebellionGenerator.tw index 2ea126c09af5fa316d5d86871bc4a8d0d5108e3e..a8b7d30003150fa013f80419b69d157f20eb573e 100644 --- a/src/SecExp/rebellionGenerator.tw +++ b/src/SecExp/rebellionGenerator.tw @@ -131,7 +131,7 @@ <<if _slave < 0>> <<set _slave = 0>> <<elseif _slave >= 95>> - <<set _slave = 95>> /* there's always a min 5% chance nothing happens */ + <<set _slave = 95>> /* there's always a min 5% chance nothing happens */ <</if>> <<if _citizen < 0>> <<set _citizen = 0>> diff --git a/src/SecExp/rebellionHandler.tw b/src/SecExp/rebellionHandler.tw index 57ced876ffcaab068dceaa35f4f295e1585f1af8..da997bc75dec166a173143354bc99a878f89b66b 100644 --- a/src/SecExp/rebellionHandler.tw +++ b/src/SecExp/rebellionHandler.tw @@ -15,7 +15,7 @@ <<set _enemyHp = 0>> <<set _enemyBaseHp = 0>> <<set _woundChance = 5>> /* leader has a base chance of 5% to get wounded */ -<<set _tacChance = 0.5>> /* by default tactics have a 50% chance of succeeding */ +<<set _tacChance = 0.5>> /* by default tactics have a 50% chance of succeeding */ <<set _expBonus = 0>> <<set _loyaltyBonus = 0>> <<set _irregularMod = 0>> diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw index ea48f6516a55580eb86b73de6b0ec3ce442dfad4..97c9a88b5ef34af509e42585b56aa6b29d68f1f1 100644 --- a/src/events/intro/introSummary.tw +++ b/src/events/intro/introSummary.tw @@ -320,7 +320,7 @@ __''Slave age settings''__ <<option 0 "Normal mode">> Randomly generated slaves will generate normally. <<option 1 "Loli mode" "$minimumSlaveAge = 5">> - Nearly all randomly generated slaves will be under the age of 18, although custom slaves and slaves related to specific events may be older. + Nearly all randomly generated slaves will be under the age of 18, although custom slaves and slaves related to specific events may be older. <</options>> <br> @@ -358,7 +358,7 @@ __''Slave age settings''__ <<option 0 "Disable precocious puberty">> Girls ''cannot'' experience precocious puberty. (Unable to become pregnant or inseminate others younger than normal puberty age - $fertilityAge). <<option 1 "Enable precocious puberty">> - Girls ''can'' experience precocious puberty. (Under certain conditions they can become pregnant or inseminate others younger then normal age - $fertilityAge, though they may also experience delayed puberty). + Girls ''can'' experience precocious puberty. (Under certain conditions they can become pregnant or inseminate others younger then normal age - $fertilityAge, though they may also experience delayed puberty). <</options>> <br><br> @@ -368,14 +368,14 @@ __''Slave age effects''__ <<option 0 "Disable age penalties">> Girls ''will not'' receive job and career penalties due to age. <<option 1 "Enable age penalties">> - Girls ''will'' receive job and career penalties due to age. + Girls ''will'' receive job and career penalties due to age. <</options>> <br> <<options $loliGrow>> <<option 0 "Disable Growth">> Children ''will'' grow as they age. <<option 1 "Enable Growth">> - Children ''will not'' grow as they age. + Children ''will not'' grow as they age. <</options>> <br><br> @@ -409,9 +409,9 @@ Should you be able to surgically attach a penis to your female slaves and starti <br> <<options $seePreg>> <<option 0 "Disable">> - Most pregnancy related content is ''disabled''. + Most pregnancy related content is ''disabled''. <<option 1 "Enable">> - Pregnancy related content is ''enabled''. + Pregnancy related content is ''enabled''. <</options>> <br> @@ -426,9 +426,9 @@ Should you be able to surgically attach a penis to your female slaves and starti <br> <<options $adamPrinciple>> <<option 0 "Disable">> - XX slaves only fathering daughters is ''disabled''. + XX slaves only fathering daughters is ''disabled''. <<option 1 "Enable">> - XX slaves only fathering daughters is ''enabled''. + XX slaves only fathering daughters is ''enabled''. <</options>> <</if>> diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index 1241b29310c51c3e7184a200c587e78a60d41f0e..de1b06004458e671148e4897aadc79abdcd29fcf 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -618,7 +618,7 @@ You should have received a copy of the GNU General Public License along with thi <<set $nurseryNannies = 0>> /* counts the number of nannies the nursery can support */ <<set $nurseryBabies = 0>> /* counts the number of children currently in the nursery */ <<set $nurserySlaves = 0>> /* counts the number of nannies currently assigned to the nursery */ -<<set $MatronInfluence = 0>> /* check for whether the children are influenced by the Matron */ +<<set $MatronInfluence = 0>> /* check for whether the children are influenced by the Matron */ <<set $nannyInfluence = 0>> /* check for whether the children are influenced by the nannies */ <<set $nurseryDecoration = "standard">> <<set $nurseryWeight = 0>> diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js index 4bcb55d3cf9b4ae203c1a4ef6dd5013ac3166d59..6e7533c7acf237879bcf9ea025ff04b28a347db9 100644 --- a/src/js/SlaveState.js +++ b/src/js/SlaveState.js @@ -1506,7 +1506,7 @@ App.Entity.SlaveState = class SlaveState { */ this.clothes = "no clothing"; /** - * may accept strings, use at own risk "none" + * may accept strings, use at own risk "none" * * "ancient Egyptian" * * "cruel retirement counter" * * "uncomfortable leather" diff --git a/src/pregmod/eliteTakeOverFight.tw b/src/pregmod/eliteTakeOverFight.tw index 9cbe19a5fc857004d4931a906b11e4afe362980e..3eb88608075b9ace69981900325b8d46465f61ac 100644 --- a/src/pregmod/eliteTakeOverFight.tw +++ b/src/pregmod/eliteTakeOverFight.tw @@ -204,11 +204,11 @@ /* if the player has managed to make enough damage to the elite and the rep is high enough the citizens will come to save the PC */ /* this is to give reason to exist for the "enrage" and "last stand" option */ -/* result */ +/* result */ /* $eliteFate: */ -/* killed = 0 */ -/* enslaved = 1 */ -/* had fun (and enslaved) = 2 */ +/* killed = 0 */ +/* enslaved = 1 */ +/* had fun (and enslaved) = 2 */ <<if $BodyguardHasSucessfullyRecivedSignal == 1>> <<setLocalPronouns $Bodyguard>> <<run Enunciate($Bodyguard)>> diff --git a/src/pregmod/manageCorporation.tw b/src/pregmod/manageCorporation.tw index 412cbe1fca2bb8bab4dffec43a61b3b11fe9693f..5e2e6585b1571ff149a43adad98da46d7b34cdfb 100644 --- a/src/pregmod/manageCorporation.tw +++ b/src/pregmod/manageCorporation.tw @@ -249,7 +249,7 @@ __Division Management__ $corpDivExtra = 0, $corpDivExtraDev = 0>> <<unset $corpDivExtraSlaves>> - <<goto "Manage Corporation">> + <<goto "Manage Corporation">> <</link>> <</if>> <br> @@ -858,7 +858,7 @@ __Division Management__ <<if $corpDivTrainDev > 20>> <<if $corpDivTrainSlaves >= $corpDivTrainDev - 10>> <<set _corpDivTrainSlavesSell = $corpDivTrainSlaves - ($corpDivTrainDev - 10)>> - | [[Downsize x10|Manage Corporation][$corpDivTrainDev -= 10, $corpCash += 200000 + 15 * _corpDivTrainSlavesSell * menialSlaveCost(), $corpDivTrainSlaves -= _corpDivTrainSlavesSell, $corpAssetsDev -= 200000]] + | [[Downsize x10|Manage Corporation][$corpDivTrainDev -= 10, $corpCash += 200000 + 15 * _corpDivTrainSlavesSell * menialSlaveCost(), $corpDivTrainSlaves -= _corpDivTrainSlavesSell, $corpAssetsDev -= 200000]] <<else>> | [[Downsize x10|Manage Corporation][$corpDivTrainDev -= 10, $corpCash += 200000, $corpAssetsDev -= 200000]] <</if>> @@ -877,7 +877,7 @@ __Division Management__ <<if $corpDivTrainDev > 20>> <<if $corpDivTrainSlaves >= $corpDivTrainDev - 10>> <<set _corpDivTrainSlavesSell = $corpDivTrainSlaves - ($corpDivTrainDev - 10)>> - | [[Downsize x10|Manage Corporation][$corpDivTrainDev -= 10, $corpCash += 200000 + 23 * _corpDivTrainSlavesSell * menialSlaveCost(), $corpDivTrainSlaves -= _corpDivTrainSlavesSell, $corpAssetsDev -= 200000]] + | [[Downsize x10|Manage Corporation][$corpDivTrainDev -= 10, $corpCash += 200000 + 23 * _corpDivTrainSlavesSell * menialSlaveCost(), $corpDivTrainSlaves -= _corpDivTrainSlavesSell, $corpAssetsDev -= 200000]] <<else>> | [[Downsize x10|Manage Corporation][$corpDivTrainDev -= 10, $corpCash += 200000, $corpAssetsDev -= 200000]] <</if>> diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw index 07e87aab34915d2f436d42067ec2ac876b990f31..ae350e5ff6c7679e5660809e67b92dbea2a7753b 100644 --- a/src/uncategorized/bodyModification.tw +++ b/src/uncategorized/bodyModification.tw @@ -413,31 +413,31 @@ Choose piercing style: <<goto "Body Modification">> <</link>> - <<if $activeSlave.earPiercing != 1>> | [[Ear|Body Modification][$activeSlave.earPiercing = 1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> - <<if $activeSlave.nosePiercing != 1>> | [[Nose|Body Modification][$activeSlave.nosePiercing = 1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> - <<if $activeSlave.eyebrowPiercing != 1>> | [[Eyebrow|Body Modification][$activeSlave.eyebrowPiercing = 1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> - <<if $activeSlave.lipsPiercing != 1>> | [[Lips|Body Modification][$activeSlave.lipsPiercing = 1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> - <<if $activeSlave.tonguePiercing != 1>> | [[Tongue|Body Modification][$activeSlave.tonguePiercing = 1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> + <<if $activeSlave.earPiercing != 1>> | [[Ear|Body Modification][$activeSlave.earPiercing = 1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> + <<if $activeSlave.nosePiercing != 1>> | [[Nose|Body Modification][$activeSlave.nosePiercing = 1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> + <<if $activeSlave.eyebrowPiercing != 1>> | [[Eyebrow|Body Modification][$activeSlave.eyebrowPiercing = 1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> + <<if $activeSlave.lipsPiercing != 1>> | [[Lips|Body Modification][$activeSlave.lipsPiercing = 1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> + <<if $activeSlave.tonguePiercing != 1>> | [[Tongue|Body Modification][$activeSlave.tonguePiercing = 1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> <<if $activeSlave.nipples != "fuckable">> - <<if $activeSlave.nipplesPiercing != 1>> | [[Nipples|Body Modification][$activeSlave.nipplesPiercing = 1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> + <<if $activeSlave.nipplesPiercing != 1>> | [[Nipples|Body Modification][$activeSlave.nipplesPiercing = 1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> <</if>> - <<if $activeSlave.areolaePiercing != 1>> | [[Areolae|Body Modification][$activeSlave.areolaePiercing = 1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> - <<if $activeSlave.corsetPiercing != 1>> | [[Corset|Body Modification][$activeSlave.corsetPiercing = 1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> - <<if $activeSlave.navelPiercing != 1>> | [[Navel|Body Modification][$activeSlave.navelPiercing = 1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> + <<if $activeSlave.areolaePiercing != 1>> | [[Areolae|Body Modification][$activeSlave.areolaePiercing = 1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> + <<if $activeSlave.corsetPiercing != 1>> | [[Corset|Body Modification][$activeSlave.corsetPiercing = 1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> + <<if $activeSlave.navelPiercing != 1>> | [[Navel|Body Modification][$activeSlave.navelPiercing = 1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> <<if ($activeSlave.vagina != -1) || ($activeSlave.dick != 0)>> <<if $activeSlave.vagina != -1>> - <<if $activeSlave.clitPiercing != 1>> | [[Clit|Body Modification][$activeSlave.clitPiercing = 1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> + <<if $activeSlave.clitPiercing != 1>> | [[Clit|Body Modification][$activeSlave.clitPiercing = 1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> <<else>> - <<if $activeSlave.clitPiercing != 1>> | [[Dickhead|Body Modification][$activeSlave.clitPiercing = 1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> + <<if $activeSlave.clitPiercing != 1>> | [[Dickhead|Body Modification][$activeSlave.clitPiercing = 1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> <</if>> <</if>> <<if ($activeSlave.vagina != -1)>> <<if $activeSlave.vaginaPiercing != 1>> | [[Vagina|Body Modification][$activeSlave.vaginaPiercing = 1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> <</if>> <<if ($activeSlave.dick > 0)>> - <<if $activeSlave.dickPiercing != 1>> | [[Dick|Body Modification][$activeSlave.dickPiercing = 1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> + <<if $activeSlave.dickPiercing != 1>> | [[Dick|Body Modification][$activeSlave.dickPiercing = 1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> <</if>> - <<if $activeSlave.anusPiercing != 1>> | [[Anus|Body Modification][$activeSlave.anusPiercing = 1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> + <<if $activeSlave.anusPiercing != 1>> | [[Anus|Body Modification][$activeSlave.anusPiercing = 1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> <</if>> <<if $piercingLevel == 2>> @@ -469,17 +469,17 @@ Choose piercing style: <<goto "Body Modification">> <</link>> - <<if $activeSlave.earPiercing != 2>> | [[Ear|Body Modification][$activeSlave.earPiercing = 2, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$degradation += 1]]<</if>> - <<if $activeSlave.nosePiercing != 2>> | [[Nose|Body Modification][$activeSlave.nosePiercing = 2, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$degradation += 1]]<</if>> - <<if $activeSlave.eyebrowPiercing != 2>> | [[Eyebrow|Body Modification][$activeSlave.eyebrowPiercing = 2, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$degradation += 1]]<</if>> - <<if $activeSlave.lipsPiercing != 2>> | [[Lips|Body Modification][$activeSlave.lipsPiercing = 2, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$degradation += 1]]<</if>> - <<if $activeSlave.tonguePiercing != 2>> | [[Tongue|Body Modification][$activeSlave.tonguePiercing = 2, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$degradation += 1]]<</if>> + <<if $activeSlave.earPiercing != 2>> | [[Ear|Body Modification][$activeSlave.earPiercing = 2, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$degradation += 1]]<</if>> + <<if $activeSlave.nosePiercing != 2>> | [[Nose|Body Modification][$activeSlave.nosePiercing = 2, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$degradation += 1]]<</if>> + <<if $activeSlave.eyebrowPiercing != 2>> | [[Eyebrow|Body Modification][$activeSlave.eyebrowPiercing = 2, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$degradation += 1]]<</if>> + <<if $activeSlave.lipsPiercing != 2>> | [[Lips|Body Modification][$activeSlave.lipsPiercing = 2, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$degradation += 1]]<</if>> + <<if $activeSlave.tonguePiercing != 2>> | [[Tongue|Body Modification][$activeSlave.tonguePiercing = 2, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$degradation += 1]]<</if>> <<if $activeSlave.nipples != "fuckable">> - <<if $activeSlave.nipplesPiercing != 2>> | [[Nipples|Body Modification][$activeSlave.nipplesPiercing = 2, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$degradation += 1]]<</if>> + <<if $activeSlave.nipplesPiercing != 2>> | [[Nipples|Body Modification][$activeSlave.nipplesPiercing = 2, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$degradation += 1]]<</if>> <</if>> - <<if $activeSlave.areolaePiercing != 2>> | [[Areolae|Body Modification][$activeSlave.areolaePiercing = 2, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$degradation += 1]]<</if>> - <<if $activeSlave.corsetPiercing != 2>> | [[Corset|Body Modification][$activeSlave.corsetPiercing = 2, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$degradation += 1]]<</if>> - <<if $activeSlave.navelPiercing != 2>> | [[Navel|Body Modification][$activeSlave.navelPiercing = 2, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$degradation += 1]]<</if>> + <<if $activeSlave.areolaePiercing != 2>> | [[Areolae|Body Modification][$activeSlave.areolaePiercing = 2, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$degradation += 1]]<</if>> + <<if $activeSlave.corsetPiercing != 2>> | [[Corset|Body Modification][$activeSlave.corsetPiercing = 2, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$degradation += 1]]<</if>> + <<if $activeSlave.navelPiercing != 2>> | [[Navel|Body Modification][$activeSlave.navelPiercing = 2, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$degradation += 1]]<</if>> <<if ($activeSlave.vagina != -1) || ($activeSlave.dick != 0)>> <<if $activeSlave.vagina != -1>> <<if $activeSlave.clitPiercing != 2>> | [[Clit|Body Modification][$activeSlave.clitPiercing = 2, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$degradation += 1]]<</if>> @@ -491,9 +491,9 @@ Choose piercing style: <<if $activeSlave.vaginaPiercing != 2>> | [[Vagina|Body Modification][$activeSlave.vaginaPiercing = 2, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$degradation += 1]]<</if>> <</if>> <<if ($activeSlave.dick > 0)>> - <<if $activeSlave.dickPiercing != 2>> | [[Dick|Body Modification][$activeSlave.dickPiercing = 2, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$degradation += 1]]<</if>> + <<if $activeSlave.dickPiercing != 2>> | [[Dick|Body Modification][$activeSlave.dickPiercing = 2, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$degradation += 1]]<</if>> <</if>> - <<if $activeSlave.anusPiercing != 2>> | [[Anus|Body Modification][$activeSlave.anusPiercing = 2, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$degradation += 1]]<</if>> + <<if $activeSlave.anusPiercing != 2>> | [[Anus|Body Modification][$activeSlave.anusPiercing = 2, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$degradation += 1]]<</if>> <</if>> <<if $piercingLevel == 3>> @@ -531,23 +531,23 @@ Choose piercing style: <</link>> - <<if $activeSlave.earPiercing > 0>> | [[Ear|Body Modification][$activeSlave.earPiercing = 0, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> - <<if $activeSlave.nosePiercing > 0>> | [[Nose|Body Modification][$activeSlave.nosePiercing = 0, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> - <<if $activeSlave.eyebrowPiercing > 0>> | [[Eyebrow|Body Modification][$activeSlave.eyebrowPiercing = 0, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> - <<if $activeSlave.lipsPiercing > 0>> | [[Lips|Body Modification][$activeSlave.lipsPiercing = 0, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> - <<if $activeSlave.tonguePiercing > 0>> | [[Tongue|Body Modification][$activeSlave.tonguePiercing = 0, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> - <<if $activeSlave.nipplesPiercing > 0>> | [[Nipples|Body Modification][$activeSlave.nipplesPiercing = 0, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> - <<if $activeSlave.areolaePiercing > 0>> | [[Areolae|Body Modification][$activeSlave.areolaePiercing = 0, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> - <<if $activeSlave.corsetPiercing > 0>> | [[Corset|Body Modification][$activeSlave.corsetPiercing = 0, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> - <<if $activeSlave.navelPiercing > 0>> | [[Navel|Body Modification][$activeSlave.navelPiercing = 0, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> + <<if $activeSlave.earPiercing > 0>> | [[Ear|Body Modification][$activeSlave.earPiercing = 0, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> + <<if $activeSlave.nosePiercing > 0>> | [[Nose|Body Modification][$activeSlave.nosePiercing = 0, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> + <<if $activeSlave.eyebrowPiercing > 0>> | [[Eyebrow|Body Modification][$activeSlave.eyebrowPiercing = 0, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> + <<if $activeSlave.lipsPiercing > 0>> | [[Lips|Body Modification][$activeSlave.lipsPiercing = 0, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> + <<if $activeSlave.tonguePiercing > 0>> | [[Tongue|Body Modification][$activeSlave.tonguePiercing = 0, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> + <<if $activeSlave.nipplesPiercing > 0>> | [[Nipples|Body Modification][$activeSlave.nipplesPiercing = 0, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> + <<if $activeSlave.areolaePiercing > 0>> | [[Areolae|Body Modification][$activeSlave.areolaePiercing = 0, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> + <<if $activeSlave.corsetPiercing > 0>> | [[Corset|Body Modification][$activeSlave.corsetPiercing = 0, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> + <<if $activeSlave.navelPiercing > 0>> | [[Navel|Body Modification][$activeSlave.navelPiercing = 0, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> <<if $activeSlave.vagina != -1>> - <<if $activeSlave.clitPiercing > 0>> | [[Clit|Body Modification][$activeSlave.clitPiercing = 0, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> + <<if $activeSlave.clitPiercing > 0>> | [[Clit|Body Modification][$activeSlave.clitPiercing = 0, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> <<else>> - <<if $activeSlave.clitPiercing > 0>> | [[Dickhead|Body Modification][$activeSlave.clitPiercing = 0, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> + <<if $activeSlave.clitPiercing > 0>> | [[Dickhead|Body Modification][$activeSlave.clitPiercing = 0, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> <</if>> - <<if $activeSlave.vaginaPiercing > 0>> | [[Vagina|Body Modification][$activeSlave.vaginaPiercing = 0, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> - <<if $activeSlave.dickPiercing > 0>> | [[Dick|Body Modification][$activeSlave.dickPiercing = 0, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> - <<if $activeSlave.anusPiercing > 0>> | [[Anus|Body Modification][$activeSlave.anusPiercing = 0, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> + <<if $activeSlave.vaginaPiercing > 0>> | [[Vagina|Body Modification][$activeSlave.vaginaPiercing = 0, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> + <<if $activeSlave.dickPiercing > 0>> | [[Dick|Body Modification][$activeSlave.dickPiercing = 0, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> + <<if $activeSlave.anusPiercing > 0>> | [[Anus|Body Modification][$activeSlave.anusPiercing = 0, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]<</if>> <</if>> <br><br> diff --git a/src/uncategorized/saDrugs.tw b/src/uncategorized/saDrugs.tw index 33e6d0712d8018aa79451c05eb33e6f2bcad3c13..9561191d832ba22a7570cc06fcc34f3b464eae17 100644 --- a/src/uncategorized/saDrugs.tw +++ b/src/uncategorized/saDrugs.tw @@ -565,7 +565,7 @@ <<set _growth = Math.round(Math.clamp(_growth,0,2))>> <</if>> /*communicates the amount of growth*/ - <<if _growth < 1>> /*in case _heightDiff manages to bring _growth down enough*/ + <<if _growth < 1>> /*in case _heightDiff manages to bring _growth down enough*/ Despite the treatment, $his height does not increase this week. <<elseif _growth == 1>> @@.lime;$His height slightly increased this week.@@ diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw index bf03e30befdaf82c7394279560eae99e0ce2c57e..0a46171d1483d1c1cf522014a0e27530965ce3b0 100644 --- a/src/uncategorized/slaveInteract.tw +++ b/src/uncategorized/slaveInteract.tw @@ -558,7 +558,7 @@ /*| //Not lactating// */ <</if>> - | <<link "Confinement">> <<= assignJob($activeSlave, "stay confined")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>> + | <<link "Confinement">> <<= assignJob($activeSlave, "stay confined")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>> | <<link "Let $him choose">> <<= assignJob($activeSlave, "choose her own job")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>> | <<link "Stay on this assignment for another month">><<if $activeSlave.assignment != "choose her own job">><<set $activeSlave.sentence += 4>><<replace "#assign">>$activeSlave.assignment ($activeSlave.sentence weeks)<</replace>><</if>><</link>>