From 1f42f7ed474e8294023c35511c3779ddd62db725 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Wed, 24 Apr 2019 19:04:16 -0500
Subject: [PATCH] Misc
---
devNotes/Useful JS Function Documentation.txt | 2 +-
devNotes/twine CSS | 2 --
src/interaction/prothesticLab.tw | 8 ++++----
src/js/extendedFamilyModeJS.js | 2 +-
src/js/utilJS.js | 4 ++--
src/uncategorized/brothelReport.tw | 2 +-
src/uncategorized/saRecruitGirls.tw | 10 +++++-----
7 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/devNotes/Useful JS Function Documentation.txt b/devNotes/Useful JS Function Documentation.txt
index 83245d0f8bd..2a74057e92f 100644
--- a/devNotes/Useful JS Function Documentation.txt
+++ b/devNotes/Useful JS Function Documentation.txt
@@ -145,7 +145,7 @@ PoliteRudeTitle(slave) - Returns the slave's title for the player they hate.
SlaveTitle(slave) - Returns the slave's descriptive title.
-relativeTerm(slave1, slave2) - Returns the term for slave2's relation to slave1. (daughter, mother, etc)
+relativeTerm(slave1, slave2) - Returns the term for slave2's relation to slave1. (daughter, mother, etc.)
relationshipChecks [script] All work as expected with <<if X.rivalryTarget == $slaves[$i].ID>> preceding them.
rivalryTerm(id) - Returns the rivalry term for the input. e.g. lines 99-100 of brothelReport.
diff --git a/devNotes/twine CSS b/devNotes/twine CSS
index db0c78a1783..2ae27eb75df 100644
--- a/devNotes/twine CSS
+++ b/devNotes/twine CSS
@@ -18,7 +18,6 @@ hr {
opacity: 1 !important;
}
-
/* default is 54em */
#passages {
max-width: 100%;
@@ -638,7 +637,6 @@ body.lightTheme .optionMacroSelected {
content: '';
}
-
#graph .linage {
fill: none;
stroke: white;
diff --git a/src/interaction/prothesticLab.tw b/src/interaction/prothesticLab.tw
index 564cb33bc3a..1c2fce6741c 100644
--- a/src/interaction/prothesticLab.tw
+++ b/src/interaction/prothesticLab.tw
@@ -26,7 +26,7 @@ Prosthetic Lab
<br><br>
<<if $researchLab.aiModule == 1>>
- [[Buy and install research module|Prosthetic Lab][cashX(-35000, "capEx"), $researchLab.aiModule = 2]] //This module enables your personal assistant to assist staff and direct menials assigned to your research facility, increasing efficiency. It costs <<= cashFormat(35000)>>//<br>
+ [[Buy and install research module|Prosthetic Lab][cashX(forceNeg(35000), "capEx"), $researchLab.aiModule = 2]] //This module enables your personal assistant to assist staff and direct menials assigned to your research facility, increasing efficiency. It costs <<= cashFormat(35000)>>//<br>
<</if>>
<<if ($researchLab.hired + $researchLab.menials) == 0>>
//Facility is currently unstaffed.//
@@ -71,12 +71,12 @@ Prosthetic Lab
<br><br>
<<if ($researchLab.hired + $researchLab.menials) < $researchLab.maxSpace>>
- Hire [[x1|Prosthetic Lab][$researchLab.hired += 1,cashX(-2000, "lab")]]
+ Hire [[x1|Prosthetic Lab][$researchLab.hired += 1,cashX(forceNeg(2000), "lab")]]
<<if ($researchLab.maxSpace - ($researchLab.hired + $researchLab.menials)) >= 5>>
- | [[x5|Prosthetic Lab][$researchLab.hired += 5,cashX(-10000, "lab")]]
+ | [[x5|Prosthetic Lab][$researchLab.hired += 5,cashX(forceNeg(10000), "lab")]]
<</if>>
<<if ($researchLab.maxSpace - ($researchLab.hired + $researchLab.menials)) >= 10>>
- | [[x10|Prosthetic Lab][$researchLab.hired += 10,cashX(-10000, "lab")]]
+ | [[x10|Prosthetic Lab][$researchLab.hired += 10,cashX(forceNeg(10000), "lab")]]
<</if>>
scientists.<br>
//Each scientist will require an initial fee of <<= cashFormat(2000)>> and incur <<= cashFormat(300)>> weekly.//
diff --git a/src/js/extendedFamilyModeJS.js b/src/js/extendedFamilyModeJS.js
index a44dd4c8ea5..48237434eb1 100644
--- a/src/js/extendedFamilyModeJS.js
+++ b/src/js/extendedFamilyModeJS.js
@@ -48,7 +48,7 @@ window.isAunt = /** @param {App.Entity.SlaveState} niece, @param {App.Entity.Sla
return false;
};
-// testtest catches the case if a mother is a father or a father a mother - thank you familyAnon, for this code
+// testtest catches the case if a mother is a father or a father a mother — thank you familyAnon, for this code
window.sameTParent = function (slave1, slave2) {
if (slave1.mother === -1 && slave1.father === -1 && slave2.mother === -1 && slave2.father === -1) {
return 1;
diff --git a/src/js/utilJS.js b/src/js/utilJS.js
index b06620b5ecb..5e992379286 100644
--- a/src/js/utilJS.js
+++ b/src/js/utilJS.js
@@ -1716,7 +1716,7 @@ App.UI.disabledLink = function(link, reasons) {
};
/**
- * Expresion for SugarCube for referencing a slave by index
+ * Expression for SugarCube for referencing a slave by index
* @param {number} i slave array index or -1 for activeSlave
* @returns {string}
*/
@@ -1743,5 +1743,5 @@ window.addA = function(word) {
}
window.capitalizeFirstLetter = function(string) {
- return string.charAt(0).toUpperCase() + string.slice(1);
+ return string.charAt(0).toUpperCase() + string.slice(1);
}
diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw
index 8e11b8eab0c..c6040da5587 100644
--- a/src/uncategorized/brothelReport.tw
+++ b/src/uncategorized/brothelReport.tw
@@ -158,7 +158,7 @@
$He uses $slaves[$i].slaveName as an example of how even a huge-balled freak like _him2 can be restored to proper femininity.
<<set $madamCashBonus += 0.20>>
<<else>>
- $He tries to hide $slaves[$i].slaveName, 'her' body being notorious for defiance of conventional femininity.
+ $He tries to hide $slaves[$i].slaveName, "her" body being notorious for defiance of conventional femininity.
<</if>>
<<else>>
<<if (($slaves[$i].balls > 5) && ($slaves[$i].dick != 0)) || (($slaves[$i].balls > 4) && ($slaves[$i].dick != 0) && ($slaves[$i].prostate > 1))>>
diff --git a/src/uncategorized/saRecruitGirls.tw b/src/uncategorized/saRecruitGirls.tw
index a4fbe817dd8..78d674f0edd 100644
--- a/src/uncategorized/saRecruitGirls.tw
+++ b/src/uncategorized/saRecruitGirls.tw
@@ -80,10 +80,10 @@
<</if>>
<<elseif $arcologies[0].FSGenderFundamentalist != "unset">>
<<if $arcologies[_j].FSGenderFundamentalist != "unset">>
- $He advances Gender Fundamentalism there by being a wholesome, romantic $girl<<if $slaves[$i].genes == "XX" && $slaves[$i].vagina > -1 && !$slaves[$i].dick>>, which $he's perfect for, since $he's a proper woman with a body meant for missionary<<set $arcologies[_j].FSGenderFundamentalist++>><</if>>.
+ $He advances Gender Fundamentalism there by being a wholesome, romantic $girl<<if $slaves[$i].genes == "XX" && $slaves[$i].vagina > -1 && !$slaves[$i].dick>>, which $he's perfect for, since $he's a proper $woman with a body meant for missionary<<set $arcologies[_j].FSGenderFundamentalist++>><</if>>.
<<set $arcologies[_j].FSGenderFundamentalist += _influence>>
<<elseif $arcologies[_j].FSGenderRadicalist != "unset">>
- $He challenges Gender Radicalism there by being a wholesome, romantic $girl<<if $slaves[$i].genes == "XX" && $slaves[$i].vagina > -1 && !$slaves[$i].dick>>, which $he's perfect for, since $he's a proper woman with a body meant for missionary<<set $arcologies[_j].FSGenderRadicalist-->><</if>>.
+ $He challenges Gender Radicalism there by being a wholesome, romantic $girl<<if $slaves[$i].genes == "XX" && $slaves[$i].vagina > -1 && !$slaves[$i].dick>>, which $he's perfect for, since $he's a proper $woman with a body meant for missionary<<set $arcologies[_j].FSGenderRadicalist-->><</if>>.
<<set $arcologies[_j].FSGenderRadicalist -= _influence>>
<</if>>
<</if>>
@@ -297,7 +297,7 @@
<</if>>
<<if $slaves[$i].bellyPreg >= 300000>>
- $His massive overfilled womb is detrimental to $his efforts to recruit girls. It instills a fear of being turned into nothing more than a baby filled sack.
+ $His massive overfilled womb is detrimental to $his efforts to recruit slaves. It instills a fear of being turned into nothing more than a baby filled sack.
<<set $recruiterProgress -= 3>>
<</if>>
@@ -714,7 +714,7 @@
<<if $slaves[$i].race != $arcologies[0].FSSupremacistRace>>
$He patiently explains how $slaves[$i].race <<= $girl>>s like $himself benefit from the firm guidance of their proper $arcologies[0].FSSupremacistRace masters.
<<else>>
- $He makes the clear case for $arcologies[0].FSSupremacistRace superiority, although as an enslaved $slaves[$i].race woman $his words are a bit hollow.
+ $He makes the clear case for $arcologies[0].FSSupremacistRace superiority, although as an enslaved $slaves[$i].race $woman $his words are a bit hollow.
<</if>>
<<elseif $slaves[$i].race != $arcologies[0].FSSupremacistRace>>
The dumb $slaves[$i].race bitch can't even repeat $his Supremacist indoctrination properly.
@@ -831,7 +831,7 @@
$His unblemished skin shines artistically in this week's erotic studio gallery, but the shape of $his curves is too obviously artificial.
<</if>>
<<elseif $slaves[$i].boobsImplant == 0 && $slaves[$i].buttImplant == 0 && $slaves[$i].waist >= -95>>
- $His most recent photo galleries are barely passable: you can hardly see the woman beneath $his blatant body art.
+ $His most recent photo galleries are barely passable: you can hardly see the $woman beneath $his blatant body art.
<<else>>
$He is burdened by the knowledge that $his heavy alterations don't fit your ideal of purity, and fails to show at a scheduled photo shoot.
<</if>>
--
GitLab