From 679ccd8a5fa9f82735277864ed052b1a86e67b79 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Mon, 23 Sep 2019 22:53:22 -0500
Subject: [PATCH] FCNN
---
src/js/assayJS.js | 2 ++
src/pregmod/pBodyswapReveal.tw | 1 +
src/pregmod/pRaped.tw | 3 ++-
src/pregmod/reTheSirenStrikesBack.tw | 6 ++++--
src/uncategorized/pCorpAnnouncement.tw | 1 +
src/uncategorized/pCoupAftermath.tw | 1 +
src/uncategorized/pDefenseFears.tw | 1 +
src/uncategorized/pMercsHelpCorp.tw | 2 +-
src/utility/miscWidgets.tw | 3 ++-
9 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/js/assayJS.js b/src/js/assayJS.js
index d13234ff2a4..413705acf04 100644
--- a/src/js/assayJS.js
+++ b/src/js/assayJS.js
@@ -469,6 +469,7 @@ window.Enunciate = function Enunciate(slave) {
V.ccEnunciate = "kth";
V.zEnunciate = "th";
V.ZEnunciate = "Th";
+ V.zzEnunciate = "th";
V.chEnunciate = "th";
V.ChEnunciate = "Th";
V.psEnunciate = "th";
@@ -550,6 +551,7 @@ window.Enunciate = function Enunciate(slave) {
V.ccEnunciate = "cc";
V.zEnunciate = "z";
V.ZEnunciate = "Z";
+ V.zzEnunciate = "zz";
V.chEnunciate = "ch";
V.ChEnunciate = "Ch";
V.psEnunciate = "ps";
diff --git a/src/pregmod/pBodyswapReveal.tw b/src/pregmod/pBodyswapReveal.tw
index 587d28b966d..c49f5a989c1 100644
--- a/src/pregmod/pBodyswapReveal.tw
+++ b/src/pregmod/pBodyswapReveal.tw
@@ -3,6 +3,7 @@
<<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event">>
<<set $bodyswapAnnounced = 1>>
+<<set $fcnn.push("...transferring consciousness from one body to another is morally wrong, but financially...")>>
You receive countless messages throughout the day; mostly worthless spam, several uninteresting business offers and the occasional enslavement request. This one catches your eye however. It's an offer from a top surgeon who has recently been experimenting with radical new surgeries. You've been loosely following their work for the last few weeks, ever since they successfully swapped the consciousness from one slave to another with minimal side effects, assuming they are kept on a special suppressant, and it seems they are now offering their work to anyone with a surgical suite capable of performing the surgery and willing to undertake the risk.
<br><br>
diff --git a/src/pregmod/pRaped.tw b/src/pregmod/pRaped.tw
index 5b3f6ab50b8..335b36d65db 100644
--- a/src/pregmod/pRaped.tw
+++ b/src/pregmod/pRaped.tw
@@ -43,7 +43,7 @@ While returning from a meeting with a prospective investor, an unfortunate wrong
The moment you hear the sound of the knife unsheathe your reflexes take over. With a single strike, the $woman tailing you lies in a heap on the ground.
<<set $raped = 0>>
<<elseif $PC.career == "slaver" || $PC.warfare >= 45>>
- The moment you notice an arm coming around from behind you does your training kick in. You quickly disarm the assailant and knock them to the floor before placing them in a chokehold. Once they are subdued, you stand back to decide what to do next.
+ The moment you notice an arm coming around from behind you does your training kick in. You quickly disarm the assailant and knock them to the floor before placing them in a choke-hold. Once they are subdued, you stand back to decide what to do next.
<<set $raped = 0>>
<<elseif $PC.career == "gang">>
The moment you hear the sound of the knife unsheathe your reflexes take over. With a single stab, your own shiv is buried in $his chest, incapacitating $him.
@@ -53,6 +53,7 @@ While returning from a meeting with a prospective investor, an unfortunate wrong
<</if>>
<br><br>
<<if $raped == 1>>
+ <<set $fcnn.push("...plans for increased security measures, but refused to answer questions regarding...")>>
<<if $PC.vagina > 0>>
"Well, well, well, look what <<if $PC.belly >= 5000 || $PC.preg >= 20>>waddled<<else>>walked<</if>> into my territory. If it isn't $PC.name, come to grace me with _hisP presence."
<<else>>
diff --git a/src/pregmod/reTheSirenStrikesBack.tw b/src/pregmod/reTheSirenStrikesBack.tw
index c8746855bf5..d16db5f6ccd 100644
--- a/src/pregmod/reTheSirenStrikesBack.tw
+++ b/src/pregmod/reTheSirenStrikesBack.tw
@@ -39,6 +39,8 @@
<<set $activeSlave.clothes = "nice business attire">>
<<setLocalPronouns $activeSlave 2>>
+<<run Enunciate($activeSlave)>>
+<<setSpokenLocalPronouns $activeSlave _ssb>>
<span id="artFrame">
/* 000-250-006 */
@@ -54,7 +56,7 @@
Several weeks have passed since you gained the musical prodigy and you couldn't help but notice $his constant scowl and muttering about "getting revenge one day" or "wishing $his producer would pay for what happened" whenever $he was not working. You decide to look into the incident and direct $assistantName to look into the financial situation of $his record label. It turns out that not only should this slave not be eligible for enslavement due to $his performance profits, but a certain someone has been taking that money for themselves. You issue a bounty for $his producer and await a response. With surprising speed, an answer comes from a bounty hunter. The underhanded producer never left the arcology, instead opting to make use of the guest living arrangements you had set up for the concert. Only when an announcement of the bounty went out did _he2 realize _his2 peril and attempt to flee. The bounty hunter literally drags the escapee by the collar into your penthouse and throws _him2 at your feet. The coward shivers as your eyes meet _hers2.
<br><br>
-"Please, don't hurt me! I'll pay for that slave I sent you to be released, even set $him up with the life $he would have had if I hadn't embezzled the profits!"
+"Plea<<s>>e, don't hurt me! I'll pay for that <<s>>lave I <<s>>ent you to be relea<<s>>ed, even <<s>>et $him up with the life <<he 2>> would have had if I hadn't embe<<zz>>led the profit<<s>>!"
<br><br>
<<if def _ssb>>
@@ -68,7 +70,7 @@ Several weeks have passed since you gained the musical prodigy and you couldn't
<</if>>
$his face quickly donning a scowl of pure anger and hatred.
<<if canTalk(_ssb)>>
- "<<Master>>, plea<<s>>e let me have my revenge on thi<<s>> de<<s>>picable lowlife," $he hisses. "I promi<<s>>e not to kill them, ju<<s>>t hurt them enough to let them know the <<s>>uffering they cau<<s>>ed me."
+ "<<Master>>, plea<<s>>e let me have my revenge on thi<<s>> de<<s>>picable lowlife," $he hisses. "I promi<<s>>e not to kill _him2, ju<<s>>t hurt _him2 enough to let _him2 know the <<s>>uffering they cau<<s>>ed me."
<<else>>
$He may not be able to talk anymore, but $his request of you is very clear across $his face.
<</if>>
diff --git a/src/uncategorized/pCorpAnnouncement.tw b/src/uncategorized/pCorpAnnouncement.tw
index a1bf4241824..44d16806606 100644
--- a/src/uncategorized/pCorpAnnouncement.tw
+++ b/src/uncategorized/pCorpAnnouncement.tw
@@ -4,6 +4,7 @@
<<set $nextLink = "Random Nonindividual Event">>
<<set $corpAnnounced = 1>>
+<<set $fcnn.push("...and Free Cities have definitely shaken up the stock market in recent...")>>
You never understood the power of money until accumulating so much of it yourself. If you were to try to explain it to someone without that power, you would emphasize the access it buys you. You can speak to anyone, about anything; propose anything, to anyone. And recently, you have begun to encounter the trouble of being too powerful.
diff --git a/src/uncategorized/pCoupAftermath.tw b/src/uncategorized/pCoupAftermath.tw
index 4a1b1ab6a9d..041826b3c0e 100644
--- a/src/uncategorized/pCoupAftermath.tw
+++ b/src/uncategorized/pCoupAftermath.tw
@@ -16,6 +16,7 @@
<<set _HeR = capFirstChar(_heR)>>
<</if>>
<<setAssistantPronouns>>
+<<set $fcnn.push("...evidence also suggests that the Daughters of Liberty had also planned a terrorist attack on...")>>
<<if $mercenaries > 3>>Your $mercenariesTitle<<elseif $mercenaries > 0>>Your mercenaries<<elseif $arcologyUpgrade.drones > 0>>Your security drones<<else>>Private security teams<</if>> perform the grisly task of disposing of the bodies of the Daughters killed in the assault. They strip them of anything that might be of use in cleaning up after the attempted coup — communication devices, PDAs, computers, even handwritten notes. The raw intel is scanned and passed to $assistantName. Most of it is rubbish.
<br><br>
diff --git a/src/uncategorized/pDefenseFears.tw b/src/uncategorized/pDefenseFears.tw
index bca5dc70d74..934aafcfb24 100644
--- a/src/uncategorized/pDefenseFears.tw
+++ b/src/uncategorized/pDefenseFears.tw
@@ -1,6 +1,7 @@
:: P defense fears [nobr]
<<set $nextButton = " ", $nextLink = "Random Nonindividual Event">> /* hide button until user makes a selection */
+<<set $fcnn.push("...hiring mercenaries to act as a defensive force against the old world...")>>
A deputation of slaveowning citizens comes to see you. Though they haven't experienced anything so disturbing as your dealings with the Daughters of Liberty, rumors of unrest and revolution are running through the Free Cities. They are upset with the lack of troops to protect the arcology. This is quite a development in the young history of Free Cities society; only a few months ago, the idea of collective defense would have been a bitterly controversial one. It's still an employer's market for mercenaries; you could easily hire some. Alternatively, your citizens would probably agree to fund them by subscription — the word "taxes" would be impolitic.
diff --git a/src/uncategorized/pMercsHelpCorp.tw b/src/uncategorized/pMercsHelpCorp.tw
index bb9dc0cfeef..2d8983aa809 100644
--- a/src/uncategorized/pMercsHelpCorp.tw
+++ b/src/uncategorized/pMercsHelpCorp.tw
@@ -21,7 +21,7 @@ Your weekly meeting with your $mercenariesTitle commander finishes with unusual
<span id="result">
<<link "Decline">>
<<replace "#result">>
- Best to keep the $mercenariesTitle in reserve. You decline, and the commander chuckles. "Well <<= properTitle()>>, if you insist, I suppose we could find ways to keep busy around the arcology. I mean, we're a little starved for female company here, but we can make do."
+ Best to keep the $mercenariesTitle in reserve. You decline, and the commander chuckles. "Well <<= properTitle()>>, if you insist, I suppose we could find ways to keep busy around the arcology. I mean, we're a little starved for <<if $seeDicks != 0>>female<<else>>intimate<</if>> company here, but we can make do."
<</replace>>
<</link>>
<br><<link "Make it so">>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index 04dabb953a2..57da8216677 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -504,7 +504,8 @@ Must be within $arcologies[$i] for loop
<<widget "C">>$CEnunciate<</widget>>
<<widget "cc">>$ccEnunciate<</widget>>
<<widget "z">>$zEnunciate<</widget>>
-<<widget "Z">>$zEnunciate<</widget>>
+<<widget "Z">>$ZEnunciate<</widget>>
+<<widget "zz">>$zzEnunciate<</widget>>
<<widget "ch">>$chEnunciate<</widget>>
<<widget "Ch">>$ChEnunciate<</widget>>
<<widget "ps">>$psEnunciate<</widget>>
--
GitLab