From ab35d631c3704de1470b8ba08bbee54a69418f44 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Fri, 21 Jun 2019 17:52:31 -0500
Subject: [PATCH] FunctionFix
---
slave variables documentation - Pregmod.txt | 2 +-
src/js/eventSelectionJS.js | 2 +-
src/js/utilJS.js | 9 ++++++---
src/uncategorized/masterSuiteReport.tw | 2 +-
src/uncategorized/universalRules.tw | 2 +-
5 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index 94ca9a8f88c..db4ec0a8b64 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -2326,7 +2326,7 @@ nail type
brand:
is an object
-keys include any place on a slave body that can recieve a brand, values are a string for the brand.
+keys include any place on a slave body that can receive a brand, values are a string for the brand.
earPiercing:
diff --git a/src/js/eventSelectionJS.js b/src/js/eventSelectionJS.js
index 20e1361474d..2dd71f7912e 100644
--- a/src/js/eventSelectionJS.js
+++ b/src/js/eventSelectionJS.js
@@ -1781,7 +1781,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
}
}
- if (eventSlave.origin === "You sentenced $him to enslavement as a punishment for attempted theft of a slave." || eventSlave.origin === "$He is an enslaved Daughter of Liberty." || eventSlave.origin === "You got $him at the Slave Shelter. $He is an enslaved Daughter of Liberty, caught some weeks after the failed coup. $His previous owner used $him as a punching bag and dart board, then when he was bored of $him tattooed obscenities all over $his body and threw $him away." || eventSlave.origin === "$He is an enslaved member of an anti-slavery extremist group.") {
+ if (eventSlave.origin === "You sentenced $him to enslavement as a punishment for attempted theft of a slave." || eventSlave.origin === "$He is an enslaved Daughter of Liberty." || eventSlave.origin === "You got $him at the Slave Shelter. $He is an enslaved Daughter of Liberty, caught some weeks after the failed coup. $His previous owner used $him as a punching bag and dart board, then when he was bored of $him tattooed obscenities all over $his body and threw $him away." || eventSlave.origin === "$He is an enslaved member of an anti-slavery extremist group." || eventSlave.career === "an antislavery activist") {
if (eventSlave.devotion > 95 && eventSlave.assignment === "please you") {
State.variables.events.push("RE former abolitionist");
}
diff --git a/src/js/utilJS.js b/src/js/utilJS.js
index fd6bec8cacd..7ec3827629d 100644
--- a/src/js/utilJS.js
+++ b/src/js/utilJS.js
@@ -2232,11 +2232,14 @@ window.convertCareer = function(slave) {
}
} else if (slave.pronoun === App.Data.Pronouns.Kind.female) {
switch (job) {
- case "a trophy spouse"
+ case "a priest":
+ job = "a priestess";
+ break;
+ case "a trophy spouse":
job = "a trophy wife";
break;
- case "a businessman"
- case "a repairman"
+ case "a businessman":
+ case "a repairman":
job = job.replace(/man/g, "woman");
break;
}
diff --git a/src/uncategorized/masterSuiteReport.tw b/src/uncategorized/masterSuiteReport.tw
index 35c3e2c886e..acc11fe79fc 100644
--- a/src/uncategorized/masterSuiteReport.tw
+++ b/src/uncategorized/masterSuiteReport.tw
@@ -31,7 +31,7 @@
<<set _masterSuiteAverageSadism -= $slaves[$i].fetishStrength>>
<</switch>>
<</if>>
- <<if ($legendaryAbolitionistID == 0) && ($slaves[$i].devotion > 95) && ($slaves[$i].prestige == 0) && (($slaves[$i].origin == "You sentenced $him to enslavement as a punishment for attempted theft of a slave.") || ($slaves[$i].origin == "$He is an enslaved Daughter of Liberty.") || ($slaves[$i].origin === "You got $him at the Slave Shelter. $He is an enslaved Daughter of Liberty, caught some weeks after the failed coup. $His previous owner used $him as a punching bag and dart board, then when he was bored of $him tattooed obscenities all over $his body and threw $him away.") || ($slaves[$i].origin === "$He is an enslaved member of an anti-slavery extremist group."))>>
+ <<if ($legendaryAbolitionistID == 0) && ($slaves[$i].devotion > 95) && ($slaves[$i].prestige == 0) && (($slaves[$i].origin == "You sentenced $him to enslavement as a punishment for attempted theft of a slave.") || ($slaves[$i].origin == "$He is an enslaved Daughter of Liberty.") || ($slaves[$i].origin === "You got $him at the Slave Shelter. $He is an enslaved Daughter of Liberty, caught some weeks after the failed coup. $His previous owner used $him as a punching bag and dart board, then when he was bored of $him tattooed obscenities all over $his body and threw $him away.") || ($slaves[$i].origin === "$He is an enslaved member of an anti-slavery extremist group.") || ($slaves[$i].career == "an antislavery activist"))>>
<<set $legendaryAbolitionistID = $slaves[$i].ID>>
<</if>>
<</for>>
diff --git a/src/uncategorized/universalRules.tw b/src/uncategorized/universalRules.tw
index 774098550c8..6b792b21a35 100644
--- a/src/uncategorized/universalRules.tw
+++ b/src/uncategorized/universalRules.tw
@@ -70,7 +70,7 @@ Slave requests for growth hormones are
''Branding for slaves''
<br>
-Choose an official brand. Any slave marked with this brand will be connected to your reputation, and will recieve a beauty boost or penalty depending on how high or low that reputation is.
+Choose an official brand. Any slave marked with this brand will be connected to your reputation, and will receive a beauty boost or penalty depending on how high or low that reputation is.
<br>
Use ''$brandDesign.official'' or choose another brand:
[[Your slaving emblem|Universal Rules][$brandDesign.official = "your personal symbol"]]
--
GitLab