From 784343b703e83aa16942b9088e2f561021a770da Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Sun, 12 May 2019 23:09:26 -0500
Subject: [PATCH] MiscMiscMisc
---
devNotes/Pronouns.md | 16 +++++++--------
src/002-config/fc-js-init.js | 26 ++++++++++++------------
src/pregmod/pRaped.tw | 32 ++++++++++++++++--------------
src/pregmod/reMaleCitizenHookup.tw | 2 +-
src/uncategorized/nextWeek.tw | 7 +++----
src/uncategorized/persBusiness.tw | 2 +-
src/uncategorized/slaveInteract.tw | 6 +++---
7 files changed, 46 insertions(+), 45 deletions(-)
diff --git a/devNotes/Pronouns.md b/devNotes/Pronouns.md
index 0a58ecc3045..070af441658 100644
--- a/devNotes/Pronouns.md
+++ b/devNotes/Pronouns.md
@@ -17,22 +17,22 @@ const s = getPronouns(aSlave);
## Extending the pronouns system. ##
-Consider a degradationalism-based society where a slave is a thing. To extend the pronouns system, we create a successor of the `App.Utils.Pronouns` class:
+Consider a degradationism-based society where a slave is a thing. To extend the pronouns system, we create a successor of the `App.Utils.Pronouns` class:
```js
App.Utils.ThingPronouns = class extends App.Utils.Pronouns {
- get pronoun() { return "it" }
- get possessivePronoun() { return "its"; }
- get possessive() { return "its"; }
- get object() { return "its"; }
- get objectReflexive() { return "itself"; }
- get noun() { return "thing"; }
+ get pronoun() { return "it" }
+ get possessivePronoun() { return "its"; }
+ get possessive() { return "its"; }
+ get object() { return "its"; }
+ get objectReflexive() { return "itself"; }
+ get noun() { return "thing"; }
};
```
Notice, we override only the basic gender-neutral properties, and the rest of them use these values. Then we modify the `getPronouns()` code:
```js
-if (/*degradationalist society condition*/) {
+if (/*degradationist society condition*/) {
return new App.Utils.ThingPronouns(slave);
}
return new App.Utils.Pronouns(slave);
diff --git a/src/002-config/fc-js-init.js b/src/002-config/fc-js-init.js
index 1e53f5b290c..ac9952a0afb 100644
--- a/src/002-config/fc-js-init.js
+++ b/src/002-config/fc-js-init.js
@@ -18,18 +18,18 @@ App.Interact = {};
App.Desc = {};
App.ExtendedFamily = {};
App.Facilities = {
- Brothel: {},
- Club: {},
- Dairy: {},
- Farmyard: {},
- ServantsQuarters: {},
- MasterSuite: {},
- Spa: {},
- Nursery: {},
- Clinic: {},
- Schoolroom: {},
- Cellblock: {},
- Arcade: {},
- HGSuite: {}
+ Brothel: {},
+ Club: {},
+ Dairy: {},
+ Farmyard: {},
+ ServantsQuarters: {},
+ MasterSuite: {},
+ Spa: {},
+ Nursery: {},
+ Clinic: {},
+ Schoolroom: {},
+ Cellblock: {},
+ Arcade: {},
+ HGSuite: {}
};
App.SF = {};
diff --git a/src/pregmod/pRaped.tw b/src/pregmod/pRaped.tw
index 9df384125e4..4a9412c02fa 100644
--- a/src/pregmod/pRaped.tw
+++ b/src/pregmod/pRaped.tw
@@ -191,7 +191,7 @@ While returning from a meeting with a prospective investor, an unfortunate wrong
$He slips $his hand down your pants; "Now there's the money maker!"
<<case "capitalist">>
<<if $PC.boobs > 0>>
- "Ever wonder if they were listening to you or just oggling the man with the breasts?" $he smirks as $he gropes your breasts.
+ "Ever wonder if they were listening to you or just ogling the man with the breasts?" $he smirks as $he gropes your breasts.
<</if>>
$He slips $his hand down your pants; "Now that explains how you were so successful!"
<<case "engineer">>
@@ -223,12 +223,12 @@ While returning from a meeting with a prospective investor, an unfortunate wrong
<<if $PC.boobs > 0>>
"Nice and supple. What are the odds that I can find these babies on the internet?" $he smirks as $he gropes your breasts.
<</if>>
- $He slips $his hand down your pants; "You wouldn't mind if I download a few files now yould you? Well, not that it matters."
+ $He slips $his hand down your pants; "You wouldn't mind if I download a few files now would you? Well, not that it matters."
<</switch>>
Satisfied, $he pulls your cock out of its increasingly cramped confines. "Look at him grow, he knows what comes next..." $He teases as $he pushes you to the ground and climbs on top of you.
<br><br>
$He lines $himself up with the tip of your dick before taking its entire length into $himself. $He lets out a lust filled moan as $he begins to bounce on your traitorous member. You can do nothing to stop $him from riding you to climax, so you just enjoy the sight of $his breasts bouncing to $his pace. As you feel your orgasm approaching, you try to time it so you can slip out of $him just before you blow your load, but you have no such luck.
- "You really think I'd let you spoil my plans?" $He asks as $he grinds against you, making sure you cum deep in $his pussy. $He leans back and massages $his taut stomach, savoring the sensation of your seed seeping into $him. "That's it, make me a mommy." $He leans in close and you pop free of $his snatch. "Be a good boy and make this arcology a nice place for your bastard. I want to retire in luxury." $He blows you a kiss as $he stuffs a plug up $his vagina, redresses and heads on $his way. By the time you loosen your bindings, $he is long gone.
+ "You really think I'd let you spoil my plans?" $He asks as $he grinds against you, making sure you cum deep in $his pussy. $He leans back and massages $his <<if $PC.ballsImplant > 2>>taut <</if>>stomach, savoring the sensation of your seed seeping into $him. "That's it, make me a mommy." $He leans in close and you pop free of $his snatch. "Be a good boy and make this arcology a nice place for your bastard. I want to retire in luxury." $He blows you a kiss as $he stuffs a plug up $his vagina, redresses and heads on $his way. By the time you loosen your bindings, $he is long gone.
<br><br>
It would be prudent to up security in your arcology, that or take a guard along when you leave the penthouse. You can't allow such an indignity to happen again, nor do you need the stress of a bastard trying to seize control of your estate when you want to retire, but you wouldn't mind having your way with $him if you get the chance.
<</if>>
@@ -320,18 +320,20 @@ While returning from a meeting with a prospective investor, an unfortunate wrong
You want $him to suffer for what $he tried to pull on you. You make sure $he is fully awake as $he is strapped into the autosurgery. You take great pleasure in watching $him struggle as $his limbs are taken, one by one. Of course, @@.red;$his health is affected@@ and the horrible experience has left $him @@.red;acting oddly.@@ After $he has stabilized, it's off to the penthouse for basic slave induction. You'd like to see $him try and touch you again without arms and legs.
<</replace>>
<</link>>
- <br><<link "Enslave the criminal and geld $him">>
- <<set $activeSlave.health -= 20>>
- <<set $activeSlave.balls = 0>>
- <<set $activeSlave.devotion -= 25>>
- <<set $activeSlave.trust -= 25>>
- <<run newSlave($activeSlave)>>
- <<run cashX(forceNeg($contractCost), "slaveTransfer", $activeSlave)>>
- <<replace "#result">>
- You want $him to suffer for what $he tried to pull on you. You make sure $he is fully awake as $he is strapped into the autosurgery, taking the time to roughly fondle $his balls. You take great pleasure in watching $him struggle as $his testicles are removed. Once $he can stand again, it's off to the penthouse for basic slave induction.
- <<include "New Slave Intro">>
- <</replace>>
- <</link>>
+ <<if $activeSlave.balls > 0>>
+ <br><<link "Enslave the criminal and geld $him">>
+ <<set $activeSlave.health -= 20>>
+ <<set $activeSlave.balls = 0>>
+ <<set $activeSlave.devotion -= 25>>
+ <<set $activeSlave.trust -= 25>>
+ <<run newSlave($activeSlave)>>
+ <<run cashX(forceNeg($contractCost), "slaveTransfer", $activeSlave)>>
+ <<replace "#result">>
+ You want $him to suffer for what $he tried to pull on you. You make sure $he is fully awake as $he is strapped into the autosurgery, taking the time to roughly fondle $his balls. You take great pleasure in watching $him struggle as $his testicles are removed. Once $he can stand again, it's off to the penthouse for basic slave induction.
+ <<include "New Slave Intro">>
+ <</replace>>
+ <</link>>
+ <</if>>
<</if>>
<<else>>
//You lack the necessary funds to enslave $him.//
diff --git a/src/pregmod/reMaleCitizenHookup.tw b/src/pregmod/reMaleCitizenHookup.tw
index b7855fa4b99..5ca29cd68ef 100644
--- a/src/pregmod/reMaleCitizenHookup.tw
+++ b/src/pregmod/reMaleCitizenHookup.tw
@@ -273,7 +273,7 @@ He's clearly attracted to you; even the most consummate actor would have difficu
You manage to take nearly three fourths of his load before it begins backflowing out of you. You swear he cums harder as he places his hands to your swelling middle, enjoying the growth until you grow taut and your belly button pops out. By the time you can't take any more, you look like you are ready to burst with triplets. "Damn girl, just how stretchy are you? I'm impressed." He helps you down, making sure to provide extra support for your massive, straining belly. He sensually massages it, coaxing as much cum from your hungry womb that he can. But in the end, he can only get you back to the size of a woman in her final trimester. You likely won't be returning to the party.
<<set $PC.cumTap++>>
<<else>>
- You manage to take his entire load without spilling a drop. You swear he cums harder as he places his hands to your swelling middle, enjoying the growth until you grow taut and your belly button pops out. By the time he's done, you look ready to birth octuplets. "I can't believe you took it all, incredible. Are you going to be ok?" He helps you down, making sure to provide extra support for your immense, straining belly. He sensually massages it, coaxing as much cum from your hungry womb that he can. But in the end, he can only get you back to the size of a woman in her final trimester. You likely won't be returning to the party.
+ You manage to take his entire load without spilling a drop. You swear he cums harder as he places his hands to your swelling middle, enjoying the growth until you grow taut and your belly button pops out. By the time he's done, you look ready to birth octuplets. "I can't believe you took it all; incredible. Are you going to be OK?" He helps you down, making sure to provide extra support for your immense, straining belly. He sensually massages it, coaxing as much cum from your hungry womb that he can. But in the end, he can only get you back to the size of a woman in her final trimester. You likely won't be returning to the party.
<<set $PC.cumTap++>>
<</if>>
<</if>>
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index 3318fa9ca9f..158df4aacd9 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -1,6 +1,8 @@
:: Next Week [nobr]
-<<if def $storedReturn>> <<run delete $storedReturn>> <</if>>
+<<if def $storedReturn>>
+ <<run delete $storedReturn>>
+<</if>>
<<run delete $storedLink>>
<<run delete $storedButton>>
<<set $HackingSkillMultiplier = HackingSkillMultiplier()>>
@@ -179,9 +181,6 @@
<<if $slaves[_i].vagina < 0>>
<<set $slaves[_i].vaginalAccessory = "none", $slaves[_i].chastityVagina = 0, $slaves[_i].vaginaPiercing = 0>>
<</if>>
- <<if $slaves[_i].clit < 0>>
- <<set $slaves[_i].clitPiercing = 0, $slaves[_i].clitSetting = "none">>
- <</if>>
<<if $slaves[_i].dick == 0>>
<<set $slaves[_i].dickAccessory = "none", $slaves[_i].chastityPenis = 0, $slaves[_i].dickTat = 0, $slaves[_i].dickPiercing = 0>>
<</if>>
diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw
index 77972cff8e4..a38442bde71 100644
--- a/src/uncategorized/persBusiness.tw
+++ b/src/uncategorized/persBusiness.tw
@@ -353,7 +353,7 @@
You focus on business and leverage your @@.springgreen;Free Cities experience@@ to make good money:
<<set _income += random(5000,10000) + Math.trunc(Math.min(4000 * Math.log($cash), $cash * 0.07))>>
<<else>>
- You focus on business this week and make money
+ You focus on business this week and make some money:
<<set _income += Math.trunc(Math.min(3500 * Math.log($cash), $cash * 0.07))>>
<</if>>
@@.yellowgreen;<<print cashFormat(_income)>>.@@
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 3ea1c19b6a4..21a3df46373 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -103,7 +103,7 @@
| <<link "Have $him dance for you">><<replace "#miniscene">><<include "FDance">><br> <</replace>><</link>>
<</if>>
<</if>>
- | <<link "Play with $his tits">><<replace "#miniscene">><<include "FBoobs">><br> <</replace>><</link>>
+ | <<link "Play with $his tits">><<replace "#miniscene">><<include "FBoobs">><br> <</replace>><</link>>
| <<link "Caress $him">><<replace "#miniscene">><<include "FCaress">><br> <</replace>><</link>>
| <<link "Give $him a hug">><<replace "#miniscene">><<include "FEmbrace">><br> <</replace>><</link>>
<<if $cheatMode == 1>>
@@ -346,8 +346,8 @@
| <<link "Abuse $his rival with $him">><<replace "#miniscene">><<include "FRival">><br> <</replace>><</link>>
<</if>>
<<if ($activeSlave.fetish != "mindbroken") && (($activeSlave.amp != 1) || ($activeSlave.voice != 0)) && $activeSlave.accent != 4>>
- | <<link "Ask $him about $his feelings">><<replace "#miniscene">><<include "FFeelings">><br> <</replace>><</link>>
- <<if $cheatMode == 1>>
+ | <<link "Ask $him about $his feelings">><<replace "#miniscene">><<include "FFeelings">><br> <</replace>><</link>>
+ <<if $cheatMode == 1>>
| <<link "Make $him beg">><<replace "#miniscene">><<include "FBeg">><br> <</replace>><</link>>
<</if>>
<</if>>
--
GitLab