From e8cdf28e8f1abb7c44307a10adebb8561667255a Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Sat, 1 Jun 2019 21:28:23 -0500
Subject: [PATCH] OriginExceptions
---
Changelog.txt | 2 +-
src/js/utilJS.js | 38 ++++++++++++++++---------------------
src/pregmod/forceFeeding.tw | 2 +-
3 files changed, 18 insertions(+), 24 deletions(-)
diff --git a/Changelog.txt b/Changelog.txt
index 13506888fef..a7ad3912e1c 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -13,7 +13,7 @@ Pregmod
0.10.7.1-2.4.x
05/25/2019
-
+
0
-unified cybermod with vanilla
-major pronoun work (99.9% completion)
diff --git a/src/js/utilJS.js b/src/js/utilJS.js
index a38ff5f47e0..8904175dc2e 100644
--- a/src/js/utilJS.js
+++ b/src/js/utilJS.js
@@ -1761,9 +1761,6 @@ window.pronounReplacer = function(slavetext) {
case "Many people remember her from the slavegirl races where she slammed her cock into countless runners' pussies after catching them.":
slavetext = "Many people remember $him from the slavegirl races where $he slammed $his cock into countless runners' pussies after catching them.";
break;
- case "Once she was an arcology security officer, lured to aphrodisiacs addiction and feminized by her boss (and former wife), to whom she was sold as a slave to satisfy her spousal maintenance after divorce.":
- slavetext = "Once $he was an arcology security officer, lured to aphrodisiacs addiction and feminized by $his boss (and former wife), to whom $he was sold as a slave to satisfy her spousal maintenance after divorce.";
- break;
case "She asked to be enslaved in the hope you'd treat a fellow woman well.":
slavetext = "$He asked to be enslaved in the hope you'd treat a fellow woman well.";
break;
@@ -1884,9 +1881,6 @@ window.pronounReplacer = function(slavetext) {
case "She sold herself to you in the hope of someday bearing children.":
slavetext = "$He sold $himself to you in the hope of someday bearing children.";
break;
- case "She submitted to enslavement as her only way to obtain surgery to transform her into a woman.":
- slavetext = "$He submitted to enslavement as $his only way to obtain surgery to transform $him into a woman.";
- break;
case "She submitted to enslavement for a better chance at survival than she had as a migrant.":
slavetext = "$He submitted to enslavement for a better chance at survival than $he had as a migrant.";
break;
@@ -1932,15 +1926,9 @@ window.pronounReplacer = function(slavetext) {
case "She was once the princess of an old world kingdom up until her loose habits caught up with her and she was exiled.":
slavetext = "$He was once the princess of an old world kingdom up until $his loose habits caught up with $him and $he was exiled.";
break;
- case "She was once the young trophy husband of a powerful woman in the old world, but she sold her into slavery in revenge for her infidelities.":
- slavetext = "$He was once the young trophy husband of a powerful woman in the old world, but she sold $him into slavery in revenge for $his infidelities.";
- break;
case "She was once the young trophy wife of a powerful man in the old world, but he sold her into slavery in revenge for her infidelity.":
slavetext = "$He was once the young trophy wife of a powerful man in the old world, but he sold $him into slavery in revenge for $his infidelity.";
break;
- case "She was raised as a girl despite her gargantuan dick to be a truly unique slave.":
- slavetext = "$He was raised as a girl despite $his gargantuan dick to be a truly unique slave.";
- break;
case "She was raised in a radical slave school that treated her from a very young age, up to the point that she never experienced male puberty.":
slavetext = "$He was raised in a radical slave school that treated $him from a very young age, up to the point that $he never experienced male puberty.";
break;
@@ -2079,15 +2067,9 @@ window.pronounReplacer = function(slavetext) {
case "You sentenced her to enslavement as a punishment for dereliction of her duty to you as a mercenary and for theft.":
slavetext = "You sentenced $him to enslavement as a punishment for dereliction of $his duty to you as a mercenary and for theft.";
break;
- case "You sentenced her to enslavement as a punishment for rape of a free woman.":
- slavetext = "You sentenced $him to enslavement as a punishment for the rape of a free woman.";
- break;
case "You sentenced her to enslavement as a punishment for smuggling slaves within her body.":
slavetext = "You sentenced $him to enslavement as a punishment for smuggling slaves within $his body.";
break;
- case "You sentenced her to enslavement for the attempted rape of a free woman.":
- slavetext = "You sentenced $him to enslavement for the attempted rape of a free woman.";
- break;
case "You stormed her arcology, killed her guards and enslaved her in revenge for insulting you at a dinner party.":
slavetext = "You stormed $his arcology, killed $his guards, and enslaved $him in revenge for insulting you at a dinner party.";
break;
@@ -2182,8 +2164,8 @@ window.pronounReplacer = function(slavetext) {
slavetext = slavetext.replace(/\bShe\b/g, "$He");
slavetext = slavetext.replace(/\bher\b/g, "$his");
slavetext = slavetext.replace(/\bHer\b/g, "$His");
- slavetext = slavetext.replace(/\b girl\b/g, " $girl");
- slavetext = slavetext.replace(/\b woman\b/g, " $woman");
+ slavetext = slavetext.replace(/\bgirl\b/g, "$girl");
+ slavetext = slavetext.replace(/\bwoman\b/g, "$woman");
break;
default:
if ((slavetext.includes("was serving the public")) || (slavetext.includes("You bought her from"))) {
@@ -2191,6 +2173,18 @@ window.pronounReplacer = function(slavetext) {
} else if ((slavetext.includes("Your lurcher")) || (slavetext.includes("while raiding"))) {
slavetext = slavetext.replace(/\bher\b/g, "$him");
slavetext = slavetext.replace(/\bshe\b/g, "$he");
+ } else if (slavetext.includes("young trophy husband")) {
+ slavetext = "$He was once the young trophy husband of a powerful woman in the old world, but she sold $him into slavery in revenge for $his infidelities.";
+ } else if (slavetext.includes("gargantuan dick")) {
+ slavetext = "$He was raised as a girl despite $his gargantuan dick to be a truly unique slave.";
+ } else if (slavetext.includes("attempted rape of a free woman")) {
+ slavetext = "You sentenced $him to enslavement for the attempted rape of a free woman.";
+ } else if (slavetext.includes("rape of a free woman")) {
+ slavetext = "You sentenced $him to enslavement as a punishment for the rape of a free woman.";
+ } else if (slavetext.includes("obtain surgery to transform")) {
+ slavetext = "$He submitted to enslavement as $his only way to obtain surgery to transform $him into a woman.";
+ } else if (slavetext.includes("spousal maintenance")) {
+ slavetext = "Once $he was an arcology security officer, lured to aphrodisiacs addiction and feminized by $his boss (and former wife), to whom $he was sold as a slave to satisfy her spousal maintenance after divorce.";
} else {
slavetext = slavetext.replace(/\bherself\b/g, "$himself");
slavetext = slavetext.replace(/\bHerself\b/g, "$Himself");
@@ -2198,8 +2192,8 @@ window.pronounReplacer = function(slavetext) {
slavetext = slavetext.replace(/\bShe\b/g, "$He");
slavetext = slavetext.replace(/\bher\b/g, "$his");
slavetext = slavetext.replace(/\bHer\b/g, "$His");
- slavetext = slavetext.replace(/\b girl\b/g, " $girl");
- slavetext = slavetext.replace(/\b woman\b/g, " $woman");
+ slavetext = slavetext.replace(/\bgirl\b/g, "$girl");
+ slavetext = slavetext.replace(/\bwoman\b/g, "$woman");
}
break;
}
diff --git a/src/pregmod/forceFeeding.tw b/src/pregmod/forceFeeding.tw
index 7f215aae01d..c79350e87b7 100644
--- a/src/pregmod/forceFeeding.tw
+++ b/src/pregmod/forceFeeding.tw
@@ -99,7 +99,7 @@ $He is going to eat it all and you're going to enjoy $him as $he does it.
<</if>>
<</if>>
<<if $activeSlave.fetish == "mindbroken">>
- You reach out and wrap youe arms
+ You reach out and wrap your arms
<</if>>
around $his
--
GitLab