From ffe37f58ec13117302fa15dbbe4d03c89877fdf5 Mon Sep 17 00:00:00 2001
From: Skriv <skrivelese@gmail.com>
Date: Wed, 12 Aug 2020 12:20:26 -0700
Subject: [PATCH] Typos JSDoc and minor fixes
---
src/Mods/SpecialForce/SpecialForce.js | 6 +++---
src/events/RESS/imScared.js | 2 +-
src/js/SlaveState.js | 6 ++++++
src/npc/interaction/fKiss.tw | 2 +-
src/npc/slaveStats.tw | 8 ++++----
src/npc/startingGirls/startingGirls.tw | 2 +-
src/player/js/PlayerState.js | 2 +-
src/uncategorized/costsBudget.js | 10 +++++-----
8 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/src/Mods/SpecialForce/SpecialForce.js b/src/Mods/SpecialForce/SpecialForce.js
index 98c495ea23e..327613f3ebe 100644
--- a/src/Mods/SpecialForce/SpecialForce.js
+++ b/src/Mods/SpecialForce/SpecialForce.js
@@ -21,9 +21,9 @@ App.SF.weeklyGift = function(input) {
break;
case 3:
switch(env) {
- case 4: EnvProsp = 3;
- case 3: EnvProsp = 5;
- case 2: EnvProsp = 7;
+ case 4: EnvProsp = 3; break;
+ case 3: EnvProsp = 5; break;
+ case 2: EnvProsp = 7; break;
}
value = EnvProsp + (Math.ceil(size/100 * env));
break;
diff --git a/src/events/RESS/imScared.js b/src/events/RESS/imScared.js
index 8df132ff2c2..16194753bcb 100644
--- a/src/events/RESS/imScared.js
+++ b/src/events/RESS/imScared.js
@@ -85,7 +85,7 @@ App.Events.RESSImScared = class RESSImScared extends App.Events.BaseEvent {
t.push(`${he} screams as you open the box for ${him}. ${He} knows that if ${he} doesn't climb in, it'll be longer before ${he}'s let out, so ${he} does, scrabbling inside and sobbing desperately as you close the lid.`);
break;
case "whipping":
- t.push(`whipped. <span class="gold">${He} breaks down,</span> falling to ${his} knees, begging abjectly for mercy. "It'll h-hu-hurt," ${he} blubbers weakly as you attach ${his} handif (hasBothArms(eventSlave)) {s} to shackles high on the office wall. The first stroke across ${his} buttocks draws a long shriek out of ${him}.`);
+ t.push(`whipped. <span class="gold">${He} breaks down,</span> falling to ${his} knees, begging abjectly for mercy. "It'll h-hu-hurt," ${he} blubbers weakly as you attach ${his} ${hasBothArms(eventSlave) ? "hands" : "hand"} to shackles high on the office wall. The first stroke across ${his} buttocks draws a long shriek out of ${him}.`);
break;
case "chastity":
t.push(`locked up in chastity. <span class="gold">${He} breaks down,</span> falling to ${his} knees, begging abjectly for mercy. "I c-can't," ${he} moans. "I can't take it. I can't stand it." As you lock the chastity onto ${him}, ${he} sobs inconsolably, knowing that any arousal will be torturous until ${he}'s released.`);
diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js
index c9fc7b51bff..84cb03c49c9 100644
--- a/src/js/SlaveState.js
+++ b/src/js/SlaveState.js
@@ -270,6 +270,7 @@ App.Entity.SlaveActionsCountersState = class {
this.abortions = 0;
/** number of miscarriages as your slave */
this.miscarriages = 0;
+ /** number of labors slave has undergone */
this.laborCount = 0;
/** oral sex count */
this.oral = 0;
@@ -518,10 +519,15 @@ App.Entity.SlaveState = class SlaveState {
this.rivalryTarget = 0;
/** slave will serve subTarget (ID) */
this.subTarget = 0;
+ /** ID of father */
this.father = 0;
+ /** ID of mother */
this.mother = 0;
+ /** number of slave's children that are your in your stock */
this.daughters = 0;
+ /** number of slave's siblings that are your in your stock */
this.sisters = 0;
+ /** Can the slave recruit relatives. Non-random slaves should be left off. */
this.canRecruit = 0;
/**
* can slave choose own assignment
diff --git a/src/npc/interaction/fKiss.tw b/src/npc/interaction/fKiss.tw
index 0cd7acad445..edc876e662a 100644
--- a/src/npc/interaction/fKiss.tw
+++ b/src/npc/interaction/fKiss.tw
@@ -199,7 +199,7 @@ Then, you gently raise $his <<if getSlave($AS).face > 95>>heartrendingly beautif
"I love you, <<Master>>," $he <<say>>s dreamily.
<</if>>
<<elseif (getSlave($AS).devotion > 50) && (getSlave($AS).fetish == "dom") && (getSlave($AS).fetishKnown == 1) && (getSlave($AS).fetishStrength > 60)>>
- $He giggles into you and kisses you back with vigor, $his head pressing insistently forward. The two of you make out rather aggressively<<if (getSlave($AS).teeth == "pointy")>>, $his sharp teeth drawing a bit of blood from your lips and tongue<<elseif (getSlave($AS).teeth == "fangs")>>, $his fangs drawing a bit of blood from your lips and togue<<elseif (getSlave($AS).teeth == "fang")>>, $his pointy fang drawing a bit of blood from your lips and togue<</if>>. $He takes $his tendency towards sexual dominance right up to the edge of insubordination, $his active tongue only retreating when yours presses against it. When you finally shove $him away, $he's breathing hard through $his grin.
+ $He giggles into you and kisses you back with vigor, $his head pressing insistently forward. The two of you make out rather aggressively<<if (getSlave($AS).teeth == "pointy")>>, $his sharp teeth drawing a bit of blood from your lips and tongue<<elseif (getSlave($AS).teeth == "fangs")>>, $his fangs drawing a bit of blood from your lips and tongue<<elseif (getSlave($AS).teeth == "fang")>>, $his pointy fang drawing a bit of blood from your lips and tongue<</if>>. $He takes $his tendency towards sexual dominance right up to the edge of insubordination, $his active tongue only retreating when yours presses against it. When you finally shove $him away, $he's breathing hard through $his grin.
<<if (getSlave($AS).accent >= 3)>>
$He does $his best to communicate excitement with $his <<if canSee(getSlave($AS))>><<= App.Desc.eyesColor(getSlave($AS))>><<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
<<elseif !hasAnyArms(getSlave($AS)) && (!canTalk(getSlave($AS)))>>
diff --git a/src/npc/slaveStats.tw b/src/npc/slaveStats.tw
index efc6b9785b4..d07ae3a36e6 100644
--- a/src/npc/slaveStats.tw
+++ b/src/npc/slaveStats.tw
@@ -76,7 +76,7 @@ Income: <<= num($activeSlave.lastWeeksRepIncome)>>
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Mental')" id="tab Mental">Mental</button>
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Body')" id="tab Body">Body</button>
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Porn')" id="tab Porn">Porn</button>
- <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Impants_Piercings_Tattoos')" id="tab Impants_Piercings_Tattoos">Impants, piercings & Tattoos</button>
+ <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Implants_Piercings_Tattoos')" id="tab Implants_Piercings_Tattoos">Implants, piercings & tattoos</button>
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Family')" id="tab Family">Family</button>
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Misc')" id="tab Misc">Misc</button>
</div>
@@ -261,7 +261,7 @@ Income: <<= num($activeSlave.lastWeeksRepIncome)>>
Implant Type: $activeSlave.boobsImplantType,
Implant Volume: $activeSlave.boobsImplant
<br>Milk: $activeSlave.boobsMilk,
- Qunantity: $activeSlave.counter.milk
+ Quantity: $activeSlave.counter.milk
<br>Shape: $activeSlave.boobShape
<br>nipples: $activeSlave.nipples,
Accessory: $activeSlave.nipplesAccessory
@@ -396,7 +396,7 @@ Income: <<= num($activeSlave.lastWeeksRepIncome)>>
</div>
</div>
-<div id="Impants_Piercings_Tattoos" class="tabcontent">
+<div id="Implants_Piercings_Tattoos" class="tabcontent">
<div class="content">
<h2>Implants</h2>
@@ -500,7 +500,7 @@ Income: <<= num($activeSlave.lastWeeksRepIncome)>>
<br>Androgyny: $activeSlave.geneticQuirks.androgyny
<br><br>
- <h2>Pregmancy</h2>
+ <h2>Pregnancy</h2>
<br>Week: $activeSlave.pregWeek,
isPreg: $activeSlave.preg,
Source: $activeSlave.pregSource,
diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index 82121fac20a..15845de1eb7 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -423,7 +423,7 @@
.addValue("Slave", -1, () => V.activeSlave.indentureRestrictions = 0)
.addRange(52, 0, ">=", "Indentured Servant")>>
<<if $activeSlave.indenture > -1>>
- <<run _options.addOption("Remaining weeeks", "indenture", $activeSlave).showTextBox()>>
+ <<run _options.addOption("Remaining weeks", "indenture", $activeSlave).showTextBox()>>
<<run _options.addOption("Indenture restrictions", "indentureRestrictions", $activeSlave)
.addValueList([["None", 0], ["Protective", 1], ["Restrictive", 2]])>>
diff --git a/src/player/js/PlayerState.js b/src/player/js/PlayerState.js
index fe3b61163ee..b647f1e457f 100644
--- a/src/player/js/PlayerState.js
+++ b/src/player/js/PlayerState.js
@@ -2022,7 +2022,7 @@ App.Entity.PlayerState = class PlayerState {
*/
/**
- * @callback slaveTestCallback
+ * @callback playerTestCallback
* @param {App.Entity.PlayerState} PC
* @returns {boolean}
*/
diff --git a/src/uncategorized/costsBudget.js b/src/uncategorized/costsBudget.js
index 61f0d60c16a..ad38b1d9fc1 100644
--- a/src/uncategorized/costsBudget.js
+++ b/src/uncategorized/costsBudget.js
@@ -40,7 +40,7 @@ App.UI.Budget.Cost = function() {
generateRowCategory("Confinement", "slaveAssignmentConfinement")
]);
// Other
- generateRowCategory("Chosing Own Assignment", "slaveAssignmentChoice");
+ generateRowCategory("Choosing Own Assignment", "slaveAssignmentChoice");
// LEADERSHIP ROLES
@@ -153,9 +153,9 @@ App.UI.Budget.Cost = function() {
// PROSTHETIC LAB
addToggle(generateRowGroup("Prosthetic Lab", "PROSTHETICLAB"), [
generateRowCategory("Prosthetic Lab Operation", "lab"),
- generateRowCategory("Prostethic Lab Research", "labResearch"),
- generateRowCategory("Prostethic Lab Scientists", "labScientists"),
- generateRowCategory("Prostethic Lab Menials", "labMenials")
+ generateRowCategory("Prosthetic Lab Research", "labResearch"),
+ generateRowCategory("Prosthetic Lab Scientists", "labScientists"),
+ generateRowCategory("Prosthetic Lab Menials", "labMenials")
]);
// SCHOOLROOM
@@ -245,7 +245,7 @@ App.UI.Budget.Cost = function() {
generateRowCategory("Your medical expenses", "PCmedical"),
generateRowCategory("Citizen Orphanage", "citizenOrphanage"),
generateRowCategory("Private Orphanage", "privateOrphanage"),
- generateRowCategory("Stock dividents", "stocks"),
+ generateRowCategory("Stock dividends", "stocks"),
generateRowCategory("Stock trading", "stocksTraded")
]);
--
GitLab