diff --git a/compile-git b/compile-git
old mode 100644
new mode 100755
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index d97d68ce86058753478d97cc3d9fc5d55d1e8dfa..f7e6e51ea1c7d97225ef32c9d422c47162d09923 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,8 +2,32 @@
0.10.7.1-0.4.x
+7/07/2018
+
+ 19
+ -various little fixes and tweaks
+ -incubator slaves take longer to learn languages now
+
+7/05/2018
+
+ 18
+ -added anon's TFS path
+ -added a new choice to the TFS organ farm request event
+ -fixes
+
+7/04/2018
+
+ 17
+ -fixes, grammer and typo corrections
+ -added anon's FCNN blurbs
+
7/03/2018
+ 16
+ -fixes
+ -more widget to JS conversions
+ -nipple vectors
+
15
-fixes and typo corrections
-Deepmurk's Battlearmor, Biyelgee Costume, Dirndl, Lederhosen, Long Qipao/Qipao (Nice), and Mounty Outfit
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 117433181ad8ad7109fc390cf453a752ff4dca69..dc1895990c75a2078b0033a03c91ff1dfe2b35d8 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -1705,7 +1705,7 @@ window.Job = Object.freeze({
SERVANT: 'work as a servant', SERVER: 'be a servant', STEWARD: 'be the Stewardess', CLUB: 'serve in the club', DJ: 'be the DJ',
JAIL: 'be confined in the cellblock', WARDEN: 'be the Wardeness', CLINIC: 'get treatment in the clinic', NURSE: 'be the Nurse',
HGTOY: 'live with your Head Girl', SCHOOL: 'learn in the schoolroom', TEACHER: 'be the Schoolteacher', SPA: 'rest in the spa', ATTEND: 'be the Attendant'});
-window.PersonalAttention = Object.freeze({TRADE: 'trading', WAR: 'warfare', SLAVEING: 'slaving', ENGINEERING: 'engineering', MEDICINE: 'medicine', MAID: 'upkeep', HACKING: 'hacking'});
+window.PersonalAttention = Object.freeze({TRADE: 'trading', WAR: 'warfare', SLAVING: 'slaving', ENGINEERING: 'engineering', MEDICINE: 'medicine', MAID: 'upkeep', HACKING: 'hacking'});
window.getCost = function(array) {
var rulesCost = State.variables.rulesCost;
@@ -16129,13 +16129,14 @@ window.PartnerVCheck = function PartnerVCheck(analTimes, bothTimes) {
*/
window.SimpleSexAct = function SimpleSexAct(slave, count) {
const V = State.variables;
- const fuckTarget = jsRandom(1,100);
+ let fuckTarget = 0;
let fuckCount = 1;
let r = ``;
if (count) {
fuckCount = count;
}
for (var i = 0; i < fuckCount; i++) {
+ fuckTarget = jsRandom(1,100);
if (slave.nipples == "fuckable" && V.PC.dick === 1 && fuckTarget > 80) {
V.mammaryTotal += 1;
slave.mammaryCount += 1;
@@ -16170,12 +16171,13 @@ window.SimpleSexAct = function SimpleSexAct(slave, count) {
*/
window.SimpleSlaveFucking = function SimpleSlaveFucking(slave, count) {
const V = State.variables;
- const fuckTarget = jsRandom(1,100);
+ let fuckTarget = 0;
let fuckCount = 1;
if (count) {
fuckCount = count;
}
for (var i = 0; i < fuckCount; i++) {
+ fuckTarget = jsRandom(1,100);
if (slave.nipples == "fuckable" && fuckTarget > 80) {
V.mammaryTotal += 1;
slave.mammaryCount += 1;
@@ -16196,6 +16198,125 @@ window.SimpleSlaveFucking = function SimpleSlaveFucking(slave, count) {
return;
}
+/*
+ count is how many times to increment either the Vaginal, Anal, or Oral counts, depending on availability of slave.
+ If count is left undefined it will assume it to be 1.
+ Intended to be a simple "x got fucked y times by z and I don't want to keep coding it".
+*/
+window.SimpleSlaveSlaveFucking = function SimpleSlaveSlaveFucking(subslave, domslave, count) {
+ const V = State.variables;
+ let fuckTarget = 0;
+ let fuckCount = 1;
+ let r = ``;
+ if (count) {
+ fuckCount = count;
+ }
+ for (var j = 0; j < fuckCount; j++) {
+ //there is a reason randomization happens inside cycle - to spread fuck around, otherwise cycle isn't even needed
+ fuckTarget = jsRandom(1,100);
+ if (subslave.nipples === "fuckable" && canPenetrate(domslave) && fuckTarget > 80) {
+ if (passage() === "SA serve your other slaves") {
+ if (subslave.ID == V.slaves[V.i].ID) {
+ V.slaves[V.i].mammaryCount++;
+ V.mammaryTotal++;
+ domslave.penetrativeCount++;
+ V.penetrativeTotal++;
+ }
+ else {
+ subslave.mammaryCount++;
+ V.mammaryTotal++;
+ V.slaves[V.i].penetrativeCount++;
+ V.penetrativeTotal++;
+ }
+ }
+ else {
+ V.mammaryTotal++;
+ V.penetrativeTotal++;
+ subslave.mammaryCount++;
+ domslave.penetrativeCount++;
+ }
+ }
+ else if (canDoVaginal(subslave) && subslave.vagina > 0 && canPenetrate(domslave) && fuckTarget > 33) {
+ if (passage() === "SA serve your other slaves") {
+ if (subslave.ID == V.slaves[V.i].ID) {
+ V.slaves[V.i].vaginalCount++;
+ V.vaginalTotal++;
+ V.penetrativeTotal++;
+ domslave.penetrativeCount++;
+ }
+ else {
+ V.slaves[V.i].penetrativeCount++;
+ V.penetrativeTotal++;
+ subslave.vaginalCount++;
+ V.vaginalTotal++;
+ }
+ }
+ else {
+ V.vaginalTotal++;
+ subslave.vaginalCount++;
+ V.penetrativeTotal++;
+ domslave.penetrativeCount++;
+ }
+ if (canImpreg(subslave, domslave)) {
+ r += knockMeUp(subslave, 3, 0, domslave.ID, 1);
+ }
+ }
+ else if (canDoAnal(subslave) && subslave.anus > 0 && canPenetrate(domslave) && fuckTarget > 10) {
+ //i think would impregnate from anal here even without .mpreg? same in original widget too
+ if (canImpreg(subslave, domslave) && subslave.mpreg == 1) {
+ r += knockMeUp(subslave, 3, 1, domslave.ID, 1);
+ }
+ if (passage() === "SA serve your other slaves") {
+ if (subslave.ID == V.slaves[V.i].ID) {
+ V.slaves[V.i].analCount++;
+ V.analTotal++;
+ V.penetrativeTotal++;
+ domslave.penetrativeCount++;
+ }
+ else {
+ V.slaves[V.i].penetrativeCount++;
+ V.penetrativeTotal++;
+ V.analTotal++;
+ subslave.analCount++;
+ }
+ }
+ else {
+ V.analTotal++;
+ subslave.analCount++;
+ V.penetrativeTotal++;
+ domslave.penetrativeCount++;
+ }
+ }
+ else {
+ V.oralTotal++;
+ subslave.oralCount++;
+ }
+ }
+ return r;
+}
+
+window.SimpleVaginaFuck = function SimpleVaginaFuck(slave, count) {
+ if (count) {
+ State.variables.vaginalTotal += count;
+ slave.vaginalCount += count;
+ }
+ else {
+ State.variables.vaginalTotal++;
+ slave.vaginalCount++;
+ }
+}
+
+window.SimpleAssFuck = function SimpleAssFuck(slave, count) {
+ if (count) {
+ State.variables.analTotal += count;
+ slave.analCount += count;
+ }
+ else {
+ State.variables.analTotal++;
+ slave.analCount++;
+ }
+}
+
/*:: PenthouseNaming [script]*/
window.MS = function() {
diff --git a/sanityCheck b/sanityCheck
old mode 100644
new mode 100755
diff --git a/src/SecExp/secExpSmilingMan.tw b/src/SecExp/secExpSmilingMan.tw
index 59851f8e46cd199c1d4d38ae0e5767dc62e2b599..60cfa7f1cf7e3699f4a7409b94028660331ced6e 100644
--- a/src/SecExp/secExpSmilingMan.tw
+++ b/src/SecExp/secExpSmilingMan.tw
@@ -7,13 +7,13 @@
<<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event">>
<br>
- During your morning routine you stumble upon a peculiar report: it's been several weeks now that your arcology has been victim of a series of cyber-crimes conducted by a mysterious figure.
- The egocentric criminal took great pride in its acts, to the point of signing his acts with his or her peculiar symbol: a stylized smiling face. Your arcology was not the only one under assault by the
- machinations of what the media would quickly nicknamed //the smiling man//.
- <br>Despite the sheer damage this criminal was doing, you cannot help but admire the skill with which every misdeed is carried: the worst white collar crimes of the century carried out with such elegance
- they almost seemed the product of natural laws rather than masterful manipulation of the digital market.
- While you sift through the pages of the report, $assistantName remains strangely quiet. "I'm worried <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>sir<<else>>ma'am<</if>>, this individual seems to be able to penetrate whatever system gathers his attention. I... feel vulnerable" she said "It's not something I'm used to."
- <br>Fortunately you have not been hit directly by this criminal, not yet at least. Still the repercussions of numerous bankruptcies take their toll on your arcology, whose @@.red;prosperity suffers@@.
+ During your morning routine, you stumble upon a peculiar report: it's been several weeks now that your arcology has been victim of a series of cyber-crimes conducted by a mysterious figure.
+ The egocentric criminal took great pride in their acts, to the point of signing his acts with their peculiar symbol: a stylized smiling face. Your arcology was not the only one under assault by the
+ machinations of the one the media quickly nicknamed //the smiling man//.
+ <br>Despite the sheer damage this criminal was doing, you cannot help but admire the skill with which every misdeed is carried - the worst white collar crimes of the century, carried out with such elegance
+ that they almost seemed the product of natural laws, rather than the masterful manipulation of the digital market.
+ While you sift through the pages of the report, $assistantName remains strangely quiet. "I'm worried <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>sir<<else>>ma'am<</if>>, this individual seems to be able to penetrate whichever system garners his attention. I... feel vulnerable" she said "It's not something I'm used to."
+ <br>Fortunately you have not been hit directly by this criminal - not yet at least. Still, the repercussions of numerous bankruptcies take their toll on your arcology, whose @@.red;prosperity suffers@@.
<br><<set $arcologies[0].prosperity *= random(80,90) * 0.01>>
<br>
<span id="result">
@@ -25,17 +25,17 @@
<<set $relationshipLM += 1>>
<<set $smilingManProgress += 1>>
<<replace "#result">>
- You devote funds to capture and neutralize the threat. You cannot help but wonder what the end game of the laughing man is. Money? Fame? Or is he on an ideological crusade?
+ You devote funds to capture and neutralize the threat. You cannot help but wonder what the end game of this "smiling man" is. Money? Fame? Or is he on an ideological crusade?
<</replace>>
<</link>>
<br>
- <<link "Attempt to contact the mysterious figure, whatever it takes">>
+ <<link "Attempt to contact the mysterious figure">>
<<set $cash -= 10000>>
<<set $investedFunds = 1>>
<<set $relationshipLM += 2>>
<<set $smilingManProgress += 1>>
<<replace "#result">>
- You devote funds to the attempt at communicating with the smiling man. You cannot help but wonder what the end game of the laughing man is. Money? Fame? Or is he on an ideological crusade?
+ You devote funds to an attempt at communicating with the smiling man. You cannot help but wonder what the end game of this "smiling man" is. Money? Fame? Or is he on an ideological crusade?
<</replace>>
<</link>>
<br>
@@ -45,7 +45,7 @@
<<set $relationshipLM += random(5,10)>>
<<set $smilingManProgress += 1>>
<<replace "#result">>
- You devote funds to the improvement of the cyber-security of your arcology. You cannot help but wonder what the end game of the laughing man is. Money? Fame? Or is he on an ideological crusade?
+ You devote funds to the improvement of the cyber-security of your arcology. You cannot help but wonder what the end game of this "smiling man" is. Money? Fame? Or is he on an ideological crusade?
<</replace>>
<</link>>
<<else>>
@@ -63,25 +63,25 @@
<<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event">>
<br>
- You just reached your penthouse, when your faithful assistant appears in front of you, evidently excited.
- "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, I have just received news of a new attack by the Smiling Man. It appears just a few hours ago he infiltrated another arcology and caused a catastrophic failure of its power plant.
+ You have just reached your penthouse when your faithful assistant appears in front of you, evidently excited.
+ "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, I have just received news of a new attack by the Smiling Man. It appears a few hours ago he infiltrated another arcology and caused a catastrophic failure of its power plant.
Between old debts and the loss of value for his shares, the owner went bankrupt in minutes. It seems the Smiling Man managed to keep a small auxiliary generator functioning enough to project a giant holographic picture of his symbol on the arcology's walls.
- You can say whatever you want about him, but he has style... Anyway this opens up a great opportunity to gain control of the structure for ourselves."
+ Say what you will about his actions, but you can't deny he has style... Anyways, this opens up a great opportunity to gain control of the structure for ourselves."
It is indeed a great opportunity, one you cannot resist. You quickly organize the affair and in a few minutes a message reaches your assistant.
- <br>"Should I open it?" asks. You silently nod.
- <br>Suddenly the room flashes red, while your assistant fades for half a second. When it reappears her face was replaced by a stylized smiling face.
- <br>"Hello, my dear $PC.name. Can I call you by name, right? I've been keeping an eye on you for so long now, it feels like we're friends! I am terribly sorry for my unannounced visit, but I wanted to meet face to face... well face to hologram." said while letting out a very childlike giggle.
- "You see I'm sure you're aware of my recent activities around this rock of ours and... well to put it simply it's your turn to contribute to my great project! Oh you'll love it when you see it, I'm sure! By the way, thanks for the offer, it's so nice to see people contribute to a worthy cause so generously! Well I've taken enough of your time, see you soon!"
- <br>The lights flickered once more and an instant later your assistant returned to her usual self.
- <br>"I... I... I couldn't stop him! I'm sorry <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>sir<<else>>ma'am<</if>>."
- <br>Without wasting time you rush the console and check your finances. It's as you feared, @@.red;you have been robbed@@.
+ <br>"Should I open it?" your assistant asks. You silently nod.
+ <br>Suddenly the room flashes red, while your assistant fades for half a second. When she reappears, her face has been replaced by a stylized smiling face.
+ <br>"Hello, my dear $PC.name. I can call you $PC.name, right? I've been keeping an eye on you for so long now, it feels like we're friends! I am terribly sorry for my unannounced visit, but I wanted to meet face to face... well, face to hologram." its says, letting out a childlike giggle.
+ "I'm sure you're aware of my recent activities around this rock of ours, and, well, to put it simply, it's your turn to contribute to my great project! You'll love it when you see it, I'm sure! By the way, thanks for the offer - it's so nice to see people contribute to a worthy cause so generously! Well, I've taken enough of your time, see you soon!"
+ <br>The lights flicker once more and an instant later your assistant returns to her usual self.
+ <br>"I... I - I couldn't stop him! I'm sorry, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>sir<<else>>ma'am<</if>>."
+ <br>You waste no time in rushing to the console and checking your finances. It's as you feared, @@.red;you have been robbed@@.
<<set _lostCash = Math.clamp(50000 * Math.trunc($week / 20), 50000, 1000000)>>
<<if $assistantPower == 1>>
<<set _lostCash -= 20000>>
- <br>Fortunately the computing power available to $assistantName allowed her to somewhat limit the losses.
+ <br>Fortunately, the computing power available to $assistantName allowed her to somewhat limit the losses.
<<elseif $assistantPower == 2>>
<<set _lostCash -= 30000>>
- <br>Fortunately the computing power available to $assistantName allowed her to limit the losses.
+ <br>Fortunately, the computing power available to $assistantName allowed her to limit the losses.
<</if>>
<<if $secUpgrades.cyberBots == 1>>
<<set _lostCash -= 30000>>
@@ -89,7 +89,7 @@
<</if>>
<<if $investedFunds == 1>>
<<set _lostCash -= 20000>>
- The funding you dedicated to the Smiling Man case saved some of the assets that would have otherwise lost.
+ The funding you dedicated to the Smiling Man case saved some of the assets that would have been otherwise lost.
<</if>>
<<set $cash -= _lostCash>>
<br>
@@ -112,7 +112,7 @@
<</replace>>
<</link>>
<br>
- <<link ""If we don't find him soon we will regret it."">>
+ <<link ""If we don't find him soon, we will regret it."">>
<<set $relationshipLM += 2>>
<<set $smilingManProgress += 1>>
<<replace "#result">>
@@ -120,7 +120,7 @@
<</replace>>
<</link>>
<br>
- <<link ""He got what he wanted, hopefully we will be left in peace."">>
+ <<link ""He got what he wanted. Hopefully, we will be left in peace."">>
<<set $smilingManProgress += 1>>
<<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event">>
<<replace "#result">>
@@ -133,31 +133,31 @@
<br>
<<set $smilingManWeek = $week>>
- When $assistantName wakes you up violently, her worried expression can mean only one thing: the smiling man was back. "Today at midnight a new site popped up in the web: it's a very simple site, no visuals, no text, no data, only a countdown ticking away. It will reach zero this evening." said.
- This is troubling yet exciting news. The smiling man never failed to cause damage, but his ego got the best of him this time: having time to prepare before its attack will give you a chance to find him. For the rest of the day you do your best to plan, prepare and focus.
+ When $assistantName violently wakes you up, her worried expression can mean only one thing: the Smiling Man had been back. "Today at midnight a new site popped up in the web: it's a very simple site, no visuals, no text; only a countdown ticking away. It will reach zero this evening." your assistant says.
+ This is troubling, yet somewhat exciting. The Smiling Man never failed to cause damage, but his ego had gotten the best of him this time - having time to prepare before their attack will give you a chance to find them. For the rest of the day you do your best to plan, prepare and focus.
<br>
- <br>Evening came faster than you anticipated, by now your security team was already at full alert, waiting for any signal on the horizon. The die was cast.
- <br>Suddenly all the computers in the room start acting weirdly, then it happened. On all screens in all the arcology the smiling man icon appeared, then every speaker started broadcasting the same voice, one that you already heard once before:
- <br>"Hello citizens of Earth! I am here in this special day to relay to you a very important message: we find ourselves in very peculiar times, times of strife and suffering! But also of change and regeneration! Indeed I say humanity is regenerating itself, turning into a new being for which the
- ideals of the old world no longer hold meaning. A new blank page from which humanity can start to prosper again.
- <br>Alas my friends not all is good, as in this rebirth a great injustice is being perpetrated. If we truly want to ascend to this new form of humanity the old must give space to the new. If we must cleanse our mind of old ideas, our world must cleanse itself of them as well.
- It's to fix this injustice that I worked so hard all this time! To cleanse the world of the old, we must get rid of our precious, precious data. At the end of this message every digital device will see its memory erased, every archive cleaned, every drive deleted.
+ <br>Evening came faster than you anticipated. Your security team was already at full alert, waiting for any signal on the horizon. The die was cast.
+ <br>Suddenly all the computers in the room begin to act strangely, then it happened. On all of the screens across the arcology the Smiling Man's icon appears, then every speaker begins broadcasting the same voice, one that you have already heard once before:
+ <br>"Hello citizens of $arcologies[0].name! I am here on this special day to relay to you a very important message: we find ourselves in very peculiar times, times of strife and suffering! But these are also times of change and regeneration! Indeed, I say humanity itself is regenerating, turning into a new being for which the
+ ideals of the old world no longer hold meaning. A new blank page from which humanity can begin to prosper again.
+ <br>Alas, my friends, not all is good, as in this rebirth a great injustice is being perpetrated. If we truly want to ascend to this new form of humanity the old must give way to the new. If we must cleanse our mind of old ideas, our world must cleanse itself of them as well.
+ It's to fix this injustice, that I worked so hard all this time! To cleanse the world of the old, we must get rid of our precious, precious data. At the end of this message every digital device will see its memory erased, every archive cleaned, every drive deleted.
<br>It will be a true rebirth! A true new beginning! No longer will the chains of the past keep humanity anchored!"
<br>The voice stopped for a second.
- <br>"Have a good day." simply concluded, then it happened.
- <br>In little more than seconds all the data collected in the years vanished. It is a disaster.
+ <br>"Have a good day." it simply concluded, then it happened.
+ <br>In little more than seconds all the data collected in the years past vanished. It's a disaster.
<<if $cash < 0>>
- The vast majority of currency is digital, so the actions of the smiling man have a devastating effect on the money supply. Luckily for you this means that your @@.yellowgreen;debt is reduced@@.
+ The vast majority of currency is digital, so the actions of the Smiling Man have a devastating effect on the money supply. Luckily for you this means that your @@.yellowgreen;debt is reduced@@.
<<set $cash *= 0.2>>
<<else>>
- The vast majority of currency is digital, so the actions of the smiling man have a devastating effect on the money supply. Unfortunately this means that your @@.red;cash reserves are gutted@@.
+ The vast majority of currency is digital, so the actions of the Smiling Man have a devastating effect on the money supply. Unfortunately this means that your @@.red;cash reserves are gutted@@.
<<set $cash *= 0.2>>
<</if>>
You are not the only one affected by this however. @@.red;The economy of the entire world is severely affected@@ by the loss of vast quantities of currency. Who knows how long will it take for the global economy to recover.
<<set $globalCrisisWeeks = random(8,16)>>
Trade is @@.red;severely affected@@.
<<set $trade *= 0.2>>
- With the loss of so much information, most of your accomplishments are simply forgotten, @@.red;your reputation suffers.@@
+ With the loss of so much information, most of your accomplishments are simply forgotten, so @@.red;your reputation suffers.@@
<<set $rep *= 0.6>>
<<if $arcologies[0].ownership >= 60>>
<<if $authority <= 10000>>
@@ -192,13 +192,13 @@
<<if $secUpgrades.coldstorage > 3>>
Your cold storage facility has ensured that the Smiling Man's destruction of the primary archives was unable to damage the security of your arcology.
<<elseif $secUpgrades.coldstorage == 0>>
- Your security department sees its archives butchered by the Smiling Man. Almost all data on criminals, citizens, operations, all lost. The @@.red;security of the arcology is greatly reduced@@. Criminals on the other hand, with their past cleansed, cannot wait to join this new world, @@.red;crime will inevitably increase@@.
+ Your security department sees its archives butchered by the Smiling Man. Almost all data on criminals, citizens, and operations are lost. The @@.red;security of the arcology is greatly reduced@@. Criminals, on the other hand, with their past erased, cannot wait to join this new world, so @@.red;crime will inevitably increase@@.
<<set $security = Math.clamp($security * 0.2,0,100)>>
<<set $crime = Math.clamp($crime * 1.5, 20,100)>>
<</if>>
- <br>A short meek man approaches you with a weak smile. "Not all is lost, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>sir<<else>>ma'am<</if>>. We have a lead on him: he is here, in $arcologies[0].name."
- <br>Despite the bleak situation, you could not help but smile back.
+ <br>A short, meek man approaches you with a weak smile. "Not all is lost, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>sir<<else>>ma'am<</if>>. We have a lead on him - he is here, in $arcologies[0].name."
+ <br>Despite the bleak situation, you cannot help but smile back.
<br>
<br>
<span id="result">
@@ -219,7 +219,7 @@
<</replace>>
<</link>>
<br>
- <<link ""Such skill on my side would be a great boon, find him."">>
+ <<link ""Such skill on my side would be a great boon. Find him."">>
<<set $relationshipLM += 2>>
<<set $smilingManProgress += 1>>
<<replace "#result">>
@@ -227,7 +227,7 @@
<</replace>>
<</link>>
<br>
- <<link ""He finally had what he always wanted. Let him have is victory, we have better things to do."">>
+ <<link ""He finally got what he always wanted. Let him have his victory, we have better things to do."">>
<<set $smilingManProgress += 1>>
<<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event">>
<<replace "#result">>
@@ -239,25 +239,25 @@
<<set $nextButton = " ">>
<br>
- The day has come to finally put an end to this story. Your men are ready to go, waiting only your signal. You quickly don your protective gear and proceed down the busy streets of your arcology.
- You carefully planned the day so that nothing could exit the arcology without being scanned at least three times and poked twice. The smiling man has no escape.
+ The day has come to finally put an end to this story. Your men are ready to go, waiting only on your signal. You quickly don your protective gear and proceed down the busy streets of your arcology.
+ You carefully planned the day so that nothing could exit the arcology without being scanned at least three times and poked twice. The Smiling Man has no escape.
<br>After a short walk you are in front of the criminal's lair, an rundown old apartment in a scarcely populated part of the arcology. You give the order to breach and your men rush inside without problems.
- After a couple of seconds pass without a single noise coming out of the apartment, you start to worry, when you hear the captain calling you inside.
+ After a couple of seconds pass without a single noise coming from the apartment, you begin to worry. Then you hear the captain calling you inside.
<br>"So it was you to find me first.
<<if $relationshipLM > 2>>
I was hoping you would be the one!
<<else>>
I expected you would be the one.
<</if>>
- Well I hope I am everything you expected" said. Despite recognizing the quirky voice you struggle to convince yourself that the little girl in front of you is indeed the famous international criminal.
- "As you can see I have no intention of escaping. I knew my life was over the second my plan would start. I accepted my end a long time ago, so feel free to do your worst; my life has already ended in triumph."
- <br>You evaluate the situation: the burning desire of vengeance for all the damage that little twerp caused is hard to ignore, but it's equally so the admiration for her skill and determination. Indeed she would be a great addition to your court, as free individual or not.
+ "Well, I hope I'm everything you expected," you hear a voice say. Despite recognizing it, you struggle to convince yourself that the little girl in front of you is indeed the famous criminal mastermind.
+ "As you can see, I have no intention of escaping. I knew my life was over the second my plan went into effect. I accepted my end a long time ago, so feel free to do your worst; my life has already ended in triumph."
+ <br>You evaluate the situation: the burning desire of vengeance for all the damage that little twerp caused is hard to ignore, but equally so is the admiration for her skill and determination. Indeed, she would be a great addition to your court, as a free individual or not.
<br>
<br>
<<link "Offer her a new life">>
<<set $smilingManFate = 0>>
<<replace "#result">>
- You decide it would a criminally wasteful to throw away such talent. You offer her a new life at your side. Her expertise will surely guarantee safety, if not supremacy to your arcology in cyberspace, while she will have safety and luxury in the physical world.
+ You decide it would a criminally wasteful to throw away such talent. You offer her a new life at your side. Her expertise will surely guarantee safety, if not supremacy, to your arcology in cyberspace, while she will have safety and luxury in the physical world.
<br>
<<link "Continue">>
<<set $smilingManProgress += 1>>
@@ -269,7 +269,7 @@
<<link "Make her pay">>
<<set $smilingManFate = 1>>
<<replace "#result">>
- You decide to end her pitiful life. She has crossed the wrong master of the new world she worked so hard to create. No mercy was asked and no mercy will be given.
+ You decide to end her pitiful life. She has crossed the wrong master of the new world she worked so hard to create. No mercy was asked for and no mercy will be given.
<br>
<<link "Continue">>
<<set $smilingManProgress += 1>>
@@ -281,7 +281,7 @@
<<link "Enslave her">>
<<set $smilingManFate = 2>>
<<replace "#result">>
- You decide to enslave the girl. Her skill may be great, her crimes equally so, but that makes is all so much sweeter to turn her into an obedient little toy to play with.
+ You decide to enslave the girl. Her skill may be great, her crimes equally so, which makes it all the sweeter to turn her into an obedient little toy to play with.
<br>
<<link "Continue">>
<<set $smilingManProgress += 1>>
@@ -299,22 +299,22 @@
<<if $smilingManFate == 0>>
<<if $relationshipLM >= 4>>
- The girl asks for a few minutes to think about your offer, but she quickly comes to terms with the situation and accepts. In the following weeks she will get acquainted with the security network of the arcology and work to protect her new home in the new world she created.
- The world at large will never find out what was the end of the Smiling Man and his legend will only grow with the years, outliving his creator and maybe even her new employer.
+ The girl asks for a few minutes to think about your offer, but she quickly comes to terms with the situation and accepts. In the following weeks she will get acquainted with the security network of the arcology and work to protect her new home in the new world she has created.
+ The world will never find out the truth of the Smiling Man and his legend will only grow with time, outliving his creator and maybe even her new employer.
<<else>>
- The girl asks for a few minutes to think about your offer and after some time she reluctantly accepts. In the following weeks she will get acquainted with the security network of the arcology and work to protect her new home in the new world she created.
- The world at large will never find out what was the end of the Smiling Man and his legend will only grow with the years, outliving his creator and maybe even her new employer.
+ The girl asks for a few minutes to think about your offer, and after some time she reluctantly accepts. In the following weeks she will get acquainted with the security network of the arcology and work to protect her new home in the new world she has created.
+ The world will never find out the truth of the Smiling Man and his legend will only grow with time, outliving his creator and maybe even her new employer.
<</if>>
- <br>The collaboration of the ex-Smiling Man permanently increases @@.green;security and the rate of prosperity growth@@. Also from time to time @@.limegreen;cash will be provided@@, however it is better not to know the sources.
+ <br>The collaboration of the ex-Smiling Man permanently increases @@.green;security and the rate of prosperity growth@@. @@.limegreen;Cash will be also provided@@, but you're better off not knowing the sources.
<<elseif $smilingManFate == 1>>
- For such a criminal a simple execution is not enough. You order the girl captured and crucified outside the city, with a mask resembling her famous symbol. Your men quickly obey. She never once showed sign of pain or fear, remaining stoic and proud to the end.
- Once her life ended you ordered a statue erected in commemoration of the death of the Smiling Man. From this day forward the statue of the crucified criminal will adorn your arcology and his legend will be forever entangled with yours.
- <br>Having dealt with the Smiling Man will provide @@.green;a moderate amount of reputation each week as well as an large immediate bonus@@.
+ For such a criminal a simple execution is not enough. You order the girl captured and crucified outside the city, with a mask resembling her famous symbol. Your men quickly obey. She never once shows sign of pain or fear, remaining stoic and proud to the end.
+ Once her life ends, you order a statue erected in commemoration of the death of the Smiling Man. From this day forward the statue of the crucified criminal will adorn your arcology and his legend will be forever entangled with yours.
+ <br>Having dealt with the Smiling Man will provide @@.green;a large boost to your reputation, as well as a moderate amount of reputation each week@@.
<<elseif $smilingManFate == 2>>
<<if $relationshipLM >= 4>>
- Your men move to immobilize her. Terror flashes through her eyes for a second, but she quickly recovers her usual attitude.
+ Your men move to immobilize her. Terror flashes through her eyes for a second, but she quickly recovers her usual demeanor.
<<else>>
- Your men move to immobilize her. Terror flashes through her eyes for a second, she barely manages to recover her usual attitude.
+ Your men move to immobilize her. Terror flashes through her eyes for a second - she barely manages to recover her usual demeanor.
<</if>>
<<include "Generate XX Slave">>
<<set $activeSlave.origin = "She was a criminal mastermind, captured shortly after completing her master plan.">>
diff --git a/src/art/vector/Arm.tw b/src/art/vector/Arm.tw
index 9887c4f42eab0c9dd072cb5bd88119330f771f91..b5f5872d76ee199953e453ea8ad3c7297930d91f 100644
--- a/src/art/vector/Arm.tw
+++ b/src/art/vector/Arm.tw
@@ -93,664 +93,25 @@
/* TODO: simplify selection (select prefix, infix and suffix and combine instead of using switch statemens) */
-<<if _artSlave.clothes == "a slave gown">>
+<<switch _artSlave.clothes>>
+
+<<case "a hijab and abaya" "cutoffs and a t-shirt" "battledress" "conservative clothing" "a huipil" "a kimono" "a nice maid outfit" "a military uniform" "a nice nurse outfit" "a slutty nurse outfit" "a schoolgirl outfit" "Western clothing" "a slutty qipao" "nice business attire" "slutty business attire" "a schutzstaffel uniform" "a slutty schutzstaffel uniform" "a red army uniform" "slutty jewelry" "a cheerleader outfit" "clubslut netting" "battlearmor" "a dirndl" "a biyelgee costume" "lederhosen" "a mounty outfit" "a long qipao">>
+ <<set _rightArmArt = "Art_Vector_Arm_Outfit_" + clothing2artSuffix(_artSlave.clothes) + "_Right_" + _rightArmType>>
+ <<set _leftArmArt = "Art_Vector_Arm_Outfit_" + clothing2artSuffix(_artSlave.clothes) + "_Left_" + _leftArmType>>
+ <<include _rightArmArt>>
+ <<include _leftArmArt>>
+
+<<case "a slave gown">>
/* only some arm positions have art (feel free to add more) */
<<switch _leftArmType>>
<<case "High">>
<<include Art_Vector_Arm_Outfit_SlaveGown_Left_High>>
<<case "Mid">>
- <<include Art_Vector_Arm_Outfit_SlaveGown_Left_Mid>>
+ <<include Art_Vector_Arm_Outfit_SlaveGown_Left_Mid>>
<<case "Low">>
<<include Art_Vector_Arm_Outfit_SlaveGown_Left_Low>>
<<default>>
/* no art for this arm position */
<</switch>>
-<</if>>
-
-<<if _artSlave.clothes == "a hijab and abaya">>
- <<if _leftArmType == "High">>
- <<include Art_Vector_Arm_Outfit_Hijab_Left_High>>
- <<elseif _leftArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_Hijab_Left_Mid>>
- <<elseif _leftArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_Hijab_Left_Low>>
- <<elseif _leftArmType == "Rebel">>
- <<include Art_Vector_Arm_Outfit_Hijab_Left_Rebel>>
- <<elseif _rightArmType == "Thumb Down">>
- <<include Art_Vector_Arm_Outfit_Hijab_Left_Thumb>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "a hijab and abaya">>
- <<if _rightArmType == "High">>
- <<include Art_Vector_Arm_Outfit_Hijab_Right_High>>
- <<elseif _rightArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_Hijab_Right_Mid>>
- <<elseif _rightArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_Hijab_Right_Low>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "cutoffs and a t-shirt">>
- <<if _leftArmType == "High">>
- <<include Art_Vector_Arm_Outfit_Cutoffs_Left_High>>
- <<elseif _leftArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_Cutoffs_Left_Mid>>
- <<elseif _leftArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_Cutoffs_Left_Low>>
- <<elseif _leftArmType == "Rebel">>
- <<include Art_Vector_Arm_Outfit_Cutoffs_Left_Rebel>>
- <<elseif _rightArmType == "Thumb Down">>
- <<include Art_Vector_Arm_Outfit_Cutoffs_Left_Thumb>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "cutoffs and a t-shirt">>
- <<if _rightArmType == "High">>
- <<include Art_Vector_Arm_Outfit_Cutoffs_Right_High>>
- <<elseif _rightArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_Cutoffs_Right_Mid>>
- <<elseif _rightArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_Cutoffs_Right_Low>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "battledress">>
- <<if _leftArmType == "High">>
- <<include Art_Vector_Arm_Outfit_Battledress_Left_High>>
- <<elseif _leftArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_Battledress_Left_Mid>>
- <<elseif _leftArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_Battledress_Left_Low>>
- <<elseif _leftArmType == "Rebel">>
- <<include Art_Vector_Arm_Outfit_Battledress_Left_Rebel>>
- <<elseif _rightArmType == "Thumb Down">>
- <<include Art_Vector_Arm_Outfit_Battledress_Left_Thumb>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "battledress">>
- <<if _rightArmType == "High">>
- <<include Art_Vector_Arm_Outfit_Battledress_Right_High>>
- <<elseif _rightArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_Battledress_Right_Mid>>
- <<elseif _rightArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_Battledress_Right_Low>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "conservative clothing">>
- <<if _leftArmType == "High">>
- <<include Art_Vector_Arm_Outfit_Conservative_Left_High>>
- <<elseif _leftArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_Conservative_Left_Mid>>
- <<elseif _leftArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_Conservative_Left_Low>>
- <<elseif _leftArmType == "Rebel">>
- <<include Art_Vector_Arm_Outfit_Conservative_Left_Rebel>>
- <<elseif _rightArmType == "Thumb Down">>
- <<include Art_Vector_Arm_Outfit_Conservative_Left_Thumb>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "conservative clothing">>
- <<if _rightArmType == "High">>
- <<include Art_Vector_Arm_Outfit_Conservative_Right_High>>
- <<elseif _rightArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_Conservative_Right_Mid>>
- <<elseif _rightArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_Conservative_Right_Low>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "a huipil">>
- <<if _leftArmType == "High">>
- <<include Art_Vector_Arm_Outfit_Huipil_Left_High>>
- <<elseif _leftArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_Huipil_Left_Mid>>
- <<elseif _leftArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_Huipil_Left_Low>>
- <<elseif _leftArmType == "Rebel">>
- <<include Art_Vector_Arm_Outfit_Huipil_Left_Rebel>>
- <<elseif _rightArmType == "Thumb Down">>
- <<include Art_Vector_Arm_Outfit_Huipil_Left_Thumb>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "a huipil">>
- <<if _rightArmType == "High">>
- <<include Art_Vector_Arm_Outfit_Huipil_Right_High>>
- <<elseif _rightArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_Huipil_Right_Mid>>
- <<elseif _rightArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_Huipil_Right_Low>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "a kimono">>
- <<if _leftArmType == "High">>
- <<include Art_Vector_Arm_Outfit_Kimono_Left_High>>
- <<elseif _leftArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_Kimono_Left_Mid>>
- <<elseif _leftArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_Kimono_Left_Low>>
- <<elseif _leftArmType == "Rebel">>
- <<include Art_Vector_Arm_Outfit_Kimono_Left_Rebel>>
- <<elseif _rightArmType == "Thumb Down">>
- <<include Art_Vector_Arm_Outfit_Kimono_Left_Thumb>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "a kimono">>
- <<if _rightArmType == "High">>
- <<include Art_Vector_Arm_Outfit_Kimono_Right_High>>
- <<elseif _rightArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_Kimono_Right_Mid>>
- <<elseif _rightArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_Kimono_Right_Low>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "a nice maid outfit">>
- <<if _leftArmType == "High">>
- <<include Art_Vector_Arm_Outfit_NiceMaid_Left_High>>
- <<elseif _leftArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_NiceMaid_Left_Mid>>
- <<elseif _leftArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_NiceMaid_Left_Low>>
- <<elseif _leftArmType == "Rebel">>
- <<include Art_Vector_Arm_Outfit_NiceMaid_Left_Rebel>>
- <<elseif _rightArmType == "Thumb Down">>
- <<include Art_Vector_Arm_Outfit_NiceMaid_Left_Thumb>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "a nice maid outfit">>
- <<if _rightArmType == "High">>
- <<include Art_Vector_Arm_Outfit_NiceMaid_Right_High>>
- <<elseif _rightArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_NiceMaid_Right_Mid>>
- <<elseif _rightArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_NiceMaid_Right_Low>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "a military uniform">>
- <<if _leftArmType == "High">>
- <<include Art_Vector_Arm_Outfit_MilitaryUniform_Left_High>>
- <<elseif _leftArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_MilitaryUniform_Left_Mid>>
- <<elseif _leftArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_MilitaryUniform_Left_Low>>
- <<elseif _leftArmType == "Rebel">>
- <<include Art_Vector_Arm_Outfit_MilitaryUniform_Left_Rebel>>
- <<elseif _rightArmType == "Thumb Down">>
- <<include Art_Vector_Arm_Outfit_MilitaryUniform_Left_Thumb>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "a military uniform">>
- <<if _rightArmType == "High">>
- <<include Art_Vector_Arm_Outfit_MilitaryUniform_Right_High>>
- <<elseif _rightArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_MilitaryUniform_Right_Mid>>
- <<elseif _rightArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_MilitaryUniform_Right_Low>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "a nice nurse outfit">>
- <<if _leftArmType == "High">>
- <<include Art_Vector_Arm_Outfit_NiceNurse_Left_High>>
- <<elseif _leftArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_NiceNurse_Left_Mid>>
- <<elseif _leftArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_NiceNurse_Left_Low>>
- <<elseif _leftArmType == "Rebel">>
- <<include Art_Vector_Arm_Outfit_NiceNurse_Left_Rebel>>
- <<elseif _rightArmType == "Thumb Down">>
- <<include Art_Vector_Arm_Outfit_NiceNurse_Left_Thumb>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "a nice nurse outfit">>
- <<if _rightArmType == "High">>
- <<include Art_Vector_Arm_Outfit_NiceNurse_Right_High>>
- <<elseif _rightArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_NiceNurse_Right_Mid>>
- <<elseif _rightArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_NiceNurse_Right_Low>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "a slutty nurse outfit">>
- <<if _leftArmType == "High">>
- <<include Art_Vector_Arm_Outfit_SluttyNurse_Left_High>>
- <<elseif _leftArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_SluttyNurse_Left_Mid>>
- <<elseif _leftArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_SluttyNurse_Left_Low>>
- <<elseif _leftArmType == "Rebel">>
- <<include Art_Vector_Arm_Outfit_SluttyNurse_Left_Rebel>>
- <<elseif _rightArmType == "Thumb Down">>
- <<include Art_Vector_Arm_Outfit_SluttyNurse_Left_Thumb>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "a slutty nurse outfit">>
- <<if _rightArmType == "High">>
- <<include Art_Vector_Arm_Outfit_SluttyNurse_Right_High>>
- <<elseif _rightArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_SluttyNurse_Right_Mid>>
- <<elseif _rightArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_SluttyNurse_Right_Low>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "a schoolgirl outfit">>
- <<if _leftArmType == "High">>
- <<include Art_Vector_Arm_Outfit_Schoolgirl_Left_High>>
- <<elseif _leftArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_Schoolgirl_Left_Mid>>
- <<elseif _leftArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_Schoolgirl_Left_Low>>
- <<elseif _leftArmType == "Rebel">>
- <<include Art_Vector_Arm_Outfit_Schoolgirl_Left_Rebel>>
- <<elseif _rightArmType == "Thumb Down">>
- <<include Art_Vector_Arm_Outfit_Schoolgirl_Left_Thumb>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "a schoolgirl outfit">>
- <<if _rightArmType == "High">>
- <<include Art_Vector_Arm_Outfit_Schoolgirl_Right_High>>
- <<elseif _rightArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_Schoolgirl_Right_Mid>>
- <<elseif _rightArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_Schoolgirl_Right_Low>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "Western clothing">>
- <<if _leftArmType == "High">>
- <<include Art_Vector_Arm_Outfit_Western_Left_High>>
- <<elseif _leftArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_Western_Left_Mid>>
- <<elseif _leftArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_Western_Left_Low>>
- <<elseif _leftArmType == "Rebel">>
- <<include Art_Vector_Arm_Outfit_Western_Left_Rebel>>
- <<elseif _rightArmType == "Thumb Down">>
- <<include Art_Vector_Arm_Outfit_Western_Left_Thumb>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "Western clothing">>
- <<if _rightArmType == "High">>
- <<include Art_Vector_Arm_Outfit_Western_Right_High>>
- <<elseif _rightArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_Western_Right_Mid>>
- <<elseif _rightArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_Western_Right_Low>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "a slutty qipao">>
- <<if _leftArmType == "High">>
- <<include Art_Vector_Arm_Outfit_SluttyQipao_Left_High>>
- <<elseif _leftArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_SluttyQipao_Left_Mid>>
- <<elseif _leftArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_SluttyQipao_Left_Low>>
- <<elseif _leftArmType == "Rebel">>
- <<include Art_Vector_Arm_Outfit_SluttyQipao_Left_Rebel>>
- <<elseif _rightArmType == "Thumb Down">>
- <<include Art_Vector_Arm_Outfit_SluttyQipao_Left_Thumb>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "a slutty qipao">>
- <<if _rightArmType == "High">>
- <<include Art_Vector_Arm_Outfit_SluttyQipao_Right_High>>
- <<elseif _rightArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_SluttyQipao_Right_Mid>>
- <<elseif _rightArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_SluttyQipao_Right_Low>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "nice business attire">>
- <<if _leftArmType == "High">>
- <<include Art_Vector_Arm_Outfit_NiceBusinessAttire_Left_High>>
- <<elseif _leftArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_NiceBusinessAttire_Left_Mid>>
- <<elseif _leftArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_NiceBusinessAttire_Left_Low>>
- <<elseif _leftArmType == "Rebel">>
- <<include Art_Vector_Arm_Outfit_NiceBusinessAttire_Left_Rebel>>
- <<elseif _rightArmType == "Thumb Down">>
- <<include Art_Vector_Arm_Outfit_NiceBusinessAttire_Left_Thumb>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "nice business attire">>
- <<if _rightArmType == "High">>
- <<include Art_Vector_Arm_Outfit_NiceBusinessAttire_Right_High>>
- <<elseif _rightArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_NiceBusinessAttire_Right_Mid>>
- <<elseif _rightArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_NiceBusinessAttire_Right_Low>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "slutty business attire">>
- <<if _leftArmType == "High">>
- <<include Art_Vector_Arm_Outfit_SluttyBusinessAttire_Left_High>>
- <<elseif _leftArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_SluttyBusinessAttire_Left_Mid>>
- <<elseif _leftArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_SluttyBusinessAttire_Left_Low>>
- <<elseif _leftArmType == "Rebel">>
- <<include Art_Vector_Arm_Outfit_SluttyBusinessAttire_Left_Rebel>>
- <<elseif _rightArmType == "Thumb Down">>
- <<include Art_Vector_Arm_Outfit_SluttyBusinessAttire_Left_Thumb>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "slutty business attire">>
- <<if _rightArmType == "High">>
- <<include Art_Vector_Arm_Outfit_SluttyBusinessAttire_Right_High>>
- <<elseif _rightArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_SluttyBusinessAttire_Right_Mid>>
- <<elseif _rightArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_SluttyBusinessAttire_Right_Low>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "a schutzstaffel uniform">>
- <<if _leftArmType == "High">>
- <<include Art_Vector_Arm_Outfit_SchutzstaffelUniform_Left_High>>
- <<elseif _leftArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_SchutzstaffelUniform_Left_Mid>>
- <<elseif _leftArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_SchutzstaffelUniform_Left_Low>>
- <<elseif _leftArmType == "Rebel">>
- <<include Art_Vector_Arm_Outfit_SchutzstaffelUniform_Left_Rebel>>
- <<elseif _rightArmType == "Thumb Down">>
- <<include Art_Vector_Arm_Outfit_SchutzstaffelUniform_Left_Thumb>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "a schutzstaffel uniform">>
- <<if _rightArmType == "High">>
- <<include Art_Vector_Arm_Outfit_SchutzstaffelUniform_Right_High>>
- <<elseif _rightArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_SchutzstaffelUniform_Right_Mid>>
- <<elseif _rightArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_SchutzstaffelUniform_Right_Low>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "a slutty schutzstaffel uniform">>
- <<if _leftArmType == "High">>
- <<include Art_Vector_Arm_Outfit_SchutzstaffelUniform_Left_High>>
- <<elseif _leftArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_SchutzstaffelUniform_Left_Mid>>
- <<elseif _leftArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_SchutzstaffelUniform_Left_Low>>
- <<elseif _leftArmType == "Rebel">>
- <<include Art_Vector_Arm_Outfit_SchutzstaffelUniform_Left_Rebel>>
- <<elseif _rightArmType == "Thumb Down">>
- <<include Art_Vector_Arm_Outfit_SchutzstaffelUniform_Left_Thumb>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "a slutty schutzstaffel uniform">>
- <<if _rightArmType == "High">>
- <<include Art_Vector_Arm_Outfit_SchutzstaffelUniform_Right_High>>
- <<elseif _rightArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_SchutzstaffelUniform_Right_Mid>>
- <<elseif _rightArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_SchutzstaffelUniform_Right_Low>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "a red army uniform">>
- <<if _leftArmType == "High">>
- <<include Art_Vector_Arm_Outfit_RedArmyUniform_Left_High>>
- <<elseif _leftArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_RedArmyUniform_Left_Mid>>
- <<elseif _leftArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_RedArmyUniform_Left_Low>>
- <<elseif _leftArmType == "Rebel">>
- <<include Art_Vector_Arm_Outfit_RedArmyUniform_Left_Rebel>>
- <<elseif _rightArmType == "Thumb Down">>
- <<include Art_Vector_Arm_Outfit_RedArmyUniform_Left_Thumb>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "a red army uniform">>
- <<if _rightArmType == "High">>
- <<include Art_Vector_Arm_Outfit_RedArmyUniform_Right_High>>
- <<elseif _rightArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_RedArmyUniform_Right_Mid>>
- <<elseif _rightArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_RedArmyUniform_Right_Low>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "slutty jewelry">>
- <<if _leftArmType == "High">>
- <<include Art_Vector_Arm_Outfit_SluttyJewelry_Left_High>>
- <<elseif _leftArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_SluttyJewelry_Left_Mid>>
- <<elseif _leftArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_SluttyJewelry_Left_Low>>
- <<elseif _leftArmType == "Rebel">>
- <<include Art_Vector_Arm_Outfit_SluttyJewelry_Left_Rebel>>
- <<elseif _rightArmType == "Thumb Down">>
- <<include Art_Vector_Arm_Outfit_SluttyJewelry_Left_Thumb>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "slutty jewelry">>
- <<if _rightArmType == "High">>
- <<include Art_Vector_Arm_Outfit_SluttyJewelry_Right_High>>
- <<elseif _rightArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_SluttyJewelry_Right_Mid>>
- <<elseif _rightArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_SluttyJewelry_Right_Low>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "a cheerleader outfit">>
- <<if _leftArmType == "High">>
- <<include Art_Vector_Arm_Outfit_Cheerleader_Left_High>>
- <<elseif _leftArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_Cheerleader_Left_Mid>>
- <<elseif _leftArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_Cheerleader_Left_Low>>
- <<elseif _leftArmType == "Rebel">>
- <<include Art_Vector_Arm_Outfit_Cheerleader_Left_Rebel>>
- <<elseif _rightArmType == "Thumb Down">>
- <<include Art_Vector_Arm_Outfit_Cheerleader_Left_Thumb>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "a cheerleader outfit">>
- <<if _rightArmType == "High">>
- <<include Art_Vector_Arm_Outfit_Cheerleader_Right_High>>
- <<elseif _rightArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_Cheerleader_Right_Mid>>
- <<elseif _rightArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_Cheerleader_Right_Low>>
- <</if>>
-<</if>>
-<<if _artSlave.clothes == "clubslut netting">>
- <<if _leftArmType == "High">>
- <<include Art_Vector_Arm_Outfit_ClubslutNetting_Left_High>>
- <<elseif _leftArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_ClubslutNetting_Left_Mid>>
- <<elseif _leftArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_ClubslutNetting_Left_Low>>
- <<elseif _leftArmType == "Rebel">>
- <<include Art_Vector_Arm_Outfit_ClubslutNetting_Left_Rebel>>
- <<elseif _rightArmType == "Thumb Down">>
- <<include Art_Vector_Arm_Outfit_ClubslutNetting_Left_Thumb>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "clubslut netting">>
- <<if _rightArmType == "High">>
- <<include Art_Vector_Arm_Outfit_ClubslutNetting_Right_High>>
- <<elseif _rightArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_ClubslutNetting_Right_Mid>>
- <<elseif _rightArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_ClubslutNetting_Right_Low>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "battlearmor">>
- <<if _leftArmType == "High">>
- <<include Art_Vector_Arm_Outfit_Battlearmor_Left_High>>
- <<elseif _leftArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_Battlearmor_Left_Mid>>
- <<elseif _leftArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_Battlearmor_Left_Low>>
- <<elseif _leftArmType == "Rebel">>
- <<include Art_Vector_Arm_Outfit_Battlearmor_Left_Rebel>>
- <<elseif _rightArmType == "Thumb Down">>
- <<include Art_Vector_Arm_Outfit_Battlearmor_Left_Thumb>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "battlearmor">>
- <<if _rightArmType == "High">>
- <<include Art_Vector_Arm_Outfit_Battlearmor_Right_High>>
- <<elseif _rightArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_Battlearmor_Right_Mid>>
- <<elseif _rightArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_Battlearmor_Right_Low>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "a dirndl">>
- <<if _leftArmType == "High">>
- <<include Art_Vector_Arm_Outfit_Dirndl_Left_High>>
- <<elseif _leftArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_Dirndl_Left_Mid>>
- <<elseif _leftArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_Dirndl_Left_Low>>
- <<elseif _leftArmType == "Rebel">>
- <<include Art_Vector_Arm_Outfit_Dirndl_Left_Rebel>>
- <<elseif _rightArmType == "Thumb Down">>
- <<include Art_Vector_Arm_Outfit_Dirndl_Left_Thumb>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "a dirndl">>
- <<if _rightArmType == "High">>
- <<include Art_Vector_Arm_Outfit_Dirndl_Right_High>>
- <<elseif _rightArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_Dirndl_Right_Mid>>
- <<elseif _rightArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_Dirndl_Right_Low>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "a biyelgee costume">>
- <<if _leftArmType == "High">>
- <<include Art_Vector_Arm_Outfit_BiyelgeeCostume_Left_High>>
- <<elseif _leftArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_BiyelgeeCostume_Left_Mid>>
- <<elseif _leftArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_BiyelgeeCostume_Left_Low>>
- <<elseif _leftArmType == "Rebel">>
- <<include Art_Vector_Arm_Outfit_BiyelgeeCostume_Left_Rebel>>
- <<elseif _rightArmType == "Thumb Down">>
- <<include Art_Vector_Arm_Outfit_BiyelgeeCostume_Left_Thumb>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "a biyelgee costume">>
- <<if _rightArmType == "High">>
- <<include Art_Vector_Arm_Outfit_BiyelgeeCostume_Right_High>>
- <<elseif _rightArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_BiyelgeeCostume_Right_Mid>>
- <<elseif _rightArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_BiyelgeeCostume_Right_Low>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "lederhosen">>
- <<if _leftArmType == "High">>
- <<include Art_Vector_Arm_Outfit_Lederhosen_Left_High>>
- <<elseif _leftArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_Lederhosen_Left_Mid>>
- <<elseif _leftArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_Lederhosen_Left_Low>>
- <<elseif _leftArmType == "Rebel">>
- <<include Art_Vector_Arm_Outfit_Lederhosen_Left_Rebel>>
- <<elseif _rightArmType == "Thumb Down">>
- <<include Art_Vector_Arm_Outfit_Lederhosen_Left_Thumb>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "lederhosen">>
- <<if _rightArmType == "High">>
- <<include Art_Vector_Arm_Outfit_Lederhosen_Right_High>>
- <<elseif _rightArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_Lederhosen_Right_Mid>>
- <<elseif _rightArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_Lederhosen_Right_Low>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "a mounty outfit">>
- <<if _leftArmType == "High">>
- <<include Art_Vector_Arm_Outfit_Mounty_Left_High>>
- <<elseif _leftArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_Mounty_Left_Mid>>
- <<elseif _leftArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_Mounty_Left_Low>>
- <<elseif _leftArmType == "Rebel">>
- <<include Art_Vector_Arm_Outfit_Mounty_Left_Rebel>>
- <<elseif _rightArmType == "Thumb Down">>
- <<include Art_Vector_Arm_Outfit_Mounty_Left_Thumb>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "a mounty outfit">>
- <<if _rightArmType == "High">>
- <<include Art_Vector_Arm_Outfit_Mounty_Right_High>>
- <<elseif _rightArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_Mounty_Right_Mid>>
- <<elseif _rightArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_Mounty_Right_Low>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "a long qipao">>
- <<if _leftArmType == "High">>
- <<include Art_Vector_Arm_Outfit_LongQipao_Left_High>>
- <<elseif _leftArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_LongQipao_Left_Mid>>
- <<elseif _leftArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_LongQipao_Left_Low>>
- <<elseif _leftArmType == "Rebel">>
- <<include Art_Vector_Arm_Outfit_LongQipao_Left_Rebel>>
- <<elseif _rightArmType == "Thumb Down">>
- <<include Art_Vector_Arm_Outfit_LongQipao_Left_Thumb>>
- <</if>>
-<</if>>
-
-<<if _artSlave.clothes == "a long qipao">>
- <<if _rightArmType == "High">>
- <<include Art_Vector_Arm_Outfit_LongQipao_Right_High>>
- <<elseif _rightArmType == "Mid">>
- <<include Art_Vector_Arm_Outfit_LongQipao_Right_Mid>>
- <<elseif _rightArmType == "Low">>
- <<include Art_Vector_Arm_Outfit_LongQipao_Right_Low>>
- <</if>>
-<</if>>
+<</switch>>
diff --git a/src/art/vector/Boob_Addons.tw b/src/art/vector/Boob_Addons.tw
index 0d46bc4e990e8bf544e9fefbd79bf21a845adb52..7760e2cde11acdc138d6aa550879bb4a245dfc0a 100644
--- a/src/art/vector/Boob_Addons.tw
+++ b/src/art/vector/Boob_Addons.tw
@@ -25,15 +25,24 @@
<<set _showNipplePiercings = $showBodyMods == 1 && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a latex catsuit" >>
/* shows nipple piercings in game when selected; piercings wont show on the outfits listed below */
-<<if _artSlave.nipplesPiercing == 1 && _artSlave.clothes != "a cheerleader outfit" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "cutoffs and a t-shirt" && _artSlave.clothes != "a halter top dress" && _artSlave.clothes != "a mini dress" && _artSlave.clothes != "a leotard" && _artSlave.clothes != "a nice maid outfit" && _artSlave.clothes != "a slutty maid outfit" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a nice nurse outfit" && _artSlave.clothes != "a schoolgirl outfit" && _artSlave.clothes != "a scalemail bikini" && _artSlave.clothes != "a slutty nurse outfit" && _artSlave.clothes != "a ball gown" && _artSlave.clothes != "battledress" && _artSlave.clothes != "spats and a tank top" && _artSlave.clothes != "nice business attire" && _artSlave.clothes != "slutty business attire" && _artSlave.clothes != "a bunny outfit" && _artSlave.clothes != "conservative clothing" && _artSlave.clothes != "a huipil" && _artSlave.clothes != "a kimono" && _artSlave.clothes != "a slave gown" && _artSlave.clothes != "stretch pants and a crop-top" && _artSlave.clothes != "a maternity dress" && _artSlave.clothes != "a slutty qipao" && _artSlave.clothes != "a toga" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "clubslut netting" && _artSlave.clothes != "a slutty outfit" && _artSlave.clothes != "harem gauze" && _artSlave.clothes != "a penitent nuns outfit" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "a long qipao" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a mounty outfit" && _artSlave.clothes != "lederhosen" && _artSlave.clothes != "a dirndl" && _artSlave.clothes != "a biyelgee costume">>
- <<include Art_Vector_Boob_Piercing>>
-<<elseif _artSlave.nipplesPiercing == 2 && _artSlave.clothes != "a cheerleader outfit" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "cutoffs and a t-shirt" && _artSlave.clothes != "a halter top dress" && _artSlave.clothes != "a mini dress" && _artSlave.clothes != "a leotard" && _artSlave.clothes != "a nice maid outfit" && _artSlave.clothes != "a slutty maid outfit" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a nice nurse outfit" && _artSlave.clothes != "a schoolgirl outfit" && _artSlave.clothes != "a scalemail bikini" && _artSlave.clothes != "a slutty nurse outfit" && _artSlave.clothes != "a ball gown" && _artSlave.clothes != "battledress" && _artSlave.clothes != "spats and a tank top" && _artSlave.clothes != "nice business attire" && _artSlave.clothes != "slutty business attire" && _artSlave.clothes != "a bunny outfit" && _artSlave.clothes != "conservative clothing" && _artSlave.clothes != "a huipil" && _artSlave.clothes != "a kimono" && _artSlave.clothes != "a slave gown" && _artSlave.clothes != "stretch pants and a crop-top" && _artSlave.clothes != "a maternity dress" && _artSlave.clothes != "a slutty qipao" && _artSlave.clothes != "a toga" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "clubslut netting" && _artSlave.clothes != "a slutty outfit" && _artSlave.clothes != "harem gauze" && _artSlave.clothes != "a penitent nuns outfit" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "a long qipao" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a mounty outfit" && _artSlave.clothes != "lederhosen" && _artSlave.clothes != "a dirndl" && _artSlave.clothes != "a biyelgee costume">>
- <<include Art_Vector_Boob_Piercing_Heavy>>
+<<if _artSlave.nipplesPiercing > 0>>
+<<if _artSlave.clothes != "a cheerleader outfit" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "cutoffs and a t-shirt" && _artSlave.clothes != "a halter top dress" && _artSlave.clothes != "a mini dress" && _artSlave.clothes != "a leotard" && _artSlave.clothes != "a nice maid outfit" && _artSlave.clothes != "a slutty maid outfit" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a nice nurse outfit" && _artSlave.clothes != "a schoolgirl outfit" && _artSlave.clothes != "a scalemail bikini" && _artSlave.clothes != "a slutty nurse outfit" && _artSlave.clothes != "a ball gown" && _artSlave.clothes != "battledress" && _artSlave.clothes != "spats and a tank top" && _artSlave.clothes != "nice business attire" && _artSlave.clothes != "slutty business attire" && _artSlave.clothes != "a bunny outfit" && _artSlave.clothes != "conservative clothing" && _artSlave.clothes != "a huipil" && _artSlave.clothes != "a kimono" && _artSlave.clothes != "a slave gown" && _artSlave.clothes != "stretch pants and a crop-top" && _artSlave.clothes != "a maternity dress" && _artSlave.clothes != "a slutty qipao" && _artSlave.clothes != "a toga" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "clubslut netting" && _artSlave.clothes != "a slutty outfit" && _artSlave.clothes != "harem gauze" && _artSlave.clothes != "a penitent nuns outfit" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "a long qipao" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a mounty outfit" && _artSlave.clothes != "lederhosen" && _artSlave.clothes != "a dirndl" && _artSlave.clothes != "a biyelgee costume">>
+ <<if _artSlave.nipplesPiercing == 1>>
+ <<include Art_Vector_Boob_Piercing>>
+ <<else>>
+ <<include Art_Vector_Boob_Piercing_Heavy>>
+ <</if>>
+<</if>>
+<</if>>
+
+<<if _artSlave.areolaePiercing > 0>>
+<<if _artSlave.clothes != "a cheerleader outfit" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "cutoffs and a t-shirt" && _artSlave.clothes != "a halter top dress" && _artSlave.clothes != "a mini dress" && _artSlave.clothes != "a leotard" && _artSlave.clothes != "a nice maid outfit" && _artSlave.clothes != "a slutty maid outfit" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a nice nurse outfit" && _artSlave.clothes != "a schoolgirl outfit" && _artSlave.clothes != "a scalemail bikini" && _artSlave.clothes != "a slutty nurse outfit" && _artSlave.clothes != "a ball gown" && _artSlave.clothes != "battledress" && _artSlave.clothes != "spats and a tank top" && _artSlave.clothes != "nice business attire" && _artSlave.clothes != "slutty business attire" && _artSlave.clothes != "a bunny outfit" && _artSlave.clothes != "conservative clothing" && _artSlave.clothes != "a huipil" && _artSlave.clothes != "a kimono" && _artSlave.clothes != "a slave gown" && _artSlave.clothes != "stretch pants and a crop-top" && _artSlave.clothes != "a maternity dress" && _artSlave.clothes != "a slutty qipao" && _artSlave.clothes != "a toga" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "clubslut netting" && _artSlave.clothes != "a slutty outfit" && _artSlave.clothes != "harem gauze" && _artSlave.clothes != "a penitent nuns outfit" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "a long qipao" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a mounty outfit" && _artSlave.clothes != "lederhosen" && _artSlave.clothes != "a dirndl" && _artSlave.clothes != "a biyelgee costume">>
+ <<if _artSlave.areolaePiercing == 1>>
+ <<include Art_Vector_Boob_Areola_Piercing>>
+ <<else>>
+ <<include Art_Vector_Boob_Areola_Piercingheavy>>
+ <</if>>
<</if>>
-<<if _artSlave.areolaePiercing == 1 && _artSlave.clothes != "a cheerleader outfit" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "cutoffs and a t-shirt" && _artSlave.clothes != "a halter top dress" && _artSlave.clothes != "a mini dress" && _artSlave.clothes != "a leotard" && _artSlave.clothes != "a nice maid outfit" && _artSlave.clothes != "a slutty maid outfit" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a nice nurse outfit" && _artSlave.clothes != "a schoolgirl outfit" && _artSlave.clothes != "a scalemail bikini" && _artSlave.clothes != "a slutty nurse outfit" && _artSlave.clothes != "a ball gown" && _artSlave.clothes != "battledress" && _artSlave.clothes != "spats and a tank top" && _artSlave.clothes != "nice business attire" && _artSlave.clothes != "slutty business attire" && _artSlave.clothes != "a bunny outfit" && _artSlave.clothes != "conservative clothing" && _artSlave.clothes != "a huipil" && _artSlave.clothes != "a kimono" && _artSlave.clothes != "a slave gown" && _artSlave.clothes != "stretch pants and a crop-top" && _artSlave.clothes != "a maternity dress" && _artSlave.clothes != "a slutty qipao" && _artSlave.clothes != "a toga" && _artSlave.clothes != "Western Clothing" && _artSlave.clothes != "clubslut netting" && _artSlave.clothes != "a slutty outfit" && _artSlave.clothes != "harem gauze" && _artSlave.clothes != "a penitent nuns outfit" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "a long qipao" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a mounty outfit" && _artSlave.clothes != "lederhosen" && _artSlave.clothes != "a dirndl" && _artSlave.clothes != "a biyelgee costume">>
- <<include Art_Vector_Boob_Areola_Piercing>>
-<<elseif _artSlave.areolaePiercing == 2 && _artSlave.clothes != "a cheerleader outfit" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "cutoffs and a t-shirt" && _artSlave.clothes != "a halter top dress" && _artSlave.clothes != "a mini dress" && _artSlave.clothes != "a leotard" && _artSlave.clothes != "a nice maid outfit" && _artSlave.clothes != "a slutty maid outfit" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a nice nurse outfit" && _artSlave.clothes != "a schoolgirl outfit" && _artSlave.clothes != "a scalemail bikini" && _artSlave.clothes != "a slutty nurse outfit" && _artSlave.clothes != "a ball gown" && _artSlave.clothes != "battledress" && _artSlave.clothes != "spats and a tank top" && _artSlave.clothes != "nice business attire" && _artSlave.clothes != "slutty business attire" && _artSlave.clothes != "a bunny outfit" && _artSlave.clothes != "conservative clothing" && _artSlave.clothes != "a huipil" && _artSlave.clothes != "a kimono" && _artSlave.clothes != "a slave gown" && _artSlave.clothes != "stretch pants and a crop-top" && _artSlave.clothes != "a maternity dress" && _artSlave.clothes != "a slutty qipao" && _artSlave.clothes != "a toga" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "clubslut netting" && _artSlave.clothes != "a slutty outfit" && _artSlave.clothes != "harem gauze" && _artSlave.clothes != "a penitent nuns outfit" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "a long qipao" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a mounty outfit" && _artSlave.clothes != "lederhosen" && _artSlave.clothes != "a dirndl" && _artSlave.clothes != "a biyelgee costume">>
- <<include Art_Vector_Boob_Areola_Piercingheavy>>
<</if>>
diff --git a/src/art/vector/Chastity_Belt.tw b/src/art/vector/Chastity_Belt.tw
index e65ef9b0c3aae2fd2a30718b45ebd696eb7b5b9d..a77a6b182fb64fc2e657bf6f0d049083fda1d5c0 100644
--- a/src/art/vector/Chastity_Belt.tw
+++ b/src/art/vector/Chastity_Belt.tw
@@ -22,41 +22,39 @@
<</if>>
-/* shows vaginal accessories in-game when selected; vaginal accessory art disabled on the outfits below */
-<<if _artSlave.vaginalAccessory == "dildo" && _artSlave.clothes != "a cheerleader outfit" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "cutoffs and a t-shirt" && _artSlave.clothes != "a halter top dress" && _artSlave.clothes != "a mini dress" && _artSlave.clothes != "a leotard" && _artSlave.clothes != "a nice maid outfit" && _artSlave.clothes != "a slutty maid outfit" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a nice nurse outfit" && _artSlave.clothes != "a schoolgirl outfit" && _artSlave.clothes != "a scalemail bikini" && _artSlave.clothes != "a slutty nurse outfit" && _artSlave.clothes != "a ball gown" && _artSlave.clothes != "battledress" && _artSlave.clothes != "spats and a tank top" && _artSlave.clothes != "nice business attire" && _artSlave.clothes != "slutty business attire" && _artSlave.clothes != "a bunny outfit" && _artSlave.clothes != "conservative clothing" && _artSlave.clothes != "a huipil" && _artSlave.clothes != "a kimono" && _artSlave.clothes != "a slave gown" && _artSlave.clothes != "stretch pants and a crop-top" && _artSlave.clothes != "a maternity dress" && _artSlave.clothes != "a slutty qipao" && _artSlave.clothes != "a toga" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "a long qipao" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a mounty outfit" && _artSlave.clothes != "lederhosen" && _artSlave.clothes != "a dirndl" && _artSlave.clothes != "a biyelgee costume">>
- <<include Art_Vector_Dildo_Short>>
-<</if>>
-<<if _artSlave.vaginalAccessory == "long dildo" && _artSlave.clothes != "a cheerleader outfit" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "cutoffs and a t-shirt" && _artSlave.clothes != "a halter top dress" && _artSlave.clothes != "a mini dress" && _artSlave.clothes != "a leotard" && _artSlave.clothes != "a nice maid outfit" && _artSlave.clothes != "a slutty maid outfit" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a nice nurse outfit" && _artSlave.clothes != "a schoolgirl outfit" && _artSlave.clothes != "a scalemail bikini" && _artSlave.clothes != "a slutty nurse outfit" && _artSlave.clothes != "a ball gown" && _artSlave.clothes != "battledress" && _artSlave.clothes != "spats and a tank top" && _artSlave.clothes != "nice business attire" && _artSlave.clothes != "slutty business attire" && _artSlave.clothes != "a bunny outfit" && _artSlave.clothes != "conservative clothing" && _artSlave.clothes != "a huipil" && _artSlave.clothes != "a kimono" && _artSlave.clothes != "a slave gown" && _artSlave.clothes != "stretch pants and a crop-top" && _artSlave.clothes != "a maternity dress" && _artSlave.clothes != "a slutty qipao" && _artSlave.clothes != "a toga" && _artSlave.clothes != "Western Clothing" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "a long qipao" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a mounty outfit" && _artSlave.clothes != "lederhosen" && _artSlave.clothes != "a dirndl" && _artSlave.clothes != "a biyelgee costume">>
- <<include Art_Vector_Dildo_Long>>
-<</if>>
-/* additional outfits disabled due to the art breaking with the larger accessories */
-<<if _artSlave.vaginalAccessory == "large dildo" && _artSlave.clothes != "a cheerleader outfit" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "cutoffs and a t-shirt" && _artSlave.clothes != "a halter top dress" && _artSlave.clothes != "a mini dress" && _artSlave.clothes != "a leotard" && _artSlave.clothes != "a nice maid outfit" && _artSlave.clothes != "a slutty maid outfit" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a nice nurse outfit" && _artSlave.clothes != "a schoolgirl outfit" && _artSlave.clothes != "a scalemail bikini" && _artSlave.clothes != "a slutty nurse outfit" && _artSlave.clothes != "a ball gown" && _artSlave.clothes != "battledress" && _artSlave.clothes != "spats and a tank top" && _artSlave.clothes != "nice business attire" && _artSlave.clothes != "slutty business attire" && _artSlave.clothes != "a bunny outfit" && _artSlave.clothes != "conservative clothing" && _artSlave.clothes != "a huipil" && _artSlave.clothes != "a kimono" && _artSlave.clothes != "a slave gown" && _artSlave.clothes != "stretch pants and a crop-top" && _artSlave.clothes != "a maternity dress" && _artSlave.clothes != "a slutty qipao" && _artSlave.clothes != "a toga" && _artSlave.clothes != "Western Clothing" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "a comfortable bodysuit" && _artSlave.clothes != "a string bikini" && _artSlave.clothes != "attractive lingerie for a pregnant woman" && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "a long qipao" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a mounty outfit" && _artSlave.clothes != "lederhosen" && _artSlave.clothes != "a dirndl" && _artSlave.clothes != "a biyelgee costume">>
- <<include Art_Vector_Dildo_Large>>
-<</if>>
-<<if _artSlave.vaginalAccessory == "long, large dildo" && _artSlave.clothes != "a cheerleader outfit" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "cutoffs and a t-shirt" && _artSlave.clothes != "a halter top dress" && _artSlave.clothes != "a mini dress" && _artSlave.clothes != "a leotard" && _artSlave.clothes != "a nice maid outfit" && _artSlave.clothes != "a slutty maid outfit" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a nice nurse outfit" && _artSlave.clothes != "a schoolgirl outfit" && _artSlave.clothes != "a scalemail bikini" && _artSlave.clothes != "a slutty nurse outfit" && _artSlave.clothes != "a ball gown" && _artSlave.clothes != "battledress" && _artSlave.clothes != "spats and a tank top" && _artSlave.clothes != "nice business attire" && _artSlave.clothes != "slutty business attire" && _artSlave.clothes != "a bunny outfit" && _artSlave.clothes != "conservative clothing" && _artSlave.clothes != "a huipil" && _artSlave.clothes != "a kimono" && _artSlave.clothes != "a slave gown" && _artSlave.clothes != "stretch pants and a crop-top" && _artSlave.clothes != "a maternity dress" && _artSlave.clothes != "a slutty qipao" && _artSlave.clothes != "a toga" && _artSlave.clothes != "Western Clothing" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "a comfortable bodysuit" && _artSlave.clothes != "a string bikini" && _artSlave.clothes != "attractive lingerie for a pregnant woman" && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "a long qipao" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a mounty outfit" && _artSlave.clothes != "lederhosen" && _artSlave.clothes != "a dirndl" && _artSlave.clothes != "a biyelgee costume">>
- <<include Art_Vector_Dildo_Large_Long>>
-<</if>>
-<<if _artSlave.vaginalAccessory == "huge dildo" && _artSlave.clothes != "a cheerleader outfit" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "cutoffs and a t-shirt" && _artSlave.clothes != "a halter top dress" && _artSlave.clothes != "a mini dress" && _artSlave.clothes != "a leotard" && _artSlave.clothes != "a nice maid outfit" && _artSlave.clothes != "a slutty maid outfit" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a nice nurse outfit" && _artSlave.clothes != "a schoolgirl outfit" && _artSlave.clothes != "a scalemail bikini" && _artSlave.clothes != "a slutty nurse outfit" && _artSlave.clothes != "a ball gown" && _artSlave.clothes != "battledress" && _artSlave.clothes != "spats and a tank top" && _artSlave.clothes != "nice business attire" && _artSlave.clothes != "slutty business attire" && _artSlave.clothes != "a bunny outfit" && _artSlave.clothes != "conservative clothing" && _artSlave.clothes != "a huipil" && _artSlave.clothes != "a kimono" && _artSlave.clothes != "a slave gown" && _artSlave.clothes != "stretch pants and a crop-top" && _artSlave.clothes != "a maternity dress" && _artSlave.clothes != "a slutty qipao" && _artSlave.clothes != "a toga" && _artSlave.clothes != "Western Clothing" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "a comfortable bodysuit" && _artSlave.clothes != "a string bikini" && _artSlave.clothes != "attractive lingerie for a pregnant woman" && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "a long qipao" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a mounty outfit" && _artSlave.clothes != "lederhosen" && _artSlave.clothes != "a dirndl" && _artSlave.clothes != "a biyelgee costume">>
- <<include Art_Vector_Dildo_Huge>>
+<<if _artSlave.vaginalAccessory != "none">>
+<<if _artSlave.clothes != "a cheerleader outfit" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "cutoffs and a t-shirt" && _artSlave.clothes != "a halter top dress" && _artSlave.clothes != "a mini dress" && _artSlave.clothes != "a leotard" && _artSlave.clothes != "a nice maid outfit" && _artSlave.clothes != "a slutty maid outfit" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a nice nurse outfit" && _artSlave.clothes != "a schoolgirl outfit" && _artSlave.clothes != "a scalemail bikini" && _artSlave.clothes != "a slutty nurse outfit" && _artSlave.clothes != "a ball gown" && _artSlave.clothes != "battledress" && _artSlave.clothes != "spats and a tank top" && _artSlave.clothes != "nice business attire" && _artSlave.clothes != "slutty business attire" && _artSlave.clothes != "a bunny outfit" && _artSlave.clothes != "conservative clothing" && _artSlave.clothes != "a huipil" && _artSlave.clothes != "a kimono" && _artSlave.clothes != "a slave gown" && _artSlave.clothes != "stretch pants and a crop-top" && _artSlave.clothes != "a maternity dress" && _artSlave.clothes != "a slutty qipao" && _artSlave.clothes != "a toga" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "a long qipao" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a mounty outfit" && _artSlave.clothes != "lederhosen" && _artSlave.clothes != "a dirndl" && _artSlave.clothes != "a biyelgee costume">>
+
+ /* shows vaginal accessories in-game when selected; vaginal accessory art disabled on the outfits below */
+ <<if _artSlave.vaginalAccessory == "dildo">>
+ <<include Art_Vector_Dildo_Short>>
+ <<elseif _artSlave.vaginalAccessory == "long dildo">>
+ <<include Art_Vector_Dildo_Long>>
+
+ /* additional outfits disabled due to the art breaking with the larger accessories */
+ <<elseif _artSlave.vaginalAccessory == "large dildo" && _artSlave.clothes != "a comfortable bodysuit" && _artSlave.clothes != "a string bikini" && _artSlave.clothes != "attractive lingerie for a pregnant woman" && _artSlave.clothes != "restrictive latex">>
+ <<include Art_Vector_Dildo_Large>>
+ <<elseif _artSlave.vaginalAccessory == "long, large dildo" && _artSlave.clothes != "a comfortable bodysuit" && _artSlave.clothes != "a string bikini" && _artSlave.clothes != "attractive lingerie for a pregnant woman" && _artSlave.clothes != "restrictive latex">>
+ <<include Art_Vector_Dildo_Large_Long>>
+ <<elseif _artSlave.vaginalAccessory == "huge dildo" && _artSlave.clothes != "a comfortable bodysuit" && _artSlave.clothes != "a string bikini" && _artSlave.clothes != "attractive lingerie for a pregnant woman" && _artSlave.clothes != "restrictive latex">>
+ <<include Art_Vector_Dildo_Huge>>
+ <<elseif _artSlave.vaginalAccessory == "long, huge dildo" && _artSlave.clothes != "a comfortable bodysuit" && _artSlave.clothes != "a string bikini" && _artSlave.clothes != "attractive lingerie for a pregnant woman" && _artSlave.clothes != "restrictive latex">>
+ <<include Art_Vector_Dildo_Huge_Long>>
+ <</if>>
+
<</if>>
-<<if _artSlave.vaginalAccessory == "long, huge dildo" && _artSlave.clothes != "a cheerleader outfit" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "cutoffs and a t-shirt" && _artSlave.clothes != "a halter top dress" && _artSlave.clothes != "a mini dress" && _artSlave.clothes != "a leotard" && _artSlave.clothes != "a nice maid outfit" && _artSlave.clothes != "a slutty maid outfit" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a nice nurse outfit" && _artSlave.clothes != "a schoolgirl outfit" && _artSlave.clothes != "a scalemail bikini" && _artSlave.clothes != "a slutty nurse outfit" && _artSlave.clothes != "a ball gown" && _artSlave.clothes != "battledress" && _artSlave.clothes != "spats and a tank top" && _artSlave.clothes != "nice business attire" && _artSlave.clothes != "slutty business attire" && _artSlave.clothes != "a bunny outfit" && _artSlave.clothes != "conservative clothing" && _artSlave.clothes != "a huipil" && _artSlave.clothes != "a kimono" && _artSlave.clothes != "a slave gown" && _artSlave.clothes != "stretch pants and a crop-top" && _artSlave.clothes != "a maternity dress" && _artSlave.clothes != "a slutty qipao" && _artSlave.clothes != "a toga" && _artSlave.clothes != "Western Clothing" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "a comfortable bodysuit" && _artSlave.clothes != "a string bikini" && _artSlave.clothes != "attractive lingerie for a pregnant woman" && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "a long qipao" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a mounty outfit" && _artSlave.clothes != "lederhosen" && _artSlave.clothes != "a dirndl" && _artSlave.clothes != "a biyelgee costume">>
- <<include Art_Vector_Dildo_Huge_Long>>
<</if>>
/* Anal Accessories */
<<if _artSlave.buttplug == "long plug">>
<<include Art_Vector_Plug_Long>>
-<</if>>
-<<if _artSlave.buttplug == "large plug">>
+<<elseif _artSlave.buttplug == "large plug">>
<<include Art_Vector_Plug_Large>>
-<</if>>
-<<if _artSlave.buttplug == "long, large plug">>
+<<elseif _artSlave.buttplug == "long, large plug">>
<<include Art_Vector_Plug_Large_Long>>
-<</if>>
-<<if _artSlave.buttplug == "huge plug">>
+<<elseif _artSlave.buttplug == "huge plug">>
<<include Art_Vector_Plug_Huge>>
-<</if>>
-<<if _artSlave.buttplug == "long, huge plug">>
+<<elseif _artSlave.buttplug == "long, huge plug">>
<<include Art_Vector_Plug_Huge_Long>>
<</if>>
<<if _artSlave.buttplugAttachment == "tail">>
diff --git a/src/art/vector/Hair_Back.tw b/src/art/vector/Hair_Back.tw
index b2977551f1d44c68a0573d3f3be8cf1070189584..358565a37d095c7ff42cdb04f5b072f22a829f19 100644
--- a/src/art/vector/Hair_Back.tw
+++ b/src/art/vector/Hair_Back.tw
@@ -1,133 +1,138 @@
:: Art_Vector_Hair_Back_ [nobr]
-<<if _artSlave.fuckdoll == 0 && _artSlave.hStyle != "shaved" && _artSlave.hStyle != "permed" && _artSlave.hStyle != "up" && _artSlave.hStyle != "neat" && _artSlave.hStyle != "ponytail" && _artSlave.hStyle != "bun" && _artSlave.hStyle != "curled" && _artSlave.hStyle != "eary" && _artSlave.hStyle != "luxurious" && _artSlave.hStyle != "afro" && _artSlave.hStyle != "messy" && _artSlave.hStyle != "dreadlocks" && _artSlave.hStyle != "cornrows" && _artSlave.hStyle != "braided" && _artSlave.hStyle != "tails" && _artSlave.hStyle != "strip" && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "a chattel habit" && _artSlave.clothes != "a fallen nuns habit" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "Western clothing" && _artSlave.hStyle != "messy bun" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a mounty outfit">>
- <<include Art_Vector_Hair_Back_Messy_Medium>>
-<</if>>
-
-<<if _artSlave.fuckdoll != 0 || ( _artSlave.hStyle == "shaved" && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "a chattel habit" && _artSlave.clothes != "a fallen nuns habit" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a mounty outfit")>>
- <<include Art_Vector_Hair_Back_NoHair>>
- <<elseif _artSlave.hStyle == "permed" && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "a chattel habit" && _artSlave.clothes != "a fallen nuns habit" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a mounty outfit">>
- <<if _artSlave.hLength >= 60>>
- <<include Art_Vector_Hair_Back_Permed_Long>>
- <<elseif _artSlave.hLength >= 30>>
- <<include Art_Vector_Hair_Back_Permed_Medium>>
- <<elseif _artSlave.hLength >= 10>>
- <<include Art_Vector_Hair_Back_Permed_Short>>
- <</if>>
- <<elseif _artSlave.hStyle == "up" && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "a chattel habit" && _artSlave.clothes != "a fallen nuns habit" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a mounty outfit">>
- <<if _artSlave.hLength >= 60>>
- <<include Art_Vector_Hair_Back_Up_Long>>
- <<elseif _artSlave.hLength >= 30>>
- <<include Art_Vector_Hair_Back_Up_Medium>>
- <<elseif _artSlave.hLength >= 10>>
- <<include Art_Vector_Hair_Back_Up_Short>>
- <</if>>
- <<elseif _artSlave.hStyle == "neat" && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "a chattel habit" && _artSlave.clothes != "a fallen nuns habit" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a mounty outfit">>
- <<if _artSlave.hLength >= 60>>
- <<include Art_Vector_Hair_Back_Neat_Long>>
- <<elseif _artSlave.hLength >= 30>>
- <<include Art_Vector_Hair_Back_Neat_Medium>>
- <<elseif _artSlave.hLength >= 10>>
- <<include Art_Vector_Hair_Back_Neat_Short>>
- <</if>>
- <<elseif _artSlave.hStyle == "ponytail" && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "a chattel habit" && _artSlave.clothes != "a fallen nuns habit" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a mounty outfit">>
- <<if _artSlave.hLength >= 60>>
- <<include Art_Vector_Hair_Back_Ponytail_Long>>
- <<elseif _artSlave.hLength >= 30>>
- <<include Art_Vector_Hair_Back_Ponytail_Medium>>
- <<elseif _artSlave.hLength >= 10>>
- <<include Art_Vector_Hair_Back_Ponytail_Short>>
- <</if>>
- <<elseif _artSlave.hStyle == "bun" && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "a chattel habit" && _artSlave.clothes != "a fallen nuns habit" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a mounty outfit">>
- <<if _artSlave.hLength >= 60>>
- <<include Art_Vector_Hair_Back_Bun_Long>>
- <<elseif _artSlave.hLength >= 30>>
- <<include Art_Vector_Hair_Back_Bun_Medium>>
- <<elseif _artSlave.hLength >= 10>>
- <<include Art_Vector_Hair_Back_Bun_Short>>
- <</if>>
- <<elseif _artSlave.hStyle == "curled" && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "a chattel habit" && _artSlave.clothes != "a fallen nuns habit" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a mounty outfit">>
- <<if _artSlave.hLength >= 60>>
- <<include Art_Vector_Hair_Back_Curled_Long>>
- <<elseif _artSlave.hLength >= 30>>
- <<include Art_Vector_Hair_Back_Curled_Medium>>
- <<elseif _artSlave.hLength >= 10>>
- <<include Art_Vector_Hair_Back_Curled_Short>>
- <</if>>
- <<elseif _artSlave.hStyle == "eary" && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "a chattel habit" && _artSlave.clothes != "a fallen nuns habit" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a mounty outfit">>
- <<if _artSlave.hLength >= 60>>
- <<include Art_Vector_Hair_Back_Eary_Long>>
- <<elseif _artSlave.hLength >= 30>>
- <<include Art_Vector_Hair_Back_Eary_Medium>>
- <<elseif _artSlave.hLength >= 10>>
- <<include Art_Vector_Hair_Back_Eary_Short>>
- <</if>>
- <<elseif _artSlave.hStyle == "luxurious" && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "a chattel habit" && _artSlave.clothes != "a fallen nuns habit" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a mounty outfit">>
- <<if _artSlave.hLength >= 60>>
- <<include Art_Vector_Hair_Back_Luxurious_Long>>
- <<elseif _artSlave.hLength >= 30>>
- <<include Art_Vector_Hair_Back_Luxurious_Medium>>
- <<elseif _artSlave.hLength >= 10>>
- <<include Art_Vector_Hair_Back_Luxurious_Short>>
- <</if>>
- <<elseif _artSlave.hStyle == "afro" && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "a chattel habit" && _artSlave.clothes != "a fallen nuns habit" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a mounty outfit">>
- <<if _artSlave.hLength >= 150>>
- <<include Art_Vector_Hair_Back_Afro_Giant>>
- <<elseif _artSlave.hLength >= 60>>
- <<include Art_Vector_Hair_Back_Afro_Long>>
- <<elseif _artSlave.hLength >= 30>>
- <<include Art_Vector_Hair_Back_Afro_Medium>>
- <<elseif _artSlave.hLength >= 10>>
- <<include Art_Vector_Hair_Back_Afro_Short>>
- <</if>>
- <<elseif _artSlave.hStyle == "messy" && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "a chattel habit" && _artSlave.clothes != "a fallen nuns habit" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a mounty outfit">>
- <<if _artSlave.hLength >= 60>>
- <<include Art_Vector_Hair_Back_Messy_Long>>
- <<elseif _artSlave.hLength >= 30>>
- <<include Art_Vector_Hair_Back_Messy_Medium>>
- <<elseif _artSlave.hLength >= 10>>
- <<include Art_Vector_Hair_Back_Messy_Short>>
- <</if>>
- <<elseif _artSlave.hStyle == "dreadlocks" && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "a chattel habit" && _artSlave.clothes != "a fallen nuns habit" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a mounty outfit">>
- <<if _artSlave.hLength >= 60>>
- <<include Art_Vector_Hair_Back_Dreadlocks_Long>>
- <<elseif _artSlave.hLength >= 30>>
- <<include Art_Vector_Hair_Back_Dreadlocks_Medium>>
- <<elseif _artSlave.hLength >= 10>>
- <<include Art_Vector_Hair_Back_Dreadlocks_Short>>
- <</if>>
- <<elseif _artSlave.hStyle == "cornrows" && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "a chattel habit" && _artSlave.clothes != "a fallen nuns habit" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a mounty outfit">>
- <<if _artSlave.hLength >= 60>>
- <<include Art_Vector_Hair_Back_Cornrows_Long>>
- <<elseif _artSlave.hLength >= 30>>
- <<include Art_Vector_Hair_Back_Cornrows_Medium>>
- <<elseif _artSlave.hLength >= 10>>
- <<include Art_Vector_Hair_Back_Cornrows_Short>>
- <</if>>
- <<elseif _artSlave.hStyle == "braided" && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "a chattel habit" && _artSlave.clothes != "a fallen nuns habit" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a mounty outfit">>
- <<if _artSlave.hLength >= 60>>
- <<include Art_Vector_Hair_Back_Braided_Long>>
- <<elseif _artSlave.hLength >= 30>>
- <<include Art_Vector_Hair_Back_Braided_Medium>>
- <<elseif _artSlave.hLength >= 10>>
- <<include Art_Vector_Hair_Back_Braided_Short>>
- <</if>>
- <<elseif _artSlave.hStyle == "tails" && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "a chattel habit" && _artSlave.clothes != "a fallen nuns habit" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a mounty outfit">>
- <<if _artSlave.hLength >= 60>>
- <<include Art_Vector_Hair_Back_Tails_Long>>
- <<elseif _artSlave.hLength >= 30>>
- <<include Art_Vector_Hair_Back_Tails_Medium>>
- <<elseif _artSlave.hLength >= 10>>
- <<include Art_Vector_Hair_Back_Tails_Short>>
- <</if>>
- <<elseif _artSlave.hStyle == "messy bun" && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "a chattel habit" && _artSlave.clothes != "a fallen nuns habit" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a mounty outfit">>
- <<if _artSlave.hLength >= 60>>
- <<include Art_Vector_Hair_Back_Ninja_Long>>
- <<elseif _artSlave.hLength >= 30>>
- <<include Art_Vector_Hair_Back_Ninja_Medium>>
- <<elseif _artSlave.hLength >= 10>>
- <<include Art_Vector_Hair_Back_Ninja_Short>>
- <</if>>
+<<if _artSlave.fuckdoll != 0>>
+ <<include Art_Vector_Hair_Back_NoHair>>
+<<else>>
+ <<if _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "a chattel habit" && _artSlave.clothes != "a fallen nuns habit" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a mounty outfit">>
+ <<switch _artSlave.hStyle>>
+ <<case "shaved" "buzzcut">>
+ <<include Art_Vector_Hair_Back_NoHair>>
+ <<case "permed">>
+ <<if _artSlave.hLength >= 60>>
+ <<include Art_Vector_Hair_Back_Permed_Long>>
+ <<elseif _artSlave.hLength >= 30>>
+ <<include Art_Vector_Hair_Back_Permed_Medium>>
+ <<elseif _artSlave.hLength >= 10>>
+ <<include Art_Vector_Hair_Back_Permed_Short>>
+ <</if>>
+ <<case "up">>
+ <<if _artSlave.hLength >= 60>>
+ <<include Art_Vector_Hair_Back_Up_Long>>
+ <<elseif _artSlave.hLength >= 30>>
+ <<include Art_Vector_Hair_Back_Up_Medium>>
+ <<elseif _artSlave.hLength >= 10>>
+ <<include Art_Vector_Hair_Back_Up_Short>>
+ <</if>>
+ <<case "neat">>
+ <<if _artSlave.hLength >= 60>>
+ <<include Art_Vector_Hair_Back_Neat_Long>>
+ <<elseif _artSlave.hLength >= 30>>
+ <<include Art_Vector_Hair_Back_Neat_Medium>>
+ <<elseif _artSlave.hLength >= 10>>
+ <<include Art_Vector_Hair_Back_Neat_Short>>
+ <</if>>
+ <<case "ponytail">>
+ <<if _artSlave.hLength >= 60>>
+ <<include Art_Vector_Hair_Back_Ponytail_Long>>
+ <<elseif _artSlave.hLength >= 30>>
+ <<include Art_Vector_Hair_Back_Ponytail_Medium>>
+ <<elseif _artSlave.hLength >= 10>>
+ <<include Art_Vector_Hair_Back_Ponytail_Short>>
+ <</if>>
+ <<case "bun">>
+ <<if _artSlave.hLength >= 60>>
+ <<include Art_Vector_Hair_Back_Bun_Long>>
+ <<elseif _artSlave.hLength >= 30>>
+ <<include Art_Vector_Hair_Back_Bun_Medium>>
+ <<elseif _artSlave.hLength >= 10>>
+ <<include Art_Vector_Hair_Back_Bun_Short>>
+ <</if>>
+ <<case "curled">>
+ <<if _artSlave.hLength >= 60>>
+ <<include Art_Vector_Hair_Back_Curled_Long>>
+ <<elseif _artSlave.hLength >= 30>>
+ <<include Art_Vector_Hair_Back_Curled_Medium>>
+ <<elseif _artSlave.hLength >= 10>>
+ <<include Art_Vector_Hair_Back_Curled_Short>>
+ <</if>>
+ <<case "eary">>
+ <<if _artSlave.hLength >= 60>>
+ <<include Art_Vector_Hair_Back_Eary_Long>>
+ <<elseif _artSlave.hLength >= 30>>
+ <<include Art_Vector_Hair_Back_Eary_Medium>>
+ <<elseif _artSlave.hLength >= 10>>
+ <<include Art_Vector_Hair_Back_Eary_Short>>
+ <</if>>
+ <<case "luxurious">>
+ <<if _artSlave.hLength >= 60>>
+ <<include Art_Vector_Hair_Back_Luxurious_Long>>
+ <<elseif _artSlave.hLength >= 30>>
+ <<include Art_Vector_Hair_Back_Luxurious_Medium>>
+ <<elseif _artSlave.hLength >= 10>>
+ <<include Art_Vector_Hair_Back_Luxurious_Short>>
+ <</if>>
+ <<case "afro">>
+ <<if _artSlave.hLength >= 150>>
+ <<include Art_Vector_Hair_Back_Afro_Giant>>
+ <<elseif _artSlave.hLength >= 60>>
+ <<include Art_Vector_Hair_Back_Afro_Long>>
+ <<elseif _artSlave.hLength >= 30>>
+ <<include Art_Vector_Hair_Back_Afro_Medium>>
+ <<elseif _artSlave.hLength >= 10>>
+ <<include Art_Vector_Hair_Back_Afro_Short>>
+ <</if>>
+ <<case "messy">> /* this isn't an option in salon.tw. What should it be? */
+ <<if _artSlave.hLength >= 60>>
+ <<include Art_Vector_Hair_Back_Messy_Long>>
+ <<elseif _artSlave.hLength >= 30>>
+ <<include Art_Vector_Hair_Back_Messy_Medium>>
+ <<elseif _artSlave.hLength >= 10>>
+ <<include Art_Vector_Hair_Back_Messy_Short>>
+ <</if>>
+ <<case "dreadlocks">>
+ <<if _artSlave.hLength >= 60>>
+ <<include Art_Vector_Hair_Back_Dreadlocks_Long>>
+ <<elseif _artSlave.hLength >= 30>>
+ <<include Art_Vector_Hair_Back_Dreadlocks_Medium>>
+ <<elseif _artSlave.hLength >= 10>>
+ <<include Art_Vector_Hair_Back_Dreadlocks_Short>>
+ <</if>>
+ <<case "cornrows">>
+ <<if _artSlave.hLength >= 60>>
+ <<include Art_Vector_Hair_Back_Cornrows_Long>>
+ <<elseif _artSlave.hLength >= 30>>
+ <<include Art_Vector_Hair_Back_Cornrows_Medium>>
+ <<elseif _artSlave.hLength >= 10>>
+ <<include Art_Vector_Hair_Back_Cornrows_Short>>
+ <</if>>
+ <<case "braided">>
+ <<if _artSlave.hLength >= 60>>
+ <<include Art_Vector_Hair_Back_Braided_Long>>
+ <<elseif _artSlave.hLength >= 30>>
+ <<include Art_Vector_Hair_Back_Braided_Medium>>
+ <<elseif _artSlave.hLength >= 10>>
+ <<include Art_Vector_Hair_Back_Braided_Short>>
+ <</if>>
+ <<case "tails">>
+ <<if _artSlave.hLength >= 60>>
+ <<include Art_Vector_Hair_Back_Tails_Long>>
+ <<elseif _artSlave.hLength >= 30>>
+ <<include Art_Vector_Hair_Back_Tails_Medium>>
+ <<elseif _artSlave.hLength >= 10>>
+ <<include Art_Vector_Hair_Back_Tails_Short>>
+ <</if>>
+ <<case "messy bun">>
+ <<if _artSlave.hLength >= 60>>
+ <<include Art_Vector_Hair_Back_Ninja_Long>>
+ <<elseif _artSlave.hLength >= 30>>
+ <<include Art_Vector_Hair_Back_Ninja_Medium>>
+ <<elseif _artSlave.hLength >= 10>>
+ <<include Art_Vector_Hair_Back_Ninja_Short>>
+ <</if>>
+ <<default>>
+ <<include Art_Vector_Hair_Back_Messy_Medium>>
+ <</switch>>
+ <</if>>
<</if>>
/* note: latex clothing actually shows some hair, but there is no appropriate art for it */
diff --git a/src/art/vector/Hair_Fore.tw b/src/art/vector/Hair_Fore.tw
index c4a9bb102165a4d3b8077349ca2c091446287beb..cde89211f8d47dffa8a8c8b4a426ec4cf3788cdd 100644
--- a/src/art/vector/Hair_Fore.tw
+++ b/src/art/vector/Hair_Fore.tw
@@ -1,125 +1,128 @@
:: Art_Vector_Hair_Fore_ [nobr]
/* TODO: simplify */
-
-<<if _artSlave.fuckdoll == 0 && _artSlave.hStyle != "shaved" && _artSlave.hStyle != "permed" && _artSlave.hStyle != "up" && _artSlave.hStyle != "neat" && _artSlave.hStyle != "ponytail" && _artSlave.hStyle != "bun" && _artSlave.hStyle != "curled" && _artSlave.hStyle != "eary" && _artSlave.hStyle != "luxurious" && _artSlave.hStyle != "afro" && _artSlave.hStyle != "messy" && _artSlave.hStyle != "dreadlocks" && _artSlave.hStyle != "cornrows" && _artSlave.hStyle != "braided" && _artSlave.hStyle != "tails" && _artSlave.hStyle != "strip" && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "a chattel habit" && _artSlave.clothes != "a fallen nuns habit" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "Western clothing" && _artSlave.hStyle != "messy bun" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a mounty outfit">>
- <<include Art_Vector_Hair_Fore_Messy_Medium>>
-<</if>>
-
-<<if _artSlave.fuckdoll != 0 || ( _artSlave.hStyle == "shaved" && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "a chattel habit" && _artSlave.clothes != "a fallen nuns habit" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a mounty outfit")>>
- <<include Art_Vector_Hair_Fore_NoHair>>
- <<elseif _artSlave.hStyle == "permed" && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "a chattel habit" && _artSlave.clothes != "a fallen nuns habit" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a mounty outfit">>
- <<if _artSlave.hLength >= 60>>
- <<include Art_Vector_Hair_Fore_Permed_Long>>
- <<elseif _artSlave.hLength >= 30>>
- <<include Art_Vector_Hair_Fore_Permed_Medium>>
- <<elseif _artSlave.hLength >= 10>>
- <<include Art_Vector_Hair_Fore_Permed_Short>>
- <</if>>
- <<elseif _artSlave.hStyle == "up" && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "a chattel habit" && _artSlave.clothes != "a fallen nuns habit" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a mounty outfit">>
- <<if _artSlave.hLength >= 60>>
- <<include Art_Vector_Hair_Fore_Up_Long>>
- <<elseif _artSlave.hLength >= 30>>
- <<include Art_Vector_Hair_Fore_Up_Med>>
- <<elseif _artSlave.hLength >= 10>>
- <<include Art_Vector_Hair_Fore_Up_Short>>
- <</if>>
- <<elseif _artSlave.hStyle == "neat" && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "a chattel habit" && _artSlave.clothes != "a fallen nuns habit" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a mounty outfit">>
- <<include Art_Vector_Hair_Fore_Neat>>
- <<elseif _artSlave.hStyle == "ponytail" && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "a chattel habit" && _artSlave.clothes != "a fallen nuns habit" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a mounty outfit">>
- <<include Art_Vector_Hair_Fore_Ponytail>>
- <<elseif _artSlave.hStyle == "bun" && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "a chattel habit" && _artSlave.clothes != "a fallen nuns habit" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a mounty outfit">>
- <<include Art_Vector_Hair_Fore_Bun>>
- <<elseif _artSlave.hStyle == "curled" && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "a chattel habit" && _artSlave.clothes != "a fallen nuns habit" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a mounty outfit">>
- <<if _artSlave.hLength >= 60>>
- <<include Art_Vector_Hair_Fore_Curled_Long>>
- <<elseif _artSlave.hLength >= 30>>
- <<include Art_Vector_Hair_Fore_Curled_Medium>>
- <<elseif _artSlave.hLength >= 10>>
- <<include Art_Vector_Hair_Fore_Curled_Short>>
- <</if>>
- <<elseif _artSlave.hStyle == "eary" && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "a chattel habit" && _artSlave.clothes != "a fallen nuns habit" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a mounty outfit">>
- <<if _artSlave.hLength >= 60>>
- <<include Art_Vector_Hair_Fore_Eary_Long>>
- <<elseif _artSlave.hLength >= 30>>
- <<include Art_Vector_Hair_Fore_Eary_Medium>>
- <<elseif _artSlave.hLength >= 10>>
- <<include Art_Vector_Hair_Fore_Eary_Short>>
- <</if>>
- <<elseif _artSlave.hStyle == "luxurious" && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "a chattel habit" && _artSlave.clothes != "a fallen nuns habit" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a mounty outfit">>
- <<if _artSlave.hLength >= 60>>
- <<include Art_Vector_Hair_Fore_Luxurious_Long>>
- <<elseif _artSlave.hLength >= 30>>
- <<include Art_Vector_Hair_Fore_Luxurious_Medium>>
- <<elseif _artSlave.hLength >= 10>>
- <<include Art_Vector_Hair_Fore_Luxurious_Short>>
- <</if>>
- <<elseif _artSlave.hStyle == "afro" && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "a chattel habit" && _artSlave.clothes != "a fallen nuns habit" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a mounty outfit">>
- <<if _artSlave.hLength >= 150>>
- <<include Art_Vector_Hair_Fore_Afro_Giant>>
- <<elseif _artSlave.hLength >= 60>>
- <<include Art_Vector_Hair_Fore_Afro_Long>>
- <<elseif _artSlave.hLength >= 30>>
- <<include Art_Vector_Hair_Fore_Afro_Medium>>
- <<elseif _artSlave.hLength >= 10>>
- <<include Art_Vector_Hair_Fore_Afro_Short>>
- <</if>>
- <<elseif _artSlave.hStyle == "messy" && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "a chattel habit" && _artSlave.clothes != "a fallen nuns habit" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a mounty outfit">>
- <<if _artSlave.hLength >= 60>>
- <<include Art_Vector_Hair_Fore_Messy_Long>>
- <<elseif _artSlave.hLength >= 30>>
- <<include Art_Vector_Hair_Fore_Messy_Medium>>
- <<elseif _artSlave.hLength >= 10>>
- <<include Art_Vector_Hair_Fore_Messy_Short>>
- <</if>>
- <<elseif _artSlave.hStyle == "dreadlocks" && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "a chattel habit" && _artSlave.clothes != "a fallen nuns habit" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a mounty outfit">>
- <<if _artSlave.hLength >= 60>>
- <<include Art_Vector_Hair_Fore_Dreadlocks_Long>>
- <<elseif _artSlave.hLength >= 30>>
- <<include Art_Vector_Hair_Fore_Dreadlocks_Medium>>
- <<elseif _artSlave.hLength >= 10>>
- <<include Art_Vector_Hair_Fore_Dreadlocks_Short>>
- <</if>>
- <<elseif _artSlave.hStyle == "cornrows" && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "a chattel habit" && _artSlave.clothes != "a fallen nuns habit" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a mounty outfit">>
- <<if _artSlave.hLength >= 60>>
- <<include Art_Vector_Hair_Fore_Cornrows_Long>>
- <<elseif _artSlave.hLength >= 30>>
- <<include Art_Vector_Hair_Fore_Cornrows_Medium>>
- <<elseif _artSlave.hLength >= 10>>
- <<include Art_Vector_Hair_Fore_Cornrows_Short>>
- <</if>>
- <<elseif _artSlave.hStyle == "braided" && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "a chattel habit" && _artSlave.clothes != "a fallen nuns habit" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a mounty outfit">>
- <<if _artSlave.hLength >= 60>>
- <<include Art_Vector_Hair_Fore_Braided_Long>>
- <<elseif _artSlave.hLength >= 30>>
- <<include Art_Vector_Hair_Fore_Braided_Medium>>
- <<elseif _artSlave.hLength >= 10>>
- <<include Art_Vector_Hair_Fore_Braided_Short>>
- <</if>>
- <<elseif _artSlave.hStyle == "tails" && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "a chattel habit" && _artSlave.clothes != "a fallen nuns habit" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a mounty outfit">>
- <<if _artSlave.hLength >= 60>>
- <<include Art_Vector_Hair_Fore_Tails_Long>>
- <<elseif _artSlave.hLength >= 30>>
- <<include Art_Vector_Hair_Fore_Tails_Medium>>
- <<elseif _artSlave.hLength >= 10>>
- <<include Art_Vector_Hair_Fore_Tails_Short>>
- <</if>>
- <<elseif _artSlave.hStyle == "strip" && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "a chattel habit" && _artSlave.clothes != "a fallen nuns habit" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a mounty outfit">>
- <<if _artSlave.hLength >= 60>>
- <<include Art_Vector_Hair_Fore_Strip_Long>>
- <<elseif _artSlave.hLength >= 30>>
- <<include Art_Vector_Hair_Fore_Strip_Medium>>
- <<elseif _artSlave.hLength >= 10>>
- <<include Art_Vector_Hair_Fore_Strip_Short>>
- <</if>>
- <<elseif _artSlave.hStyle == "messy bun" && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "a chattel habit" && _artSlave.clothes != "a fallen nuns habit" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a mounty outfit">>
- <<if _artSlave.hLength >= 60>>
- <<include Art_Vector_Hair_Fore_Ninja_Long>>
- <<elseif _artSlave.hLength >= 30>>
- <<include Art_Vector_Hair_Fore_Ninja_Medium>>
- <<elseif _artSlave.hLength >= 10>>
- <<include Art_Vector_Hair_Fore_Ninja_Short>>
- <</if>>
+<<if _artSlave.fuckdoll != 0>>
+ <<include Art_Vector_Hair_Fore_NoHair>>
+<<else>>
+ <<if _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "a chattel habit" && _artSlave.clothes != "a fallen nuns habit" && _artSlave.clothes != "a penitent nuns habit" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a mounty outfit">>
+ <<switch _artSlave.hStyle>>
+ <<case "shaved" "buzzcut">>
+ <<include Art_Vector_Hair_Fore_NoHair>>
+ <<case "permed">>
+ <<if _artSlave.hLength >= 60>>
+ <<include Art_Vector_Hair_Fore_Permed_Long>>
+ <<elseif _artSlave.hLength >= 30>>
+ <<include Art_Vector_Hair_Fore_Permed_Medium>>
+ <<elseif _artSlave.hLength >= 10>>
+ <<include Art_Vector_Hair_Fore_Permed_Short>>
+ <</if>>
+ <<case "up">>
+ <<if _artSlave.hLength >= 60>>
+ <<include Art_Vector_Hair_Fore_Up_Long>>
+ <<elseif _artSlave.hLength >= 30>>
+ <<include Art_Vector_Hair_Fore_Up_Med>>
+ <<elseif _artSlave.hLength >= 10>>
+ <<include Art_Vector_Hair_Fore_Up_Short>>
+ <</if>>
+ <<case "neat">>
+ <<include Art_Vector_Hair_Fore_Neat>>
+ <<case "ponytail">>
+ <<include Art_Vector_Hair_Fore_Ponytail>>
+ <<case "bun">>
+ <<include Art_Vector_Hair_Fore_Bun>>
+ <<case "curled">>
+ <<if _artSlave.hLength >= 60>>
+ <<include Art_Vector_Hair_Fore_Curled_Long>>
+ <<elseif _artSlave.hLength >= 30>>
+ <<include Art_Vector_Hair_Fore_Curled_Medium>>
+ <<elseif _artSlave.hLength >= 10>>
+ <<include Art_Vector_Hair_Fore_Curled_Short>>
+ <</if>>
+ <<case "eary">>
+ <<if _artSlave.hLength >= 60>>
+ <<include Art_Vector_Hair_Fore_Eary_Long>>
+ <<elseif _artSlave.hLength >= 30>>
+ <<include Art_Vector_Hair_Fore_Eary_Medium>>
+ <<elseif _artSlave.hLength >= 10>>
+ <<include Art_Vector_Hair_Fore_Eary_Short>>
+ <</if>>
+ <<case "luxurious">>
+ <<if _artSlave.hLength >= 60>>
+ <<include Art_Vector_Hair_Fore_Luxurious_Long>>
+ <<elseif _artSlave.hLength >= 30>>
+ <<include Art_Vector_Hair_Fore_Luxurious_Medium>>
+ <<elseif _artSlave.hLength >= 10>>
+ <<include Art_Vector_Hair_Fore_Luxurious_Short>>
+ <</if>>
+ <<case "afro">>
+ <<if _artSlave.hLength >= 150>>
+ <<include Art_Vector_Hair_Fore_Afro_Giant>>
+ <<elseif _artSlave.hLength >= 60>>
+ <<include Art_Vector_Hair_Fore_Afro_Long>>
+ <<elseif _artSlave.hLength >= 30>>
+ <<include Art_Vector_Hair_Fore_Afro_Medium>>
+ <<elseif _artSlave.hLength >= 10>>
+ <<include Art_Vector_Hair_Fore_Afro_Short>>
+ <</if>>
+ <<case "messy">>
+ <<if _artSlave.hLength >= 60>>
+ <<include Art_Vector_Hair_Fore_Messy_Long>>
+ <<elseif _artSlave.hLength >= 30>>
+ <<include Art_Vector_Hair_Fore_Messy_Medium>>
+ <<elseif _artSlave.hLength >= 10>>
+ <<include Art_Vector_Hair_Fore_Messy_Short>>
+ <</if>>
+ <<case "dreadlocks">>
+ <<if _artSlave.hLength >= 60>>
+ <<include Art_Vector_Hair_Fore_Dreadlocks_Long>>
+ <<elseif _artSlave.hLength >= 30>>
+ <<include Art_Vector_Hair_Fore_Dreadlocks_Medium>>
+ <<elseif _artSlave.hLength >= 10>>
+ <<include Art_Vector_Hair_Fore_Dreadlocks_Short>>
+ <</if>>
+ <<case "cornrows">>
+ <<if _artSlave.hLength >= 60>>
+ <<include Art_Vector_Hair_Fore_Cornrows_Long>>
+ <<elseif _artSlave.hLength >= 30>>
+ <<include Art_Vector_Hair_Fore_Cornrows_Medium>>
+ <<elseif _artSlave.hLength >= 10>>
+ <<include Art_Vector_Hair_Fore_Cornrows_Short>>
+ <</if>>
+ <<case "braided">>
+ <<if _artSlave.hLength >= 60>>
+ <<include Art_Vector_Hair_Fore_Braided_Long>>
+ <<elseif _artSlave.hLength >= 30>>
+ <<include Art_Vector_Hair_Fore_Braided_Medium>>
+ <<elseif _artSlave.hLength >= 10>>
+ <<include Art_Vector_Hair_Fore_Braided_Short>>
+ <</if>>
+ <<case "tails">>
+ <<if _artSlave.hLength >= 60>>
+ <<include Art_Vector_Hair_Fore_Tails_Long>>
+ <<elseif _artSlave.hLength >= 30>>
+ <<include Art_Vector_Hair_Fore_Tails_Medium>>
+ <<elseif _artSlave.hLength >= 10>>
+ <<include Art_Vector_Hair_Fore_Tails_Short>>
+ <</if>>
+ <<case "strip">>
+ <<if _artSlave.hLength >= 60>>
+ <<include Art_Vector_Hair_Fore_Strip_Long>>
+ <<elseif _artSlave.hLength >= 30>>
+ <<include Art_Vector_Hair_Fore_Strip_Medium>>
+ <<elseif _artSlave.hLength >= 10>>
+ <<include Art_Vector_Hair_Fore_Strip_Short>>
+ <</if>>
+ <<case "messy bun">>
+ <<if _artSlave.hLength >= 60>>
+ <<include Art_Vector_Hair_Fore_Ninja_Long>>
+ <<elseif _artSlave.hLength >= 30>>
+ <<include Art_Vector_Hair_Fore_Ninja_Medium>>
+ <<elseif _artSlave.hLength >= 10>>
+ <<include Art_Vector_Hair_Fore_Ninja_Short>>
+ <</if>>
+ <<default>>
+ <<include Art_Vector_Hair_Fore_Messy_Medium>>
+ <</switch>>
+ <</if>>
<</if>>
-
/* note: latex clothing actually shows some hair, but there is no appropriate art for it */
diff --git a/src/art/vector/Pussy_Piercings.tw b/src/art/vector/Pussy_Piercings.tw
index 9560e1483cebc72acc9663d50c14d857718d3e22..7daf3bf99b4e52d82108f820277f03ecd596ac50 100644
--- a/src/art/vector/Pussy_Piercings.tw
+++ b/src/art/vector/Pussy_Piercings.tw
@@ -1,16 +1,25 @@
:: Art_Vector_Pussy_Piercings_ [nobr]
-<<if _artSlave.vaginaPiercing == 1 && _artSlave.clothes != "a cheerleader outfit" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "cutoffs and a t-shirt" && _artSlave.clothes != "a halter top dress" && _artSlave.clothes != "a mini dress" && _artSlave.clothes != "a leotard" && _artSlave.clothes != "a nice maid outfit" && _artSlave.clothes != "a slutty maid outfit" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a nice nurse outfit" && _artSlave.clothes != "a schoolgirl outfit" && _artSlave.clothes != "a scalemail bikini" && _artSlave.clothes != "a slutty nurse outfit" && _artSlave.clothes != "a ball gown" && _artSlave.clothes != "battledress" && _artSlave.clothes != "spats and a tank top" && _artSlave.clothes != "nice business attire" && _artSlave.clothes != "slutty business attire" && _artSlave.clothes != "a bunny outfit" && _artSlave.clothes != "conservative clothing" && _artSlave.clothes != "a huipil" && _artSlave.clothes != "a kimono" && _artSlave.clothes != "a slave gown" && _artSlave.clothes != "stretch pants and a crop-top" && _artSlave.clothes != "a maternity dress" && _artSlave.clothes != "a slutty qipao" && _artSlave.clothes != "a toga" && _artSlave.clothes != "clubslut netting" && _artSlave.clothes != "a slutty outfit" && _artSlave.clothes != "harem gauze" && _artSlave.clothes != "a penitent nuns outfit" && _artSlave.clothes != "attractive lingerie for a pregnant woman" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a dirndl" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "lederhosen" && _artSlave.clothes != "a mounty outfit" && _artSlave.clothes != "a long qipao" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "an apron">>
- <<include Art_Vector_Pussy_Piercing>>
-<<elseif _artSlave.vaginaPiercing == 2 && _artSlave.clothes != "a cheerleader outfit" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "cutoffs and a t-shirt" && _artSlave.clothes != "a halter top dress" && _artSlave.clothes != "a mini dress" && _artSlave.clothes != "a leotard" && _artSlave.clothes != "a nice maid outfit" && _artSlave.clothes != "a slutty maid outfit" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a nice nurse outfit" && _artSlave.clothes != "a schoolgirl outfit" && _artSlave.clothes != "a scalemail bikini" && _artSlave.clothes != "a slutty nurse outfit" && _artSlave.clothes != "a ball gown" && _artSlave.clothes != "battledress" && _artSlave.clothes != "spats and a tank top" && _artSlave.clothes != "nice business attire" && _artSlave.clothes != "slutty business attire" && _artSlave.clothes != "a bunny outfit" && _artSlave.clothes != "conservative clothing" && _artSlave.clothes != "a huipil" && _artSlave.clothes != "a kimono" && _artSlave.clothes != "a slave gown" && _artSlave.clothes != "stretch pants and a crop-top" && _artSlave.clothes != "a maternity dress" && _artSlave.clothes != "a slutty qipao" && _artSlave.clothes != "a toga" && _artSlave.clothes != "clubslut netting" && _artSlave.clothes != "a slutty outfit" && _artSlave.clothes != "harem gauze" && _artSlave.clothes != "a penitent nuns outfit" && _artSlave.clothes != "attractive lingerie for a pregnant woman" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a dirndl" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "lederhosen" && _artSlave.clothes != "a mounty outfit" && _artSlave.clothes != "a long qipao" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "an apron">>
- <<include Art_Vector_Pussy_Piercing_Heavy>>
+<<if _artSlave.vaginaPiercing > 0>>
+ <<if _artSlave.clothes != "a cheerleader outfit" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "cutoffs and a t-shirt" && _artSlave.clothes != "a halter top dress" && _artSlave.clothes != "a mini dress" && _artSlave.clothes != "a leotard" && _artSlave.clothes != "a nice maid outfit" && _artSlave.clothes != "a slutty maid outfit" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a nice nurse outfit" && _artSlave.clothes != "a schoolgirl outfit" && _artSlave.clothes != "a scalemail bikini" && _artSlave.clothes != "a slutty nurse outfit" && _artSlave.clothes != "a ball gown" && _artSlave.clothes != "battledress" && _artSlave.clothes != "spats and a tank top" && _artSlave.clothes != "nice business attire" && _artSlave.clothes != "slutty business attire" && _artSlave.clothes != "a bunny outfit" && _artSlave.clothes != "conservative clothing" && _artSlave.clothes != "a huipil" && _artSlave.clothes != "a kimono" && _artSlave.clothes != "a slave gown" && _artSlave.clothes != "stretch pants and a crop-top" && _artSlave.clothes != "a maternity dress" && _artSlave.clothes != "a slutty qipao" && _artSlave.clothes != "a toga" && _artSlave.clothes != "clubslut netting" && _artSlave.clothes != "a slutty outfit" && _artSlave.clothes != "harem gauze" && _artSlave.clothes != "a penitent nuns outfit" && _artSlave.clothes != "attractive lingerie for a pregnant woman" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a dirndl" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "lederhosen" && _artSlave.clothes != "a mounty outfit" && _artSlave.clothes != "a long qipao" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "an apron">>
+ <<if _artSlave.vaginaPiercing == 1>>
+ <<include Art_Vector_Pussy_Piercing>>
+ <<else>>
+ <<include Art_Vector_Pussy_Piercing_Heavy>>
+ <</if>>
+ <</if>>
<</if>>
-<<if _artSlave.clitPiercing == 1 && _artSlave.clothes != "a cheerleader outfit" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "cutoffs and a t-shirt" && _artSlave.clothes != "a halter top dress" && _artSlave.clothes != "a mini dress" && _artSlave.clothes != "a leotard" && _artSlave.clothes != "a nice maid outfit" && _artSlave.clothes != "a slutty maid outfit" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a nice nurse outfit" && _artSlave.clothes != "a schoolgirl outfit" && _artSlave.clothes != "a scalemail bikini" && _artSlave.clothes != "a slutty nurse outfit" && _artSlave.clothes != "a ball gown" && _artSlave.clothes != "battledress" && _artSlave.clothes != "spats and a tank top" && _artSlave.clothes != "nice business attire" && _artSlave.clothes != "slutty business attire" && _artSlave.clothes != "a bunny outfit" && _artSlave.clothes != "conservative clothing" && _artSlave.clothes != "a huipil" && _artSlave.clothes != "a kimono" && _artSlave.clothes != "a slave gown" && _artSlave.clothes != "stretch pants and a crop-top" && _artSlave.clothes != "a maternity dress" && _artSlave.clothes != "a slutty qipao" && _artSlave.clothes != "a toga" && _artSlave.clothes != "clubslut netting" && _artSlave.clothes != "a slutty outfit" && _artSlave.clothes != "harem gauze" && _artSlave.clothes != "a penitent nuns outfit" && _artSlave.clothes != "attractive lingerie for a pregnant woman" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a dirndl" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "lederhosen" && _artSlave.clothes != "a mounty outfit" && _artSlave.clothes != "a long qipao" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "an apron">>
- <<include Art_Vector_Clit_Piercing>>
-<<elseif _artSlave.clitPiercing == 2 && _artSlave.clothes != "a cheerleader outfit" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "cutoffs and a t-shirt" && _artSlave.clothes != "a halter top dress" && _artSlave.clothes != "a mini dress" && _artSlave.clothes != "a leotard" && _artSlave.clothes != "a nice maid outfit" && _artSlave.clothes != "a slutty maid outfit" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a nice nurse outfit" && _artSlave.clothes != "a schoolgirl outfit" && _artSlave.clothes != "a scalemail bikini" && _artSlave.clothes != "a slutty nurse outfit" && _artSlave.clothes != "a ball gown" && _artSlave.clothes != "battledress" && _artSlave.clothes != "spats and a tank top" && _artSlave.clothes != "nice business attire" && _artSlave.clothes != "slutty business attire" && _artSlave.clothes != "a bunny outfit" && _artSlave.clothes != "conservative clothing" && _artSlave.clothes != "a huipil" && _artSlave.clothes != "a kimono" && _artSlave.clothes != "a slave gown" && _artSlave.clothes != "stretch pants and a crop-top" && _artSlave.clothes != "a maternity dress" && _artSlave.clothes != "a slutty qipao" && _artSlave.clothes != "a toga" && _artSlave.clothes != "clubslut netting" && _artSlave.clothes != "a slutty outfit" && _artSlave.clothes != "harem gauze" && _artSlave.clothes != "a penitent nuns outfit" && _artSlave.clothes != "attractive lingerie for a pregnant woman" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a dirndl" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "lederhosen" && _artSlave.clothes != "a mounty outfit" && _artSlave.clothes != "a long qipao" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "an apron">>
- <<include Art_Vector_Clit_Piercing_Heavy>>
-<<elseif _artSlave.clitPiercing == 3 && _artSlave.clothes != "a cheerleader outfit" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "cutoffs and a t-shirt" && _artSlave.clothes != "a halter top dress" && _artSlave.clothes != "a mini dress" && _artSlave.clothes != "a leotard" && _artSlave.clothes != "a nice maid outfit" && _artSlave.clothes != "a slutty maid outfit" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a nice nurse outfit" && _artSlave.clothes != "a schoolgirl outfit" && _artSlave.clothes != "a scalemail bikini" && _artSlave.clothes != "a slutty nurse outfit" && _artSlave.clothes != "a ball gown" && _artSlave.clothes != "battledress" && _artSlave.clothes != "spats and a tank top" && _artSlave.clothes != "nice business attire" && _artSlave.clothes != "slutty business attire" && _artSlave.clothes != "a bunny outfit" && _artSlave.clothes != "conservative clothing" && _artSlave.clothes != "a huipil" && _artSlave.clothes != "a kimono" && _artSlave.clothes != "a slave gown" && _artSlave.clothes != "stretch pants and a crop-top" && _artSlave.clothes != "a maternity dress" && _artSlave.clothes != "a slutty qipao" && _artSlave.clothes != "a toga" && _artSlave.clothes != "clubslut netting" && _artSlave.clothes != "a slutty outfit" && _artSlave.clothes != "harem gauze" && _artSlave.clothes != "a penitent nuns outfit" && _artSlave.clothes != "attractive lingerie for a pregnant woman" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a dirndl" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "lederhosen" && _artSlave.clothes != "a mounty outfit" && _artSlave.clothes != "a long qipao" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "an apron">>
- <<include Art_Vector_Clit_Piercing_Smart>>
+
+<<if _artSlave.clitPiercing > 0>>
+ <<if _artSlave.clothes != "a cheerleader outfit" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "cutoffs and a t-shirt" && _artSlave.clothes != "a halter top dress" && _artSlave.clothes != "a mini dress" && _artSlave.clothes != "a leotard" && _artSlave.clothes != "a nice maid outfit" && _artSlave.clothes != "a slutty maid outfit" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a nice nurse outfit" && _artSlave.clothes != "a schoolgirl outfit" && _artSlave.clothes != "a scalemail bikini" && _artSlave.clothes != "a slutty nurse outfit" && _artSlave.clothes != "a ball gown" && _artSlave.clothes != "battledress" && _artSlave.clothes != "spats and a tank top" && _artSlave.clothes != "nice business attire" && _artSlave.clothes != "slutty business attire" && _artSlave.clothes != "a bunny outfit" && _artSlave.clothes != "conservative clothing" && _artSlave.clothes != "a huipil" && _artSlave.clothes != "a kimono" && _artSlave.clothes != "a slave gown" && _artSlave.clothes != "stretch pants and a crop-top" && _artSlave.clothes != "a maternity dress" && _artSlave.clothes != "a slutty qipao" && _artSlave.clothes != "a toga" && _artSlave.clothes != "clubslut netting" && _artSlave.clothes != "a slutty outfit" && _artSlave.clothes != "harem gauze" && _artSlave.clothes != "a penitent nuns outfit" && _artSlave.clothes != "attractive lingerie for a pregnant woman" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a dirndl" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "lederhosen" && _artSlave.clothes != "a mounty outfit" && _artSlave.clothes != "a long qipao" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "an apron">>
+ <<if _artSlave.clitPiercing == 1>>
+ <<include Art_Vector_Clit_Piercing>>
+ <<elseif _artSlave.clitPiercing == 2>>
+ <<include Art_Vector_Clit_Piercing_Heavy>>
+ <<elseif _artSlave.clitPiercing == 3>>
+ <<include Art_Vector_Clit_Piercing_Smart>>
+ <</if>>
+ <</if>>
<</if>>
-/* piercinglevel = 1; Light, piercinglevel = 2; Heavy, piercinglevel = 3; Smart, piercinglevel = 0; None */
\ No newline at end of file
+/* piercinglevel = 1; Light, piercinglevel = 2; Heavy, piercinglevel = 3; Smart, piercinglevel = 0; None */
diff --git a/src/art/vector/Set_Colour_Skin.tw b/src/art/vector/Set_Colour_Skin.tw
index b4ef0fc86494c13b54e2693ed67fd747f2d535bb..5694249e07c388bddfda34b185d7f3d98958ea1d 100644
--- a/src/art/vector/Set_Colour_Skin.tw
+++ b/src/art/vector/Set_Colour_Skin.tw
@@ -131,9 +131,8 @@
<<set _areolaStyle = "fill:#E7DF7D;" >>
<<set _labiaStyle = "fill:#F977A3;" >>
<</if>>
-<</if>>
-<<if _artSlave.race == "black" || _artSlave.race == "surgically altered to look black">>
+<<elseif _artSlave.race == "black" || _artSlave.race == "surgically altered to look black">>
<<if _artSlave.skin == "pure white">>
<<set _skinColour = "#FEE4CA">>
<<set _areolaStyle = "fill:#E0B3A2;" >>
@@ -251,9 +250,8 @@
<<set _areolaStyle = "fill:#E7DF7D;" >>
<<set _labiaStyle = "fill:#F977A3;" >>
<</if>>
-<</if>>
-<<if _artSlave.race == "latina" || _artSlave.race == "surgically altered to look latina">>
+<<elseif _artSlave.race == "latina" || _artSlave.race == "surgically altered to look latina">>
<<if _artSlave.skin == "pure white">>
<<set _skinColour = "#FEDECE">>
<<set _areolaStyle = "fill:#E3BBAB;" >>
@@ -371,9 +369,8 @@
<<set _areolaStyle = "fill:#E7DF7D;" >>
<<set _labiaStyle = "fill:#F977A3;" >>
<</if>>
-<</if>>
-<<if _artSlave.race == "asian" || _artSlave.race == "surgically altered to look asian">>
+<<elseif _artSlave.race == "asian" || _artSlave.race == "surgically altered to look asian">>
<<if _artSlave.skin == "pure white">>
<<set _skinColour = "#FFF8EE">>
<<set _areolaStyle = "fill:#F7DBD0;" >>
@@ -491,9 +488,8 @@
<<set _areolaStyle = "fill:#E7DF7D;" >>
<<set _labiaStyle = "fill:#F977A3;" >>
<</if>>
-<</if>>
-<<if _artSlave.race == "middle eastern" || _artSlave.race == "surgically altered to look middle eastern">>
+<<elseif _artSlave.race == "middle eastern" || _artSlave.race == "surgically altered to look middle eastern">>
<<if _artSlave.skin == "pure white">>
<<set _skinColour = "#E8CFCF">>
<<set _areolaStyle = "fill:#DCADBC;" >>
@@ -611,9 +607,8 @@
<<set _areolaStyle = "fill:#E7DF7D;" >>
<<set _labiaStyle = "fill:#F977A3;" >>
<</if>>
-<</if>>
-<<if _artSlave.race == "amerindian" || _artSlave.race == "surgically altered to look amerindian">>
+<<elseif _artSlave.race == "amerindian" || _artSlave.race == "surgically altered to look amerindian">>
<<if _artSlave.skin == "pure white">>
<<set _skinColour = "#FDE4BF">>
<<set _areolaStyle = "fill:#F0BEAA;" >>
@@ -731,9 +726,8 @@
<<set _areolaStyle = "fill:#E7DF7D;" >>
<<set _labiaStyle = "fill:#F977A3;" >>
<</if>>
-<</if>>
-<<if _artSlave.race == "southern european" || _artSlave.race == "surgically altered to look southern european">>
+<<elseif _artSlave.race == "southern european" || _artSlave.race == "surgically altered to look southern european">>
<<if _artSlave.skin == "pure white">>
<<set _skinColour = "#EBDBE4">>
<<set _areolaStyle = "fill:#FFE4E0;" >>
@@ -851,9 +845,8 @@
<<set _areolaStyle = "fill:#E7DF7D;" >>
<<set _labiaStyle = "fill:#F977A3;" >>
<</if>>
-<</if>>
-<<if _artSlave.race == "semitic" || _artSlave.race == "surgically altered to look semitic">>
+<<elseif _artSlave.race == "semitic" || _artSlave.race == "surgically altered to look semitic">>
<<if _artSlave.skin == "pure white">>
<<set _skinColour = "#E8CFCF">>
<<set _areolaStyle = "fill:#DCADBC;" >>
@@ -971,9 +964,8 @@
<<set _areolaStyle = "fill:#E7DF7D;" >>
<<set _labiaStyle = "fill:#F977A3;" >>
<</if>>
-<</if>>
-<<if _artSlave.race == "malay" || _artSlave.race == "surgically altered to look malay">>
+<<elseif _artSlave.race == "malay" || _artSlave.race == "surgically altered to look malay">>
<<if _artSlave.skin == "pure white">>
<<set _skinColour = "#FBD1B2">>
<<set _areolaStyle = "fill:#F39E7D;" >>
@@ -1091,9 +1083,8 @@
<<set _areolaStyle = "fill:#E7DF7D;" >>
<<set _labiaStyle = "fill:#F977A3;" >>
<</if>>
-<</if>>
-<<if _artSlave.race == "indo-aryan" || _artSlave.race == "surgically altered to look indo-aryan">>
+<<elseif _artSlave.race == "indo-aryan" || _artSlave.race == "surgically altered to look indo-aryan">>
<<if _artSlave.skin == "pure white">>
<<set _skinColour = "#F8D4BE">>
<<set _areolaStyle = "fill:#F8B6A4;" >>
@@ -1211,9 +1202,8 @@
<<set _areolaStyle = "fill:#E7DF7D;" >>
<<set _labiaStyle = "fill:#F977A3;" >>
<</if>>
-<</if>>
-<<if _artSlave.race == "pacific islander" || _artSlave.race == "surgically altered to look pacific islander">>
+<<elseif _artSlave.race == "pacific islander" || _artSlave.race == "surgically altered to look pacific islander">>
<<if _artSlave.skin == "pure white">>
<<set _skinColour = "#FBD1B2">>
<<set _areolaStyle = "fill:#F39E7D;" >>
@@ -1331,9 +1321,8 @@
<<set _areolaStyle = "fill:#E7DF7D;" >>
<<set _labiaStyle = "fill:#F977A3;" >>
<</if>>
-<</if>>
-<<if _artSlave.race == "mixed race" || _artSlave.race == "surgically altered to look mixed race">>
+<<elseif _artSlave.race == "mixed race" || _artSlave.race == "surgically altered to look mixed race">>
<<if _artSlave.skin == "pure white">>
<<set _skinColour = "#FEE5CC">>
<<set _areolaStyle = "fill:#E3BBAB;" >>
@@ -1505,149 +1494,112 @@
<</if>>
/* outfit dick coloring to match outfit rgba in svg */
-<<if _artSlave.clothes == "a cheerleader outfit">>
+<<switch _artSlave.clothes>>
+<<case "a cheerleader outfit">>
<<set _scrotumSkinStyle = "fill:rgba(250,186,0,1);">>
<<set _bellySkinStyle = "fill:rgba(250,186,0,1);">>
-<</if>>
-<<if _artSlave.clothes == "cutoffs and a t-shirt">>
+<<case "cutoffs and a t-shirt">>
<<set _scrotumSkinStyle = "fill:rgba(81,124,211,1);">>
-<</if>>
-<<if _artSlave.clothes == "a halter top dress">>
+<<case "a halter top dress">>
<<set _scrotumSkinStyle = "fill:rgba(94,51,124,1);">>
<<set _bellySkinStyle = "fill:rgba(94,51,124,1);">>
-<</if>>
-<<if _artSlave.clothes == "a hijab and abaya">>
+<<case "a hijab and abaya">>
<<set _scrotumSkinStyle = "fill:rgba(51,51,51,1);">>
<<set _bellySkinStyle = "fill:rgba(51,51,51,1);">>
-<</if>>
-<<if _artSlave.clothes == "a nice maid outfit">>
+<<case "a nice maid outfit">>
<<set _scrotumSkinStyle = "fill:rgba(225,225,225,1);">>
<<set _bellySkinStyle = "fill:rgba(225,225,225,1);">>
-<</if>>
-<<if _artSlave.clothes == "a slutty maid outfit">>
+<<case "a slutty maid outfit">>
<<set _scrotumSkinStyle = "fill:rgba(225,225,225,1);">>
<<set _bellySkinStyle = "fill:rgba(225,225,225,1);">>
-<</if>>
-<<if _artSlave.clothes == "a leotard">>
+<<case "a leotard">>
<<set _scrotumSkinStyle = "fill:rgba(120,15,55,1);">>
<<set _bellySkinStyle = "fill:rgba(120,15,55,1);">>
-<</if>>
-<<if _artSlave.clothes == "a military uniform">>
+<<case "a military uniform">>
<<set _scrotumSkinStyle = "fill:rgba(34,42,18,1);">>
<<set _bellySkinStyle = "fill:rgba(34,42,18,1);">>
-<</if>>
-<<if _artSlave.clothes == "a mini dress">>
+<<case "a mini dress">>
<<set _scrotumSkinStyle = "fill:rgba(39,174,96,1);">>
<<set _bellySkinStyle = "fill:rgba(39,174,96,1);">>
-<</if>>
-<<if _artSlave.clothes == "a nice nurse outfit">>
+<<case "a nice nurse outfit">>
<<set _scrotumSkinStyle = "fill:rgba(0,128,128,1);">>
<<set _bellySkinStyle = "fill:rgba(0,128,128,1);">>
-<</if>>
-<<if _artSlave.clothes == "a slutty nurse outfit">>
+<<case "a slutty nurse outfit">>
<<set _scrotumSkinStyle = "fill:rgba(200,200,200,1);">>
-<</if>>
-<<if _artSlave.clothes == "a scalemail bikini">>
+<<case "a scalemail bikini">>
<<set _scrotumSkinStyle = "fill:rgba(133,146,158,1);">>
-<</if>>
-<<if _artSlave.clothes == "a schoolgirl outfit">>
+<<case "a schoolgirl outfit">>
<<set _scrotumSkinStyle = "fill:rgba(28,31,36,1);">>
<<set _bellySkinStyle = "fill:rgba(28,31,36,1);">>
-<</if>>
-<<if _artSlave.clothes == "a ball gown">>
+<<case "a ball gown">>
<<set _scrotumSkinStyle = "fill:rgba(128,0,0,1);">>
<<set _bellySkinStyle = "fill:rgba(128,0,0,1);">>
-<</if>>
-<<if _artSlave.clothes == "battledress">>
+<<case "battledress">>
<<set _scrotumSkinStyle = "fill:rgba(34,42,18,1);">>
<<set _bellySkinStyle = "fill:rgba(34,42,18,1);">>
-<</if>>
-<<if _artSlave.clothes == "a slave gown">>
+<<case "a slave gown">>
<<set _scrotumSkinStyle = "fill:rgba(200,200,200,1);">>
<<set _bellySkinStyle = "fill:rgba(200,200,200,1);">>
-<</if>>
-<<if _artSlave.clothes == "a slutty outfit">>
+<<case "a slutty outfit">>
<<set _scrotumSkinStyle = "fill:rgba(63,126,181,1);">>
-<</if>>
-<<if _artSlave.clothes == "spats and a tank top">>
+<<case "spats and a tank top">>
<<set _scrotumSkinStyle = "fill:rgba(51,51,51,1);">>
-<</if>>
-<<if _artSlave.clothes == "a succubus outfit">>
+<<case "a succubus outfit">>
<<set _scrotumSkinStyle = "fill:rgba(128,0,0,1);">>
<<set _bellySkinStyle = "fill:rgba(128,0,0,1);">>
-<</if>>
-<<if _artSlave.clothes == "nice business attire">>
+<<case "nice business attire">>
<<set _scrotumSkinStyle = "fill:rgba(51,51,51,1);">>
<<set _bellySkinStyle = "fill:rgba(51,51,51,1);">>
-<</if>>
-<<if _artSlave.clothes == "slutty business attire">>
+<<case "slutty business attire">>
<<set _scrotumSkinStyle = "fill:rgba(51,51,51,1);">>
-<</if>>
-<<if _artSlave.clothes == "attractive lingerie for a pregnant woman">>
+<<case "attractive lingerie for a pregnant woman">>
<<set _scrotumSkinStyle = "fill:rgba(153,153,153,1);">>
-<</if>>
-<<if _artSlave.clothes == "a bunny outfit">>
+<<case "a bunny outfit">>
<<set _scrotumSkinStyle = "fill:rgba(51,51,51,1);">>
<<set _bellySkinStyle = "fill:rgba(51,51,51,1);">>
-<</if>>
-<<if _artSlave.clothes == "conservative clothing">>
+<<case "conservative clothing">>
<<set _scrotumSkinStyle = "fill:rgba(51,51,51,1);">>
<<set _bellySkinStyle = "fill:rgba(51,51,51,1);">>
-<</if>>
-<<if _artSlave.clothes == "harem gauze">>
+<<case "harem gauze">>
<<set _scrotumSkinStyle = "fill:rgba(0,168,131,1);">>
-<</if>>
-<<if _artSlave.clothes == "a huipil">>
+<<case "a huipil">>
<<set _scrotumSkinStyle = "fill:rgba(200,200,200,1);">>
<<set _bellySkinStyle = "fill:rgba(200,200,200,1);">>
-<</if>>
-<<if _artSlave.clothes == "a kimono">>
+<<case "a kimono">>
<<set _scrotumSkinStyle = "fill:rgba(0,91,150,1);">>
<<set _bellySkinStyle = "fill:rgba(0,91,150,1);">>
-<</if>>
-<<if _artSlave.clothes == "a maternity dress">>
+<<case "a maternity dress">>
<<set _scrotumSkinStyle = "fill:rgba(48,54,72,1);">>
<<set _bellySkinStyle = "fill:rgba(48,54,72,1);">>
-<</if>>
-<<if _artSlave.clothes == "a slutty qipao">>
+<<case "a slutty qipao">>
<<set _scrotumSkinStyle = "fill:rgba(204,177,68,1);">>
<<set _bellySkinStyle = "fill:rgba(204,177,68,1);">>
-<</if>>
-<<if _artSlave.clothes == "stretch pants and a crop-top">>
+<<case "stretch pants and a crop-top">>
<<set _scrotumSkinStyle = "fill:rgba(51,51,51,1);">>
-<</if>>
-<<if _artSlave.clothes == "a toga">>
+<<case "a toga">>
<<set _scrotumSkinStyle = "fill:rgba(200,200,200,1);">>
<<set _bellySkinStyle = "fill:rgba(200,200,200,1);">>
-<</if>>
-<<if _artSlave.clothes == "a penitent nuns habit">>
+<<case "a penitent nuns habit">>
<<set _scrotumSkinStyle = "fill:rgba(114,93,73,1);">>
-<</if>>
-<<if _artSlave.clothes == "a chattel habit">>
+<<case "a chattel habit">>
<<set _scrotumSkinStyle = "fill:rgba(200,200,200,1);">>
-<</if>>
-<<if _artSlave.clothes == "a monokini">>
+<<case "a monokini">>
<<set _scrotumSkinStyle = "fill:rgba(33,47,61,1);">>
-<</if>>
-<<if _artSlave.clothes == "a schutzstaffel uniform">>
+<<case "a schutzstaffel uniform">>
<<set _scrotumSkinStyle = "fill:rgba(51,51,51,1);">>
<<set _bellySkinStyle = "fill:rgba(51,51,51,1);">>
-<</if>>
-<<if _artSlave.clothes == "a slutty schutzstaffel uniform">>
+<<case "a slutty schutzstaffel uniform">>
<<set _scrotumSkinStyle = "fill:rgba(51,51,51,1);">>
<<set _bellySkinStyle = "fill:rgba(51,51,51,1);">>
-<</if>>
-<<if _artSlave.clothes == "a red army uniform">>
+<<case "a red army uniform">>
<<set _scrotumSkinStyle = "fill:rgba(114,93,73,1);">>
<<set _bellySkinStyle = "fill:rgba(114,93,73,1);">>
-<</if>>
-<<if _artSlave.clothes == "an apron">>
+<<case "an apron">>
<<set _scrotumSkinStyle = "fill:rgba(255,105,180,1);">>
<<set _bellySkinStyle = "fill:rgba(255,105,180,1);">>
-<</if>>
-<<if _artSlave.clothes == "a fallen nuns habit">>
+<<case "a fallen nuns habit">>
<<set _bellySkinStyle = "fill:rgba(51,51,51,1);">>
-<</if>>
+<</switch>>
/* END SKIN COLOUR OVERRIDES FOR LATEX CLOTHING EMULATION */
diff --git a/src/cheats/mod_EditArcologyCheat.tw b/src/cheats/mod_EditArcologyCheat.tw
index 3ea8d86dd87fadc7a4c34815f01beb761b9482bc..59b8034133f16c9ea978c02666f51f09d6e88c9b 100644
--- a/src/cheats/mod_EditArcologyCheat.tw
+++ b/src/cheats/mod_EditArcologyCheat.tw
@@ -306,6 +306,7 @@ International slave variety is
<<radiobutton "$TFS.schoolUpgrade" 0>> 0
| <<radiobutton "$TFS.schoolUpgrade" 1>> 1
| <<radiobutton "$TFS.schoolUpgrade" 2>> 2
+| <<radiobutton "$TFS.schoolUpgrade" 3>> 3
<br>TFS Moved to Arcology: ''$TFS.schoolPresent'' |
<<radiobutton "$TFS.schoolPresent" 0>> 0
diff --git a/src/events/intro/pcExperienceIntro.tw b/src/events/intro/pcExperienceIntro.tw
index 35d181c21c873bce289df80ecd3110a7f757d3e0..80d1115abd707720278c4737b707b71609f1d391 100644
--- a/src/events/intro/pcExperienceIntro.tw
+++ b/src/events/intro/pcExperienceIntro.tw
@@ -10,21 +10,21 @@
<br>[[Idle wealth|PC Rumor Intro][$PC.career = "wealth"]]
<br> //Start with @@.yellowgreen;extra money@@.
<<if $showSecExp == 1>>
- However you will find it @@.red;harder to maintain authority@@ and @@.yellowgreen;propaganda hub upgrades will be cheaper@@ .
+ However, you will find it @@.red;harder to maintain authority,@@ but @@.yellowgreen;propaganda hub upgrades will be cheaper.@@
<</if>>
Your starting slaves will have two free levels of @@.cyan;sex skills@@ available.//
<br>[[Venture capitalism|PC Rumor Intro][$PC.career = "capitalist"]]
- <br> //You will be more @@.green;effective at business pursuits@@ .
+ <br> //You will be more @@.green;effective at business pursuits.@@
<<if $showSecExp == 1>>
- In addition @@.yellowgreen;propaganda hub upgrades will be cheaper@@ .
+ In addition, @@.yellowgreen;propaganda hub upgrades will be cheaper.@@
<</if>>
Your starting slaves will have a free level of @@.cyan;prostitution skill@@ available.//
<br>[[Private military work|PC Rumor Intro][$PC.career = "mercenary"]]
<br> //You retain mercenary contacts
<<if $showSecExp == 1>>
- and your security skills will make it @@.green;easier to keep the arcology safe@@. Also @@.yellowgreen;security HQ upgrades will be cheaper@@ .
+ and your security skills will make it @@.green;easier to keep the arcology safe.@@ Also, @@.yellowgreen;security HQ upgrades will be cheaper.@@
<<else>>
and security skills.
<</if>>
@@ -33,48 +33,42 @@
<br>[[Slaving|PC Rumor Intro][$PC.career = "slaver"]]
<br> //Your slave breaking experience will be useful.
<<if $showSecExp == 1>>
- You will find that authority will be @@.green;easier to maintain@@ and @@.yellowgreen;security HQ upgrades will be cheaper@@.
+ You will find that authority will be @@.green;easier to maintain@@ and @@.yellowgreen;security HQ upgrades will be cheaper.@@
<</if>>
Your starting slaves will have free @@.hotpink;devotion@@ available.//
<br>[[Arcology engineering|PC Rumor Intro][$PC.career = "engineer"]]
- <br> //@@.yellowgreen;Upgrading the arcology will be cheaper@@. Also, the arcology will start with @@.yellowgreen;basic economic upgrades@@ already installed.//
+ <br> //@@.yellowgreen;Upgrading the arcology will be cheaper.@@ Also, the arcology will start with @@.yellowgreen;basic economic upgrades@@ already installed.//
<br>[[Slave surgery|PC Rumor Intro][$PC.career = "medicine"]]
- <br> //Surgery will be @@.yellowgreen;cheaper@@ and @@.green;healthier@@ and @@.yellowgreen;drug upgrades will be cheaper@@. Your starting slaves will have free implants available.//
+ <br> //Surgery will be @@.yellowgreen;cheaper@@ and @@.green;healthier@@ and @@.yellowgreen;drug upgrades will be cheaper.@@ Your starting slaves will have free implants available.//
<br>[[Minor celebrity|PC Rumor Intro][$PC.career = "celebrity"]]
- <br> //Start with @@.green;extra reputation@@.
+ <br> //Start with @@.green;extra reputation.@@
<<if $showSecExp == 1>>
- In addition @@.yellowgreen;propaganda hub upgrades will be cheaper@@.
+ In addition, @@.yellowgreen;propaganda hub upgrades will be cheaper.@@
<</if>>
Your starting slaves will have a free level of @@.cyan;entertainment skill@@ available.//
<br>[[High class escort|PC Rumor Intro][$PC.career = "escort"]]
- <br> //As an ex-whore, you will find it @@.red;hard to maintain reputation@@.
- <<if $showSecExp == 1>>
- @@.red;In addition to authority@@.
- <</if>>
- Your starting slaves will have a free level of @@.cyan;sex skills@@ available, along with a free level of @@.cyan;entertainment and prostitution@@ .//
+ <br> //As an ex-whore, you will find it @@.red;hard to maintain reputation@@<<if $showSecExp == 1>>, @@.red;in addition to authority@@<</if>>.
+ Your starting slaves will have a free level of @@.cyan;sex skills@@ available, along with a free level of @@.cyan;entertainment and prostitution.@@//
<br>[[Servant|PC Rumor Intro][$PC.career = "servant"]]
- <br> //As an ex-servant, you will find it @@.red;hard to maintain reputation@@.
- <<if $showSecExp == 1>>
- @@.red;In addition to authority.@@
- <</if>>
- You know how to @@.yellowgreen;lower your upkeep@@, but @@.red;not conduct business@@. Your starting slaves will have free @@.mediumaquamarine;trust@@ and @@.hotpink;devotion@@.//
+ <br> //As an ex-servant, you will find it @@.red;hard to maintain reputation@@<<if $showSecExp == 1>>, @@.red;in addition to authority@@<</if>>.
+ You know how to @@.yellowgreen;lower your upkeep@@, but @@.red;not much else@@. Your starting slaves will have free @@.mediumaquamarine;trust@@ and @@.hotpink;devotion.@@//
<br>[[Gang Leader|PC Rumor Intro][$PC.career = "gang"]]
<br> //As an ex-gang leader, you know how to haggle slaves.
<<if $showSecExp == 1>>
- In addition asserting your authority @@.green;will be easier@@ and @@.yellowgreen;security HQ upgrades will be cheaper@@.
+ In addition, asserting your authority @@.green;will be easier@@ and @@.yellowgreen;security HQ upgrades will be cheaper@@.
<</if>>
- However you will @@.red;find reputation quite hard@@ to maintain. Your starting slaves will be @@.green;fitter@@ and posses a free level of @@.cyan;combat skill@@ .//
+ However, you will @@.red;find reputation quite hard@@ to maintain. Your starting slaves will be @@.green;fitter@@ and possess a free level of @@.cyan;combat skill.@@//
<br>[[Incursion Specialist|PC Rumor Intro][$PC.career = "BlackHat"]]
- <br> //As an ex-hacker for hire, you know how to gain access computer systems and other devices. @@.green;Certain upgrades may be cheaper@@ , and you may find alternative approaches to problems.
+ <br> //As an ex-hacker for hire, you know how to gain access computer systems and other devices. @@.green;Certain upgrades will be cheaper@@ and you may find alternative approaches to problems.
<<if $showSecExp == 1>>
- However you will @@.red;find authority quite hard@@ to maintain.
+ However, you will @@.red;find authority quite hard@@ to maintain.
<</if>>
Your starting slaves will have a free level of @@.cyan;intelligence@@.//
diff --git a/src/events/intro/pcRumorIntro.tw b/src/events/intro/pcRumorIntro.tw
index bb5b050720e29062d3101ee3792b7b789f380ca8..d01cad0f242add3a3188f079cad45b824197f88f 100644
--- a/src/events/intro/pcRumorIntro.tw
+++ b/src/events/intro/pcRumorIntro.tw
@@ -5,9 +5,9 @@ Who you are is something that you will have to define for yourself through your
[[A judicious application of funds|Takeover Target][$PC.rumor = "wealth"]]
//Start with @@.yellowgreen;extra money@@, since you were wealthy enough to buy an arcology.//
[[Hard work and diligence|Takeover Target][$PC.rumor = "diligence"]]
- //New slaves will @@.hotpink;hate you less@@ , since it will be known that you worked hard to earn your position.//
+ //New slaves will @@.hotpink;hate you less,@@ since it will be known that you worked hard to earn your position.//
[[The remorseless use of force|Takeover Target][$PC.rumor = "force"]]
- //New slaves @@.gold;will fear you more@@ , since rumors about your violent takeover will inevitably circulate.//
+ //New slaves @@.gold;will fear you more,@@ since rumors about your violent takeover will inevitably circulate.//
[[Clever social engineering|Takeover Target][$PC.rumor = "social engineering"]]
//Start with the @@.green;first societal option unlocked@@, since you manipulated the arcology's citizens.//
[[Blind luck|Takeover Target][$PC.rumor = "luck"]]
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 758dbc5cf578b0d42b6ce6299da78c921b9e8e9e..6faac89a0607cb59717a63216a41db3c72885f17 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -2839,6 +2839,9 @@ LORE: INTERVIEWS
</dd>
</dl>
+<<case "Wetware CPUs">>
+ Slaves stripped of all unneeded parts, attached to a VR world, and honed to near perfection. Their minds are peerless, but their bodies are broken; if one is able to overcome such an obstacle, a valuable slave awaits.
+
<<case "Security Expansion">>
<<include "encyclopediaSecExpMain">>
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 507711362ab579a421b5bf5bc92c01042526d34a..7738dff64fa26442fd17239ce67c6b3b78069473 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -769,7 +769,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $LDE = {schoolUpgrade: 0, schoolPresent: 0, schoolProsperity: 0, subsidize: 0, schoolAnnexed: 0, studentsBought: 0, schoolSale: 0}>>
<<set $TGA = {schoolUpgrade: 0, schoolPresent: 0, schoolProsperity: 0, subsidize: 0, schoolAnnexed: 0, studentsBought: 0, schoolSale: 0}>>
<<set $TCR = {schoolUpgrade: 0, schoolPresent: 0, schoolProsperity: 0, subsidize: 0, schoolAnnexed: 0, studentsBought: 0, schoolSale: 0}>>
-<<set $TFS = {farmUpgrade: 0, schoolUpgrade: 0, schoolPresent: 0, schoolProsperity: 0, subsidize: 0, schoolAnnexed: 0, studentsBought: 0, schoolSale: 0}>>
+<<set $TFS = {farmUpgrade: 0, schoolUpgrade: 0, schoolPresent: 0, schoolProsperity: 0, subsidize: 0, schoolAnnexed: 0, studentsBought: 0, schoolSale: 0, compromiseWeek: 0}>>
<<set $futaAddiction = 0>>
<<set $HA = {schoolUpgrade: 0, schoolPresent: 0, schoolProsperity: 0, subsidize: 0, schoolAnnexed: 0, studentsBought: 0, schoolSale: 0}>>
@@ -1178,6 +1178,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $fcnn.push("...this year's Goat.cx award for outstanding orifice innovation goes to...")>>
<<set $fcnn.push("...public controversy over cannibalism. Decadence taken too far or an acceptable next step...")>>
<<set $fcnn.push("...sixth day of street cleaners' strike. Spokesman for the strikers: 'It's getting too nasty...")>>
+<<set $fcnn.push("...debuts new book, 'So Long, And Thanks For All The Dicks', in which the recently retired sex slaves tell-all about...")>>
/* HACKY EVENT WORKAROUNDS */
<<set $eventID = -1>>
diff --git a/src/js/economyJS.tw b/src/js/economyJS.tw
index 50fe85f731b1583c21a31bf8f1d0299216223119..9eca2b12ba0606b5f1bc83cc53f667602e087e90 100644
--- a/src/js/economyJS.tw
+++ b/src/js/economyJS.tw
@@ -7,7 +7,7 @@ window.Job = Object.freeze({
SERVANT: 'work as a servant', SERVER: 'be a servant', STEWARD: 'be the Stewardess', CLUB: 'serve in the club', DJ: 'be the DJ',
JAIL: 'be confined in the cellblock', WARDEN: 'be the Wardeness', CLINIC: 'get treatment in the clinic', NURSE: 'be the Nurse',
HGTOY: 'live with your Head Girl', SCHOOL: 'learn in the schoolroom', TEACHER: 'be the Schoolteacher', SPA: 'rest in the spa', ATTEND: 'be the Attendant'});
-window.PersonalAttention = Object.freeze({TRADE: 'trading', WAR: 'warfare', SLAVEING: 'slaving', ENGINEERING: 'engineering', MEDICINE: 'medicine', MAID: 'upkeep', HACKING: 'hacking'});
+window.PersonalAttention = Object.freeze({TRADE: 'trading', WAR: 'warfare', SLAVING: 'slaving', ENGINEERING: 'engineering', MEDICINE: 'medicine', MAID: 'upkeep', HACKING: 'hacking'});
window.getCost = function(array) {
var rulesCost = State.variables.rulesCost;
diff --git a/src/js/sexActsJS.tw b/src/js/sexActsJS.tw
index 93426acb541c078bf0ca79483568dc7d66c812ee..d3648912ad4231ddee61e2b57d8b25b82e33abed 100644
--- a/src/js/sexActsJS.tw
+++ b/src/js/sexActsJS.tw
@@ -373,13 +373,14 @@ window.PartnerVCheck = function PartnerVCheck(analTimes, bothTimes) {
*/
window.SimpleSexAct = function SimpleSexAct(slave, count) {
const V = State.variables;
- const fuckTarget = jsRandom(1,100);
+ let fuckTarget = 0;
let fuckCount = 1;
let r = ``;
if (count) {
fuckCount = count;
}
for (var i = 0; i < fuckCount; i++) {
+ fuckTarget = jsRandom(1,100);
if (slave.nipples == "fuckable" && V.PC.dick === 1 && fuckTarget > 80) {
V.mammaryTotal += 1;
slave.mammaryCount += 1;
@@ -414,12 +415,13 @@ window.SimpleSexAct = function SimpleSexAct(slave, count) {
*/
window.SimpleSlaveFucking = function SimpleSlaveFucking(slave, count) {
const V = State.variables;
- const fuckTarget = jsRandom(1,100);
+ let fuckTarget = 0;
let fuckCount = 1;
if (count) {
fuckCount = count;
}
for (var i = 0; i < fuckCount; i++) {
+ fuckTarget = jsRandom(1,100);
if (slave.nipples == "fuckable" && fuckTarget > 80) {
V.mammaryTotal += 1;
slave.mammaryCount += 1;
@@ -439,3 +441,122 @@ window.SimpleSlaveFucking = function SimpleSlaveFucking(slave, count) {
}
return;
}
+
+/*
+ count is how many times to increment either the Vaginal, Anal, or Oral counts, depending on availability of slave.
+ If count is left undefined it will assume it to be 1.
+ Intended to be a simple "x got fucked y times by z and I don't want to keep coding it".
+*/
+window.SimpleSlaveSlaveFucking = function SimpleSlaveSlaveFucking(subslave, domslave, count) {
+ const V = State.variables;
+ let fuckTarget = 0;
+ let fuckCount = 1;
+ let r = ``;
+ if (count) {
+ fuckCount = count;
+ }
+ for (var j = 0; j < fuckCount; j++) {
+ //there is a reason randomization happens inside cycle - to spread fuck around, otherwise cycle isn't even needed
+ fuckTarget = jsRandom(1,100);
+ if (subslave.nipples === "fuckable" && canPenetrate(domslave) && fuckTarget > 80) {
+ if (passage() === "SA serve your other slaves") {
+ if (subslave.ID == V.slaves[V.i].ID) {
+ V.slaves[V.i].mammaryCount++;
+ V.mammaryTotal++;
+ domslave.penetrativeCount++;
+ V.penetrativeTotal++;
+ }
+ else {
+ subslave.mammaryCount++;
+ V.mammaryTotal++;
+ V.slaves[V.i].penetrativeCount++;
+ V.penetrativeTotal++;
+ }
+ }
+ else {
+ V.mammaryTotal++;
+ V.penetrativeTotal++;
+ subslave.mammaryCount++;
+ domslave.penetrativeCount++;
+ }
+ }
+ else if (canDoVaginal(subslave) && subslave.vagina > 0 && canPenetrate(domslave) && fuckTarget > 33) {
+ if (passage() === "SA serve your other slaves") {
+ if (subslave.ID == V.slaves[V.i].ID) {
+ V.slaves[V.i].vaginalCount++;
+ V.vaginalTotal++;
+ V.penetrativeTotal++;
+ domslave.penetrativeCount++;
+ }
+ else {
+ V.slaves[V.i].penetrativeCount++;
+ V.penetrativeTotal++;
+ subslave.vaginalCount++;
+ V.vaginalTotal++;
+ }
+ }
+ else {
+ V.vaginalTotal++;
+ subslave.vaginalCount++;
+ V.penetrativeTotal++;
+ domslave.penetrativeCount++;
+ }
+ if (canImpreg(subslave, domslave)) {
+ r += knockMeUp(subslave, 3, 0, domslave.ID, 1);
+ }
+ }
+ else if (canDoAnal(subslave) && subslave.anus > 0 && canPenetrate(domslave) && fuckTarget > 10) {
+ //i think would impregnate from anal here even without .mpreg? same in original widget too
+ if (canImpreg(subslave, domslave) && subslave.mpreg == 1) {
+ r += knockMeUp(subslave, 3, 1, domslave.ID, 1);
+ }
+ if (passage() === "SA serve your other slaves") {
+ if (subslave.ID == V.slaves[V.i].ID) {
+ V.slaves[V.i].analCount++;
+ V.analTotal++;
+ V.penetrativeTotal++;
+ domslave.penetrativeCount++;
+ }
+ else {
+ V.slaves[V.i].penetrativeCount++;
+ V.penetrativeTotal++;
+ V.analTotal++;
+ subslave.analCount++;
+ }
+ }
+ else {
+ V.analTotal++;
+ subslave.analCount++;
+ V.penetrativeTotal++;
+ domslave.penetrativeCount++;
+ }
+ }
+ else {
+ V.oralTotal++;
+ subslave.oralCount++;
+ }
+ }
+ return r;
+}
+
+window.SimpleVaginaFuck = function SimpleVaginaFuck(slave, count) {
+ if (count) {
+ State.variables.vaginalTotal += count;
+ slave.vaginalCount += count;
+ }
+ else {
+ State.variables.vaginalTotal++;
+ slave.vaginalCount++;
+ }
+}
+
+window.SimpleAssFuck = function SimpleAssFuck(slave, count) {
+ if (count) {
+ State.variables.analTotal += count;
+ slave.analCount += count;
+ }
+ else {
+ State.variables.analTotal++;
+ slave.analCount++;
+ }
+}
\ No newline at end of file
diff --git a/src/pregmod/fFeet.tw b/src/pregmod/fFeet.tw
index ce4b3d058787e4c4f75dee3328f55101f9a144f5..20a1f2d9d02e1e426df1b26dd1827de3c84af182 100644
--- a/src/pregmod/fFeet.tw
+++ b/src/pregmod/fFeet.tw
@@ -234,7 +234,7 @@ You call $activeSlave.slaveName to your office, telling $his to use $his feet to
<<elseif ($activeSlave.devotion < -50)>>
$He strongly refuses, and you have to restrain $him to get $him to obey.
<<elseif ($activeSlave.devotion < -20)>>
- $He tries to refuse
+ $He tries to refuse, but decides it will just be easier to comply than risk punishment.
<<elseif ($activeSlave.devotion < 20)>>
$He doesn't seem eager to comply, but fears being punished enough to obey.
<<elseif ($activeSlave.devotion < 60)>>
@@ -425,9 +425,9 @@ You call $activeSlave.slaveName to your office, telling $his to use $his feet to
You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even _belly belly with your massive load<<elseif $PC.balls >=1>> and _legs legs with your large load<</if>>.
<<elseif !canWalk($activeSlave)>>
<<if ($activeSlave.devotion < -50)>>
- You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even $his side with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>> as $he struggles in your grasp. $He is furious $his is now covered in cum $he can't easily reach to clean.
+ You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even $his side with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>> as $he struggles in your grasp. $He is furious that $he is now covered in cum $he can't easily reach to clean.
<<elseif ($activeSlave.devotion < -20)>>
- You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even $his side with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>>. $He was startled as you started to orgasm and now shows a conflicted expression, as you are done using $he, but $his is now covered in cum $he can't easily reach to clean.
+ You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even $his side with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>>. $He was startled by your orgasm and now wears a conflicted expression, but you are done using $him for now. $He is left covered in cum $he can't easily reach to clean.
<<elseif ($activeSlave.devotion < 20)>>
You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even $his side with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>> as $he sighs in nervous relief.
<<elseif ($activeSlave.devotion < 60 || ($activeSlave.sexualQuirk == "unflinching" && $activeSlave.devotion < 20))>>
@@ -442,7 +442,7 @@ You call $activeSlave.slaveName to your office, telling $his to use $his feet to
<<elseif ($activeSlave.devotion < -50)>>
You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even $his _belly belly with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>> as $he struggles in your grasp with a look of disgust.
<<elseif ($activeSlave.devotion < -20)>>
- You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even $his _belly belly with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>>. $He was startled as you started to orgasm and now shows a conflicted expression, as you are done using $he, but $his is now covered in cum.
+ You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even $his _belly belly with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>>. $He was startled by your orgasm and now wears a conflicted expression, as well as your cum, but you are done using $him for now.
<<elseif ($activeSlave.devotion < 20)>>
You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even $his _belly belly with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>> as $he sighs in nervous relief.
<<elseif ($activeSlave.devotion < 60 || $activeSlave.attrXY < 16 || ($activeSlave.sexualQuirk == "unflinching" && $activeSlave.devotion < 20))>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 2b9f041ecadc9c2b3368cc2efccd093bdc9967c4..c1fbc6bc6518d4a382c2009aad87dd17df52d7e7 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -1954,7 +1954,10 @@ Setting missing global variables:
<<set $TCR = {schoolUpgrade: 0, schoolPresent: 0, schoolProsperity: 0, subsidize: 0, schoolAnnexed: 0, studentsBought: 0, schoolSale: 0}>>
<</if>>
<<if ndef $TFS>>
- <<set $TFS = {schoolUpgrade: 0, schoolPresent: 0, schoolProsperity: 0, subsidize: 0, schoolAnnexed: 0, studentsBought: 0, schoolSale: 0}>>
+ <<set $TFS = {schoolUpgrade: 0, schoolPresent: 0, schoolProsperity: 0, subsidize: 0, schoolAnnexed: 0, studentsBought: 0, schoolSale: 0, compromiseWeek: 0, farmUpgrade: 0}>>
+<</if>>
+<<if ndef $TFS.compromiseWeek>>
+ <<set $TFS.compromiseWeek = 0>>
<</if>>
<<if ndef $HA>>
<<set $HA = {schoolUpgrade: 0, schoolPresent: 0, schoolProsperity: 0, subsidize: 0, schoolAnnexed: 0, studentsBought: 0, schoolSale: 0}>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index c1ebc733c9922caed451651ed1b0035170cb1f8e..374e9fac2dc4ee1aa362ab4633290c4a2eab0700 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -61,9 +61,9 @@
<<case "first period">>
-<<EventNameLink $activeSlave>> appears in the door of your office, uncertain if she should disturb you. She stumbles through the doorway, hands on her <<if $activeSlave.weight >= 95>>fat belly<<elseif $activeSlave.weight >= 30>>chubby belly<<else>>flat belly<</if>>, before stepping forward to stand in front of your desk. Her chest is rising and falling with panicked hyperventilation. The poor girl is terrified some reason.
+<<EventNameLink $activeSlave>> appears in the door of your office, uncertain if she should disturb you. She stumbles through the doorway, hands on her <<if $activeSlave.weight >= 95>>fat belly<<elseif $activeSlave.weight >= 30>>chubby belly<<else>>flat belly<</if>>, before stepping forward to stand in front of your desk. Her chest is rising and falling with panicked hyperventilation. The poor girl is terrified for some reason.
<br><br>
-You press her for why she is acting this way.
+You press her on why she is acting this way.
<<if !canTalk($activeSlave)>>
She uses gestures to point to her stomach, and explains that she is feeling an unusual pain.
<<else>>
@@ -4207,7 +4207,7 @@ May I plea<<s>>e try out <<s>>omething <<s>>kimpier today?"
<</replace>>
<</link>><<if ($activeSlave.vagina == 0)>> //This option will take virginity//<</if>>
<</if>>
-<br><<link "Tell her she'll just be taking up the ass more">>
+<br><<link "Tell her she'll just be taking it up the ass more">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
In one swift motion, you pull out a chastity belt and lock it onto her. She gasps as she feels it hug close to her pussy. You explain that she has just become a woman, and thus, will be taking it up the ass until you decide it's time for her to become pregnant.
@@ -5452,9 +5452,9 @@ May I plea<<s>>e try out <<s>>omething <<s>>kimpier today?"
<</if>>
for a while, until you sense that she's on the edge of climax. Without warning, you lift the edge of the blankets and send a gust of cool air down her front and <<if $activeSlave.dick > 0>>right onto her cock<<else>>across her <<if $activeSlave.nipples != "fuckable">>hard<<else>>engorged<</if>> nipples<</if>>. She gasps at the sudden overstimulation and then orgasms very strongly, jerking against you
<<if !canTalk($activeSlave)>>
- and panting in lieu of an exclamation
+ and panting in lieu of an exclamation.
<<else>>
- and <<say>>ing "Oh" over and over again
+ and <<say>>ing "Oh" over and over again.
<</if>>
<<if $PC.dick == 1>>She clenches against your dick,<<if $PC.vagina == 1>> so hard that you can feel the rush of blood into your cunt,<</if>><<else>>She works your pussy harder,<</if>> getting you off in turn, and then rolls over to plant a whole-hearted kiss on your lips.
<<set $activeSlave.devotion += 4>>
diff --git a/src/uncategorized/barracks.tw b/src/uncategorized/barracks.tw
index 18d5b97f269f7aada098d076308e1bc8352aeff2..563371de212b888d80e1cba5ad3ca70f3c9a78fb 100644
--- a/src/uncategorized/barracks.tw
+++ b/src/uncategorized/barracks.tw
@@ -8,7 +8,7 @@ The mercenaries you retain to protect $arcologies[0].name are housed in this sec
<<else>>
they don't resent an unannounced visit from their employer.
<</if>>
-As you enter the main bay of the armory, lined with modern arms and armor and a few muscular, scarred men and women looking after their gear or suiting up to stand post, you're greeted respectfully, with<<if $personalArms > 0 && $invasionVictory > 0>> jaunty salutes and<</if>> formal <<if $PC.title == 1>>"Sir"s.<<else>>"Ma'am"s<</if>><<if $personalArms > 0 && $invasionVictory > 0>>, but also with smiles and nods<</if>>.
+As you enter the main bay of the armory, lined with modern arms and armor and a few muscular, scarred men and women looking after their gear or suiting up to stand post, you're greeted respectfully, with<<if $personalArms > 0 && $invasionVictory > 0>> jaunty salutes and<</if>> formal <<if $PC.title == 1>>"Sir"s<<else>>"Ma'am"s<</if>><<if $personalArms > 0 && $invasionVictory > 0>>, but also with smiles and nods<</if>>.
<<if $mercenaries >= 3>>
Though few of the mercenaries are visible,
<<if $mercenaries >= 5>>
diff --git a/src/uncategorized/buildingWidgets.tw b/src/uncategorized/buildingWidgets.tw
index 1ec10e92c3bed8cff67937272d9f7b697a1a204a..2cf2b6f5dd90446c293fa04bb4712fa0ebc9a952 100644
--- a/src/uncategorized/buildingWidgets.tw
+++ b/src/uncategorized/buildingWidgets.tw
@@ -80,7 +80,7 @@ if(!Macro.has('sectorblock')) {
Sweatshops: { base: 'Manufacturing' },
weapManu: { base: 'weaponsManufacturing', name: 'Weapons manufacturing', cls: 'weapManu' },
transportHub: { base: 'transportHub', name: 'Transport Hub', cls: 'transportHub' },
- Barracks: { base: 'Barracks', name: 'The armory', extra: ' of $mercenariesTitle' },
+ Barracks: { base: 'Barracks', name: 'Garrison', extra: ' of $mercenariesTitle' },
/* speciality shop types */
'Subjugationist': { base: 'Shops', name: 'Subjugationist Shops', cls: 'FSShops' },
'Supremacist': { base: 'Shops', name: 'Supremacist Shops', cls: 'FSShops' },
diff --git a/src/uncategorized/club.tw b/src/uncategorized/club.tw
index 8e3741a3e1bc7cd895434971aa3bb41e8df78844..a396d61ccc7e9a7495d136ef45a77478154337cf 100644
--- a/src/uncategorized/club.tw
+++ b/src/uncategorized/club.tw
@@ -241,7 +241,7 @@ $clubNameCaps
<<else>>
$clubNameCaps is not being advertised.
<</if>>
-<<link "Manage club Advertisements" "Club Advertisement">><<set $nextLink = passage()>><<set $nextButton = "Back">><</link>>
+<<link "Manage club advertisements" "Club Advertisement">><<set $nextLink = passage()>><<set $nextButton = "Back">><</link>>
<!-- Statistics output -->
<<ClubStatistics 1>>
diff --git a/src/uncategorized/corporationDevelopments.tw b/src/uncategorized/corporationDevelopments.tw
index 5a8719724f141c7088ada45e7fd46655c9edcddf..1c0e5369f4c05ab51e3fdcfaf54e0bf0c19c9783 100644
--- a/src/uncategorized/corporationDevelopments.tw
+++ b/src/uncategorized/corporationDevelopments.tw
@@ -165,7 +165,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $cash += 1000*$sharePrice>>
<<set $sharePrice = (Math.trunc($sharePrice*either(98,99,$PC.trading >= 100 ? 99 : 98)))/100>>
<<replace "#CorpAction">>
- <br>"You sold <<print commaNum(1000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@ for @@.yellowgreen;<<print cashFormat(Math.ceil(1000*$sharePrice))>>@@" driving the share price down slightly."
+ <br>You sold <<print commaNum(1000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@ for @@.yellowgreen;<<print cashFormat(Math.ceil(1000*$sharePrice))>>@@" driving the share price down slightly.
<</replace>>
<</link>>
<<if $personalShares-5000 > $publicShares>>
@@ -175,7 +175,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $cash += 5000*$sharePrice>>
<<set $sharePrice = (Math.trunc($sharePrice*either(98,99,$PC.trading >= 100 ? 99 : 98)))/100>>
<<replace "#CorpAction">>
- <br>"You sold <<print commaNum(5000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*5000))>>@@ for @@.yellowgreen;<<print cashFormat(Math.ceil(1000*$sharePrice))>>@@" driving the share price down slightly."
+ <br>You sold <<print commaNum(5000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*5000))>>@@ for @@.yellowgreen;<<print cashFormat(Math.ceil(1000*$sharePrice))>>@@" driving the share price down slightly.
<</replace>>
<</link>>
<</if>>
@@ -185,7 +185,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $cash += 10000*$sharePrice>>
<<set $sharePrice = (Math.trunc($sharePrice*either(98,99,$PC.trading >= 100 ? 99 : 98)))/100>>
<<replace "#CorpAction">>
- <br>You sold <<print commaNum(10000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*10000))>>@@ for @@.yellowgreen;<<print cashFormat(Math.ceil(10000*$sharePrice))>>@@" driving the share price down slightly."
+ <br>You sold <<print commaNum(10000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*10000))>>@@ for @@.yellowgreen;<<print cashFormat(Math.ceil(10000*$sharePrice))>>@@" driving the share price down slightly.
<</replace>>
<</link>>
<</if>>
@@ -196,7 +196,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $cash += 15000*$sharePrice>>
<<set $sharePrice = (Math.trunc($sharePrice*either(98,99,$PC.trading >= 100 ? 99 : 98)))/100>>
<<replace "#CorpAction">>
- <br>"You sold <<print commaNum(15000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*15000))>>@@ driving the share price down somewhat."
+ <br>You sold <<print commaNum(15000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*15000))>>@@ driving the share price down somewhat.
<</replace>>
<</link>>
<</if>>
@@ -207,7 +207,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $cash += 20000*$sharePrice>>
<<set $sharePrice = (Math.trunc($sharePrice*either(98,99,$PC.trading >= 100 ? 99 : 98)))/100>>
<<replace "#CorpAction">>
- <br>"You sold <<print commaNum(20000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*20000))>>@@ driving the share price down significantly."
+ <br>You sold <<print commaNum(20000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*20000))>>@@ driving the share price down significantly.
<</replace>>
<</link>>
<</if>>
@@ -222,7 +222,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $corpCash += 1000*Math.ceil($sharePrice)>>
<<set $sharePrice = (Math.trunc($sharePrice*either(98,99)))/100>>
<<replace "#CorpAction">>
- <br>"The corporation issued <<print commaNum(1000)>> new shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@ for @@.yellowgreen;<<print cashFormat(Math.ceil(1000*$sharePrice))>>@@" driving the share price down slightly."
+ <br>The corporation issued <<print commaNum(1000)>> new shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@ for @@.yellowgreen;<<print cashFormat(Math.ceil(1000*$sharePrice))>>@@" driving the share price down slightly.
<</replace>>
<</link>>
<<if $personalShares-5000 > $publicShares>>
@@ -231,7 +231,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $corpCash += 5000*Math.ceil($sharePrice)>>
<<set $sharePrice = (Math.trunc($sharePrice*either(98,99)))/100>>
<<replace "#CorpAction">>
- <br>"The corporation issued <<print commaNum(5000)>> new shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*5000))>>@@ for @@.yellowgreen;<<print cashFormat(Math.ceil(1000*$sharePrice))>>@@" driving the share price down slightly."
+ <br>The corporation issued <<print commaNum(5000)>> new shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*5000))>>@@ for @@.yellowgreen;<<print cashFormat(Math.ceil(1000*$sharePrice))>>@@" driving the share price down slightly.
<</replace>>
<</link>>
<</if>>
@@ -241,7 +241,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $corpCash += 10000*Math.ceil($sharePrice)>>
<<set $sharePrice = (Math.trunc($sharePrice*either(98,99)))/100>>
<<replace "#CorpAction">>
- <br>"The corporation issued <<print commaNum(10000)>> new shares for @@.yellowgreen;<<print cashFormat(Math.ceil(1000*$sharePrice))>>@@ driving the share price down slightly."
+ <br>The corporation issued <<print commaNum(10000)>> new shares for @@.yellowgreen;<<print cashFormat(Math.ceil(1000*$sharePrice))>>@@ driving the share price down slightly.
<</replace>>
<</link>>
<</if>>
@@ -251,7 +251,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $corpCash += 15000*Math.ceil($sharePrice)>>
<<set $sharePrice = (Math.trunc($sharePrice*random(96,98)))/100>>
<<replace "#CorpAction">>
- <br>"The corporation issued <<print commaNum(15000)>> new shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*15000))>>@@ driving the share price down somewhat."
+ <br>The corporation issued <<print commaNum(15000)>> new shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*15000))>>@@ driving the share price down somewhat.
<</replace>>
<</link>>
<</if>>
@@ -260,7 +260,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $corpCash += 20000*Math.ceil($sharePrice)>>
<<set $sharePrice = (Math.trunc($sharePrice*either(98,99)))/100>>
<<replace "#CorpAction">>
- <br>"The corporation issued <<print commaNum(20000)>> new shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*20000))>>@@ driving the share price down significantly."
+ <br>The corporation issued <<print commaNum(20000)>> new shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*20000))>>@@ driving the share price down significantly.
<</replace>>
<</link>>
<</if>>
@@ -280,7 +280,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $corpCash += 1000*Math.floor($sharePrice)>>
<<set $sharePrice = (Math.trunc($sharePrice*either(98,99)))/100>>
<<replace "#CorpAction">>
- <br>"You purchased <<print commaNum(1000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@, from the corporation driving the share price down slightly."
+ <br>You purchased <<print commaNum(1000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@, from the corporation driving the share price down slightly.
<</replace>>
<</link>>
<<if $cash > 5000*$sharePrice>>
@@ -290,7 +290,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $corpCash += 5000*Math.floor($sharePrice)>>
<<set $sharePrice = (Math.trunc($sharePrice*either(98,99)))/100>>
<<replace "#CorpAction">>
- <br>You purchased <<print commaNum(5000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*5000))>>@@, from the corporation driving the share price down slightly."
+ <br>You purchased <<print commaNum(5000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*5000))>>@@, from the corporation driving the share price down slightly.
<</replace>>
<</link>>
<</if>>
@@ -301,7 +301,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $corpCash += 10000*Math.floor($sharePrice)>>
<<set $sharePrice = (Math.trunc($sharePrice*either(98,99)))/100>>
<<replace "#CorpAction">>
- <br>"You purchased <<print commaNum(10000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*10000))>>@@, from the corporation driving the share price down slightly."
+ <br>You purchased <<print commaNum(10000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*10000))>>@@, from the corporation driving the share price down slightly.
<</replace>>
<</link>>
<</if>>
@@ -312,7 +312,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $corpCash += 15000*Math.floor($sharePrice)>>
<<set $sharePrice = (Math.trunc($sharePrice*either(98,99)))/100>>
<<replace "#CorpAction">>
- <br>"You purchased <<print commaNum(15000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*15000))>>@@, from the corporation driving the share price down somewhat."
+ <br>You purchased <<print commaNum(15000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*15000))>>@@, from the corporation driving the share price down somewhat.
<</replace>>
<</link>>
<</if>>
@@ -323,7 +323,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $corpCash += 20000*Math.floor($sharePrice)>>
<<set $sharePrice = (Math.trunc($sharePrice*either(98,99)))/100>>
<<replace "#CorpAction">>
- <br>"You purchased <<print commaNum(20000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*20000))>>@@, from the corporation driving the share price down significantly."
+ <br>You purchased <<print commaNum(20000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*20000))>>@@, from the corporation driving the share price down significantly.
<</replace>>
<</link>>
<</if>>
@@ -339,7 +339,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $cash -= 1000*$sharePrice>>
<<set $sharePrice = (Math.trunc($sharePrice*either(101,102,$PC.trading >= 100 ? 101 : 102)))/100>>
<<replace "#CorpAction">>
- <br>"You bought <<print commaNum(1000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@, driving the share price up slightly."
+ <br>You bought <<print commaNum(1000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@, driving the share price up slightly.
<</replace>>
<</link>>
<<if $publicShares > 5000 && $cash >= 5000*$sharePrice>>
@@ -348,7 +348,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $cash -= 5000*$sharePrice>>
<<set $sharePrice = (Math.trunc($sharePrice*either(101,102,$PC.trading >= 100 ? 101 : 102)))/100>>
<<replace "#CorpAction">>
- <br>"You bought <<print commaNum(5000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*5000))>>@@, driving the share price up slightly."
+ <br>You bought <<print commaNum(5000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*5000))>>@@, driving the share price up slightly.
<</replace>>
<</link>>
<</if>>
@@ -358,7 +358,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $cash -= 10000*$sharePrice>>
<<set $sharePrice = (Math.trunc($sharePrice*either(101,102,$PC.trading >= 100 ? 101 : 102)))/100>>
<<replace "#CorpAction">>
- <br>"You bought <<print commaNum(10000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*10000))>>@@, driving the share price up slightly."
+ <br>You bought <<print commaNum(10000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*10000))>>@@, driving the share price up slightly.
<</replace>>
<</link>>
<</if>>
@@ -368,7 +368,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $cash -= 15000*$sharePrice>>
<<set $sharePrice = (Math.trunc($sharePrice*either(101,102,$PC.trading >= 100 ? 101 : 102)))/100>>
<<replace "#CorpAction">>
- <br>"You bought <<print commaNum(15000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*15000))>>@@, driving the share price up somewhat."
+ <br>You bought <<print commaNum(15000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*15000))>>@@, driving the share price up somewhat.
<</replace>>
<</link>>
<</if>>
@@ -378,7 +378,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $cash -= 20000*$sharePrice>>
<<set $sharePrice = (Math.trunc($sharePrice*either(101,102,$PC.trading >= 100 ? 101 : 102)))/100>>
<<replace "#CorpAction">>
- <br>"You bought <<print commaNum(20000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*20000))>>@@, driving the share price up significantly."
+ <br>You bought <<print commaNum(20000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*20000))>>@@, driving the share price up significantly.
<</replace>>
<</link>>
<</if>>
@@ -395,7 +395,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $corpCash -= 1000*Math.ceil($sharePrice)>>
<<set $sharePrice = (Math.trunc($sharePrice*either(101,102)))/100>>
<<replace "#CorpAction">>
- <br>"The corporation bought back <<print commaNum(1000)>> public shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@, driving the share price up slightly."
+ <br>The corporation bought back <<print commaNum(1000)>> public shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@, driving the share price up slightly.
<</replace>>
<</link>>
<<if $publicShares > 5000 && $corpCash >= 5000*$sharePrice>>
@@ -404,7 +404,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $corpCash -= 5000*Math.ceil($sharePrice)>>
<<set $sharePrice = (Math.trunc($sharePrice*either(101,102)))/100>>
<<replace "#CorpAction">>
- <br>"The corporation bought back <<print commaNum(5000)>> public shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*5000))>>@@, driving the share price up slightly."
+ <br>The corporation bought back <<print commaNum(5000)>> public shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*5000))>>@@, driving the share price up slightly.
<</replace>>
<</link>>
<</if>>
@@ -414,7 +414,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $corpCash -= 10000*Math.ceil($sharePrice)>>
<<set $sharePrice = (Math.trunc($sharePrice*either(101,102)))/100>>
<<replace "#CorpAction">>
- <br>"The corporation bought back <<print commaNum(10000)>> public shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*10000))>>@@, driving the share price up slightly."
+ <br>The corporation bought back <<print commaNum(10000)>> public shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*10000))>>@@, driving the share price up slightly.
<</replace>>
<</link>>
<</if>>
@@ -424,7 +424,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $corpCash -= 15000*Math.ceil($sharePrice)>>
<<set $sharePrice = (Math.trunc($sharePrice*either(101,102)))/100>>
<<replace "#CorpAction">>
- <br>"The corporation bought back <<print commaNum(15000)>> public shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*15000))>>@@, driving the share price up somewhat."
+ <br>The corporation bought back <<print commaNum(15000)>> public shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*15000))>>@@, driving the share price up somewhat.
<</replace>>
<</link>>
<</if>>
@@ -434,7 +434,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set $corpCash -= 20000*Math.ceil($sharePrice)>>
<<set $sharePrice = (Math.trunc($sharePrice*either(101,102)))/100>>
<<replace "#CorpAction">>
- <br>"The corporation bought back <<print commaNum(20000)>> public shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*20000))>>@@, driving the share price up significantly."
+ <br>The corporation bought back <<print commaNum(20000)>> public shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*20000))>>@@, driving the share price up significantly.
<</replace>>
<</link>>
<</if>>
diff --git a/src/uncategorized/pRivalryActions.tw b/src/uncategorized/pRivalryActions.tw
index 21543ecdebd00005c39975bd5cc241e15ae2072a..705a07c2f4cd6205973ccbbcd34c16d6f5d2e9d2 100644
--- a/src/uncategorized/pRivalryActions.tw
+++ b/src/uncategorized/pRivalryActions.tw
@@ -3915,7 +3915,7 @@ You remind yourself that success in this conflict will not be defined by the tra
<<if $mercenaries >= 3>>
<br><<link "Lock your rival down and let your mercs walk right in.">>
<<replace "#result">>
- While you hold your rival's arcology's system under your complete control. $assistantName finally reports to you in <<if $assistant == 0>>its<<else>>her<</if>> normal tones, "Team One reports
+ While you hold your rival's arcology's system under your complete control, $assistantName finally reports to you in <<if $assistant == 0>>its<<else>>her<</if>> normal tones, "Team One reports
<<switch $rivalryFS>>
<<case "Racial Subjugationism">>Racemixer
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index ea6a8e8e3c4f4720fbedab2e5767d5e83567c6a8..4d0c1b2330976b470a9870e0e7c4248e87013331 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -1771,7 +1771,7 @@ As you are heading back to your penthouse from inspecting a new line of sex shop
<<else>>
her body is ill-suited for childbirth and the unfortunate thing has lodged in her pelvis.
<</if>>
-Every push, every desperate contraction must be agonizing to her. Fortunately you know what to do, however, it will not come cheap. Hour after hour you work with the girl, her debt to you growing ever higher, until you finally manage to coax the newborn from her battered body. She smiles at her baby before losing consciousness, she is in really bad shape. Odds are her child will grow up an orphan, even if you call in her debt.
+Every push, every desperate contraction must be agonizing to her. Fortunately you know what to do, however, it will not come cheap. Hour after hour you work with the girl, her debt to you growing ever higher, until you finally manage to coax the newborn from her battered body. She smiles at her baby before losing consciousness; she is in really bad shape. Odds are her child will grow up an orphan, even if you call in her debt.
<<case "overwhelmed farmgirl">>
diff --git a/src/uncategorized/recETSWorkaround.tw b/src/uncategorized/recETSWorkaround.tw
index 2c7f80d956532cd7533c8042053488c5e5f976ef..f054066680dd1fc1c6e9d30f2066621a9245e381 100644
--- a/src/uncategorized/recETSWorkaround.tw
+++ b/src/uncategorized/recETSWorkaround.tw
@@ -141,6 +141,8 @@ The son cheers happily and hugs his relieved mother. She leans in and kisses him
<<set $activeSlave.preg = 0>>
<<set $activeSlave.pregKnown = 0>>
<<set $activeSlave.pregWeek = 0>>
+<<set $activeSlave.pregType = 0>>
+<<set $activeSlave.pregSource = 0>>
<<set WombFlush($activeSlave)>>
<<run SetBellySize($activeSlave)>>
<<set $activeSlave.dick = 2>>
@@ -153,8 +155,6 @@ The son cheers happily and hugs his relieved mother. She leans in and kisses him
<<set $activeSlave.vaginalSkill = 0>>
<<set $activeSlave.faceShape = "cute">>
<<set $activeSlave.boobs = 0>>
-<<set $activeSlave.pregType = 0>>
-<<set $activeSlave.pregSource = 0>>
<<set $activeSlave.birthsTotal = 0>>
<<set $activeSlave.lactation = 0>>
<<set $activeSlave.anus = 0>>
@@ -235,6 +235,8 @@ They cheer happily and hug each other tightly. They ought to be an interesting a
<<set $activeSlave.pubertyXX = 0>>
<<set $activeSlave.pubertyXY = 1>>
<<set $activeSlave.preg = 0>>
+<<set $activeSlave.pregType = 0>>
+<<set $activeSlave.pregSource = 0>>
<<set $activeSlave.pregKnown = 0>>
<<set $activeSlave.pregWeek = 0>>
<<set WombFlush($activeSlave)>>
@@ -249,8 +251,6 @@ They cheer happily and hug each other tightly. They ought to be an interesting a
<<set $activeSlave.vaginalSkill = 0>>
<<set $activeSlave.faceShape = "masculine">>
<<set $activeSlave.boobs = 0>>
-<<set $activeSlave.pregType = 0>>
-<<set $activeSlave.pregSource = 0>>
<<set $activeSlave.lactation = 0>>
<<set $activeSlave.anus = 0>>
<<set $activeSlave.pubicHStyle = "bushy">>
diff --git a/src/uncategorized/resEndowment.tw b/src/uncategorized/resEndowment.tw
index 4f6d09124bb3e9a76dc99e9e50b03a1393c99b9a..ea4acb664b0a3efff453fbab5360875aa43ea371 100644
--- a/src/uncategorized/resEndowment.tw
+++ b/src/uncategorized/resEndowment.tw
@@ -270,5 +270,24 @@
<<set $rep += 1000>>
<</replace>>
<</link>> //This will cost <<print cashFormat(10000)>>//
+ <<if $cash >= 250000>>
+ <br>
+ <<link "Propose a dynamic compromise that supports both visions">>
+ <<replace "#result">>
+ You reconnect the call you had with the first matron, splitting your desktop's display to accomodate both video call windows so that you can address both at once. Then you begin to suggest a compromise that should gratify both parties:
+ <br><br>
+ With their not so feminine voices, conspicuous Adam's Apples, dry barren artificial pussies, and naturally masculine hormonal balances, it is more or less an open secret that futanari 'Sisters' are all biologically, well, men. It is considered poor taste to mention such a thing among polite company, however, as some men who own futas willfully try to ignore this fact or are otherwise are upset to be reminded of it. Your proposed remedy allows both sisters to have their way: With your extensive funding, those current Sisters who were biologically born male (all of them) will be endowed with bigger balls at the second matron's behest. Meanwhile, a new lineup of biologically female Futanari Sisters will be very rapidly inducted, transformed, cultured, trained, and readied for resale, under the expert leadership of the first matron. These new lady-futas will only have erect dicks to complement their natural fertile pussies, feminine hormones, and soft voices; nary a testicle in sight. Slaveowning society on the other hand will enjoy a wider variety of futanari slaves to choose from, opening up exciting new opportunities for owner to sate their personal preferences and perfect their harems. In 15 weeks, the absolute minimum time that all can be feasibly accomplished, everybody wins. Business will continue as usual in the Futanari Sisters until then, with no immediate change in merchandise.
+ <br><br>
+ "Well, you aren't the first one to think of that." the first matron reluctantly states. "You see, there's this outcast group of Sisters who would be perfect for this, it's just... We haven't seen eye to eye for a long time." The second chimes in: "You could talk her into it, she approves of your build far more than mine. Will probably take several months though, to move them all over and integrate all the new Sisters into our fold, and to enjoy the new pussies, of course." After a moment of consideration, the first agrees. You donate the funds to the Sisters with your compliments, ensuring that neither matron completely controls the vast sum. They both understand what they have to do now, starting immediately.
+ <br><br>
+ Days later, the grateful institution begins a mass marketing campaign all accross the world's Free Cities, which includes adverts in FCNN, FCTV, and FC social media about the upcoming changes to their Sister inventory and their need for willing new blood and new specialists to help them bolster their ranks. You feature prominently in each and every promotional item as their foremost contributor. Thanks to this @@.green;you will be a household name in the Free Cities for some time.@@ Such a public flex of your financial muscles has also made your relative power very clear to some in the New World, attracting important players who @@.green;will start to show an interest@@ in doing business with you and your Free City.
+ <<set $TFS.schoolUpgrade = 3>>
+ <<set $cash -= 250000>>
+ <<set $rep += 2000>>
+ <<set $arcologies[0].prosperity += 1>>
+ <<set $TFS.compromiseWeek = $week>>
+ <</replace>>
+ <</link>> //This will cost <<print cashFormat(250000)>> and take 15 weeks//
+ <</if>>
<</if>>
</span>
diff --git a/src/uncategorized/resFailure.tw b/src/uncategorized/resFailure.tw
index fe139e58ff251c2b2b6f30cf909810dce3774348..49d3637fd183f9f2d4fae8af433e5a5809bc5df6 100644
--- a/src/uncategorized/resFailure.tw
+++ b/src/uncategorized/resFailure.tw
@@ -1,10 +1,6 @@
-:: RES Failure
+:: RES Failure [nobr]
-<<nobr>>
-
-<<set $nextButton = "Continue">>
-<<set $nextLink = "Scheduled Event">>
-<<set $returnTo = "Scheduled Event">>
+<<set $nextButton = "Continue", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event">>
<<if ($TSS.schoolPresent == 1) && ($TSS.schoolProsperity <= -10)>>
<<set $RESFailure = "TSS">>
@@ -25,7 +21,7 @@
<</if>>
<<set $rep -= 200>>
-<<set $AProsperityCap -= 2>>
+<<set $arcologies[0].prosperity -= 2>>
<<set $slavesToAdd = 5>>
<<if $RESFailure == "TSS">>
<<set $TSS.schoolPresent = 0>>
@@ -458,7 +454,11 @@
<<set $TFS.schoolAnnexed = 1>>
<<for $i = 0; $i < $slavesToAdd-1; $i++>>
<<set $seed = random(1,4)>>
- <<include "Generate XY Slave">>
+ <<if $TFS.schoolUpgrade == 3 && $TFS.compromiseWeek+15 <= $week>>
+ <<include "Generate New Slave">>
+ <<else>>
+ <<include "Generate XY Slave">>
+ <</if>>
<<set $activeSlave.origin = "She was a Futanari Sister until you engineered her early enslavement.">>
<<set $activeSlave.career = "a Futanari Sister">>
<<set $activeSlave.faceShape = either("sensual", "exotic")>>
@@ -471,7 +471,14 @@
<<set $activeSlave.boobs = 100*random(12,20)>>
<<set $activeSlave.dick = random(2,3)>>
<<if $activeSlave.foreskin > 0>><<set $activeSlave.foreskin = $activeSlave.dick>><</if>>
- <<if $TFS.schoolUpgrade == 1>>
+ <<if $TFS.schoolUpgrade == 3 && $TFS.compromiseWeek+15 <= $week>>
+ <<if $activeSlave.genes == "XY">>
+ <<set $activeSlave.balls = random(8,9), $activeSlave.scrotum = $activeSlave.balls>>
+ <<else>>
+ <<set $activeSlave.balls = 1>>
+ <<set $activeSlave.scrotum = 0>>
+ <</if>>
+ <<elseif $TFS.schoolUpgrade == 1>>
<<set $activeSlave.balls = 1>>
<<set $activeSlave.scrotum = 0>>
<<elseif $TFS.schoolUpgrade == 2>>
@@ -498,7 +505,14 @@
<<set $activeSlave.boobs = 100*random(20,32)>>
<<set $activeSlave.dick = random(3,4)>>
<<if $activeSlave.foreskin > 0>><<set $activeSlave.foreskin = $activeSlave.dick>><</if>>
- <<if $TFS.schoolUpgrade == 1>>
+ <<if $TFS.schoolUpgrade == 3 && $TFS.compromiseWeek+15 <= $week>>
+ <<if $activeSlave.genes == "XY">>
+ <<set $activeSlave.balls = random(9,10), $activeSlave.scrotum = $activeSlave.balls>>
+ <<else>>
+ <<set $activeSlave.balls = 1>>
+ <<set $activeSlave.scrotum = 0>>
+ <</if>>
+ <<elseif $TFS.schoolUpgrade == 1>>
<<set $activeSlave.balls = 1>>
<<set $activeSlave.scrotum = 0>>
<<elseif $TFS.schoolUpgrade == 2>>
@@ -525,7 +539,14 @@
<<set $activeSlave.boobs = 100*random(32,42)>>
<<set $activeSlave.dick = random(4,5)>>
<<if $activeSlave.foreskin > 0>><<set $activeSlave.foreskin = $activeSlave.dick>><</if>>
- <<if $TFS.schoolUpgrade == 1>>
+ <<if $TFS.schoolUpgrade == 3 && $TFS.compromiseWeek+15 <= $week>>
+ <<if $activeSlave.genes == "XY">>
+ <<set $activeSlave.balls = random(6,7), $activeSlave.scrotum = $activeSlave.balls>>
+ <<else>>
+ <<set $activeSlave.balls = 1>>
+ <<set $activeSlave.scrotum = 0>>
+ <</if>>
+ <<elseif $TFS.schoolUpgrade == 1>>
<<set $activeSlave.balls = 1>>
<<set $activeSlave.scrotum = 0>>
<<elseif $TFS.schoolUpgrade == 2>>
@@ -552,7 +573,14 @@
<<set $activeSlave.boobs = 100*random(44,60)>>
<<set $activeSlave.dick = random(5,6)>>
<<if $activeSlave.foreskin > 0>><<set $activeSlave.foreskin = $activeSlave.dick>><</if>>
- <<if $TFS.schoolUpgrade == 1>>
+ <<if $TFS.schoolUpgrade == 3 && $TFS.compromiseWeek+15 <= $week>>
+ <<if $activeSlave.genes == "XY">>
+ <<set $activeSlave.balls = random(7,8), $activeSlave.scrotum = $activeSlave.balls>>
+ <<else>>
+ <<set $activeSlave.balls = 1>>
+ <<set $activeSlave.scrotum = 0>>
+ <</if>>
+ <<elseif $TFS.schoolUpgrade == 1>>
<<set $activeSlave.balls = 1>>
<<set $activeSlave.scrotum = 0>>
<<elseif $TFS.schoolUpgrade == 2>>
@@ -571,11 +599,17 @@
<<set $activeSlave.anus = 3>>
<<set $activeSlave.fetish = "dom">>
<</if>>
+ <<set $activeSlave.preg = -3>>
<<if $TFS.farmUpgrade != 0>>
<<set $activeSlave.ovaries = 1>>
- <<if $TFS.farmUpgrade == 2>>
+ <<if $TFS.farmUpgrade >= 2>>
<<set $activeSlave.preg = random(1,41)>>
- <<set $activeSlave.pregType = 1>>
+ <<if $TFS.farmUpgrade == 3>>
+ <<set $activeSlave.pregType = random(10,30)>>
+ <<set $activeSlave.pregAdaptation = 300>>
+ <<else>>
+ <<set $activeSlave.pregType = 1>>
+ <</if>>
<<set $activeSlave.pregKnown = 1>>
<<set $activeSlave.pregWeek = $activeSlave.preg>>
<<run SetBellySize($activeSlave)>>
@@ -593,8 +627,9 @@
<<set $activeSlave.health = random(60,80)>>
<<set $activeSlave.muscles = 20>>
<<set $activeSlave.waist = -15>>
- <<set $activeSlave.shoulders = 1>>
- <<set $activeSlave.preg = -2>>
+ <<if $activeSlave.genes == "XY">>
+ <<set $activeSlave.shoulders = 1>>
+ <</if>>
<<set $activeSlave.vaginalSkill = 100>>
<<set $activeSlave.oralSkill = 100>>
<<set $activeSlave.analSkill = 100>>
@@ -628,7 +663,9 @@
<<set $activeSlave.boobs = 100*random(44,60)>>
<<set $activeSlave.dick = random(5,6)>>
<<if $activeSlave.foreskin > 0>><<set $activeSlave.foreskin = $activeSlave.dick>><</if>>
- <<if $TFS.schoolUpgrade == 1>>
+ <<if $TFS.schoolUpgrade == 3 && $TFS.compromiseWeek+15 <= $week>>
+ <<set $activeSlave.balls = 10, $activeSlave.scrotum = $activeSlave.balls>>
+ <<elseif $TFS.schoolUpgrade == 1>>
<<set $activeSlave.balls = 1>>
<<set $activeSlave.scrotum = 0>>
<<elseif $TFS.schoolUpgrade == 2>>
@@ -647,11 +684,17 @@
<<set $activeSlave.vagina = 3>>
<<set $activeSlave.anus = 3>>
<<set $activeSlave.fetish = "dom">>
+ <<set $activeSlave.preg = -3>>
<<if $TFS.farmUpgrade != 0>>
<<set $activeSlave.ovaries = 1>>
- <<if $TFS.farmUpgrade == 2>>
+ <<if $TFS.farmUpgrade >= 2>>
<<set $activeSlave.preg = random(1,41)>>
- <<set $activeSlave.pregType = 1>>
+ <<if $TFS.farmUpgrade == 3>>
+ <<set $activeSlave.pregType = random(20,40)>>
+ <<set $activeSlave.pregAdaptation = 500>>
+ <<else>>
+ <<set $activeSlave.pregType = 1>>
+ <</if>>
<<set $activeSlave.pregKnown = 1>>
<<set $activeSlave.pregWeek = $activeSlave.preg>>
<<run SetBellySize($activeSlave)>>
@@ -664,13 +707,12 @@
<<else>>
<<set $activeSlave.energy = $activeSlave.physicalAge+random(20,30)>>
<</if>>
- <<set $activeSlave.devotion = random(25,30)>>
- <<set $activeSlave.trust = random(10,15)>>
+ <<set $activeSlave.devotion = random(25,30)>>
+ <<set $activeSlave.trust = random(10,15)>>
<<set $activeSlave.health = random(60,80)>>
<<set $activeSlave.muscles = 20>>
<<set $activeSlave.waist = -15>>
<<set $activeSlave.shoulders = 1>>
- <<set $activeSlave.preg = -2>>
<<set $activeSlave.vaginalSkill = 100>>
<<set $activeSlave.oralSkill = 100>>
<<set $activeSlave.analSkill = 100>>
@@ -715,14 +757,12 @@
<br><br>
The failure of a prominent organization within your arcology has @@.red;affected your reputation@@ and @@.red;your arcology's prosperity@@ slightly, but you've come out a long way ahead. You've acquired excellent slaves for a pitiful fraction of their fair price.
-<</nobr>>
+<br><br>
-<<nobr>>
<span id="result">
<<if $RESFailure == "TFS">>
<<link "Rape her">>
<<replace "#result">>
- <<nobr>>
<<for $i = 0; $i < $slaves.length; $i++>>
<<if ($slaves[$i].origin == "She was the leader of your arcology's Futanari Sisters until you engineered her community's failure and enslavement.")>>
<<set $activeSlave.devotion += 10>>
@@ -733,13 +773,12 @@ The failure of a prominent organization within your arcology has @@.red;affected
<</if>>
<</for>>
You <<if $PC.dick == 1>>whip out your dick<<else>>pull on a strap-on, the one you use for disobedient slaves,<</if>> and kneel down behind the sobbing futa matron. When she feels it touching her pussylips, she whispers "Thank you, <<Master>>," through her tears. She's very, very sexually experienced, so it's harder to make her feel it than it would be for a girl with tighter holes. But you're an expert. You calibrate your pounding to pull just barely too far out, so that she feels you ramming mercilessly into her with each stroke, and so that the slightest mistake from her sends <<if $PC.dick == 1>>your cock<<else>>the phallus<</if>> right up the other hole. Despite her anguish and the brutal fuck, or perhaps because of them, she slowly manages to get hard, and orgasms painfully when you do. She @@.hotpink;can't seem to stop thanking you,@@ but is quiet when you tell her to be.
- <</nobr>><</replace>>
+ <</replace>>
<</link>>
<br>
<</if>>
<<link "Sell your prizes immediately">>
<<replace "#result">>
- <<nobr>>
<<for $i = 0; $i < $slaves.length; $i++>>
<<set $activeSlave = $slaves[$i]>>
<<if $RESFailure == "TSS">>
@@ -801,7 +840,6 @@ The failure of a prominent organization within your arcology has @@.red;affected
<</if>>
<</for>>
Prizes sold.
- <</nobr>><</replace>>
+ <</replace>>
<</link>>
</span>
-<</nobr>>
diff --git a/src/uncategorized/saBeYourHeadGirl.tw b/src/uncategorized/saBeYourHeadGirl.tw
index 7ac54d3bcb16ca1e7fb6297d6f445b04997f1bdd..24747489f9c020f3390a2a803f757fcc5f0e315c 100644
--- a/src/uncategorized/saBeYourHeadGirl.tw
+++ b/src/uncategorized/saBeYourHeadGirl.tw
@@ -135,12 +135,12 @@
<<set $slaves[$i].fetishStrength += 4>>
<</if>>
<</if>>
- <<elseif $slaves[$i].fetishStrength <= random(20,60)>>
- The sheer variety of sexual situations she sees and participates in @@.pink;broaden her sexual interests@@ and incline her to take a dominant sexual role.
- <<set $slaves[$i].fetishStrength -= 4>>
<<elseif $slaves[$i].fetishStrength < 20>>
Having all the slaves look up to and obey her affects her sexuality, turning her into a @@.lightcoral;bit of a dominatrix.@@
<<set $slaves[$i].fetish = "dom", $slaves[$i].fetishStrength = 20, $slaves[$i].fetishKnown = 1>>
+ <<elseif $slaves[$i].fetishStrength <= random(20,60)>>
+ The sheer variety of sexual situations she sees and participates in @@.pink;broaden her sexual interests@@ and incline her to take a dominant sexual role.
+ <<set $slaves[$i].fetishStrength -= 4>>
<</if>>
<<else>>
<<if random(1,3) == 1>>
diff --git a/src/uncategorized/saHormoneEffects.tw b/src/uncategorized/saHormoneEffects.tw
index 6fe34e0608e0881bd34785b7fa3ae05f9b7b1189..b7631b69971b921fc285074746c2885f51fad01b 100644
--- a/src/uncategorized/saHormoneEffects.tw
+++ b/src/uncategorized/saHormoneEffects.tw
@@ -71,7 +71,7 @@
<</if>>
<</if>>
-<<if $slaves[$i].physicalAge >= 18 || $loliGrow == 1>>
+<<if $slaves[$i].physicalAge >= 18 || $loliGrow == 1 || $slaves[$i].inducedNCS == 1>>
<<if Math.abs($slaves[$i].hormoneBalance) >= 50>>
<<if $slaves[$i].hormoneBalance >= 350>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 0ce9d5f1a22657a0da110ff7c642dc5292f95db5..c8f8365db21781ec209611770a738c095b4d62d4 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -6155,7 +6155,7 @@
<<if def _j && isSlaveAvailable($slaves[$i]) && isSlaveAvailable($slaves[_j])>> /* rape time */
<<set _fuckCount = random(1,(Math.ceil($slaves[$i].energy/10)+1))>>
<<set $slaves[$i].need -= _fuckCount*10>>
- <<SimpleSlaveSlaveFucking $slaves[_j] $slaves[$i] _fuckCount>>
+ <<= SimpleSlaveSlaveFucking($slaves[_j], $slaves[$i], _fuckCount)>>
<</if>>
<</if>>
<<if $slaves[$i].relationship > 2>>
@@ -6179,7 +6179,7 @@
<</if>>
<<set _fuckCount = random(Math.min(4,Math.ceil($slaves[$i].energy/20)),5)>>
<<set $slaves[$i].need = 0>>
- <<SimpleSlaveSlaveFucking $slaves[_j] $slaves[$i] _fuckCount>>
+ <<= SimpleSlaveSlaveFucking($slaves[_j], $slaves[$i], _fuckCount)>>
<</if>>
<</if>>
@@ -6588,27 +6588,29 @@
<</if>>
<<if $slaves[$i].physicalAge >= 18>>
<<if ($slaves[$i].boobs > 30000+($slaves[$i].muscles*100))>>
- <<if ($slaves[$i].assignment != "work in the dairy") || ($dairyRestraintsSetting < 2) || $arcologies[0].FSAssetExpansionistResearch == 0>>
- <<if (($slaves[$i].drugs != "breast injections") && ($slaves[$i].drugs != "intensive breast injections") && ($arcologies[0].FSAssetExpansionistResearch == 0))>>
- <<if (($slaves[$i].bellyPreg < 300000) && ($slaves[$i].hormoneBalance < 300))>>
- <<if ($slaves[$i].boobs > 30000+($slaves[$i].muscles*100))>>
- $possessiveCap breasts are larger than $possessive body can possibly sustain without industrial intervention, and they @@.orange;naturally lose mass.@@
- <<set $slaves[$i].boobs -= 25>>
- <<else>>
- $possessiveCap breasts are far, far beyond what $possessive body can sustain without industrial intervention, and they @@.orange;naturally lose mass.@@
- <<set $slaves[$i].boobs -= 50>>
- <</if>>
- <<if (($slaves[$i].inducedNCS == 1) && (random(1,100) > 50))>>
- This effect is massively compounded by $possessive @@.orange;NCS.@@
- <<set $slaves[$i].boobs -= Math.round($slaves[$i].boobs * .1)>>
- <</if>>
- <</if>>
- <</if>>
- <</if>>
+ <<if ($slaves[$i].assignment != "work in the dairy") || ($dairyRestraintsSetting < 2) || $arcologies[0].FSAssetExpansionistResearch == 0>>
+ <<if (($slaves[$i].drugs != "breast injections") && ($slaves[$i].drugs != "intensive breast injections") && ($arcologies[0].FSAssetExpansionistResearch == 0))>>
+ <<if (($slaves[$i].bellyPreg < 300000) && ($slaves[$i].hormoneBalance < 300))>>
+ <<if ($slaves[$i].boobs > 30000+($slaves[$i].muscles*100))>>
+ $possessiveCap breasts are larger than $possessive body can possibly sustain without industrial intervention, and they @@.orange;naturally lose mass.@@
+ <<set $slaves[$i].boobs -= 25>>
+ <<else>>
+ $possessiveCap breasts are far, far beyond what $possessive body can sustain without industrial intervention, and they @@.orange;naturally lose mass.@@
+ <<set $slaves[$i].boobs -= 50>>
+ <</if>>
+ <<if (($slaves[$i].inducedNCS == 1) && (random(1,100) > 50))>>
+ This effect is massively compounded by $possessive @@.orange;NCS.@@
+ <<set $slaves[$i].boobs -= Math.round($slaves[$i].boobs * .1)>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <</if>>
<</if>>
<<if ($slaves[$i].boobs > 40000)>>
Her immense breasts are so big they pin her to the floor, taking the weight off her body.
- <<if $slaves[$i].devotion <= 50>>
+ <<if $slaves[$i].sexualFlaw == "breast growth">>
+ She's perfectly fine with dragging them along as a testament to how much she's managed to grow.
+ <<elseif $slaves[$i].devotion <= 50>>
She finds pulling them along @@.mediumorchid;mildly annoying.@@
<<set $slaves[$i].devotion -= 1>>
<<else>>
@@ -6616,7 +6618,9 @@
<</if>>
<<elseif ($slaves[$i].boobs > 25000)>>
<<if canWalk($slaves[$i])>>
- <<if $slaves[$i].devotion <= 50>>
+ <<if $slaves[$i].sexualFlaw == "breast growth">>
+ Her giant tits are debilitatingly big and a constant reminder of her progress. No amount of discomfort or pain could dissuade her from going bigger.
+ <<elseif $slaves[$i].devotion <= 50>>
Her giant tits are debilitatingly big. They are @@.mediumorchid;very uncomfortable@@ and @@.red;painful@@ for her body.
<<set $slaves[$i].devotion -= 3>>
<<set $slaves[$i].health -= 5>>
@@ -6627,7 +6631,9 @@
<<elseif ($slaves[$i].boobs > 10000)>>
<<if ($slaves[$i].muscles <= 30)>>
<<if canWalk($slaves[$i])>>
- <<if $slaves[$i].devotion <= 50>>
+ <<if $slaves[$i].sexualFlaw == "breast growth">>
+ Her huge breasts are becoming troublesome for her slight form, but that only drives her desire to go even bigger.
+ <<elseif $slaves[$i].devotion <= 50>>
Dragging her huge tits around is @@.mediumorchid;uncomfortable@@ and @@.red;painful@@ for her slight form.
<<set $slaves[$i].devotion -= 2>>
<<set $slaves[$i].health -= 2>>
@@ -6639,7 +6645,9 @@
<<elseif ($slaves[$i].boobs > 4000)>>
<<if ($slaves[$i].muscles <= 30)>>
<<if canWalk($slaves[$i])>>
- <<if $slaves[$i].devotion <= 50>>
+ <<if $slaves[$i].sexualFlaw == "breast growth">>
+ The weight of her big boobs serves as a reminder that she needs to get even bigger.
+ <<elseif $slaves[$i].devotion <= 50>>
The weight of her big boobs is @@.mediumorchid;uncomfortable@@ for her slight form.
<<set $slaves[$i].devotion -= 2>>
<<else>>
@@ -6650,29 +6658,31 @@
<</if>>
<<elseif $slaves[$i].physicalAge <= 3>>
<<if ($slaves[$i].boobs > 5000+($slaves[$i].muscles*10))>>
- <<if ($slaves[$i].assignment != "work in the dairy") || ($dairyRestraintsSetting < 2) || $arcologies[0].FSAssetExpansionistResearch == 0>>
- <<if ($slaves[$i].drugs != "breast injections" && $slaves[$i].drugs != "intensive breast injections" && $arcologies[0].FSAssetExpansionistResearch == 0)>>
- <<if $slaves[$i].bellyPreg < 300000 && $slaves[$i].hormoneBalance < 300>>
- <<if ($slaves[$i].boobs > 5000+($slaves[$i].muscles*10))>>
- $possessiveCap breasts are larger than $possessive body can possibly sustain without industrial intervention, and they @@.orange;naturally lose mass.@@
- <<set $slaves[$i].boobs -= 25>>
- <<else>>
- $possessiveCap breasts are far, far beyond what $possessive body can sustain without industrial intervention, and they @@.orange;naturally lose mass.@@
- <<set $slaves[$i].boobs -= 50>>
- <</if>>
- <<if (($slaves[$i].inducedNCS == 1) && (random(1,100) > 50))>>
- This effect is compounded by $possessive @@.orange;NCS.@@
- <<set $slaves[$i].boobs -= Math.round($slaves[$i].boobs * .1)>>
- <</if>>
- <</if>>
- <</if>>
- <</if>>
+ <<if ($slaves[$i].assignment != "work in the dairy") || ($dairyRestraintsSetting < 2) || $arcologies[0].FSAssetExpansionistResearch == 0>>
+ <<if ($slaves[$i].drugs != "breast injections" && $slaves[$i].drugs != "intensive breast injections" && $arcologies[0].FSAssetExpansionistResearch == 0)>>
+ <<if $slaves[$i].bellyPreg < 300000 && $slaves[$i].hormoneBalance < 300>>
+ <<if ($slaves[$i].boobs > 5000+($slaves[$i].muscles*10))>>
+ $possessiveCap breasts are larger than $possessive body can possibly sustain without industrial intervention, and they @@.orange;naturally lose mass.@@
+ <<set $slaves[$i].boobs -= 25>>
+ <<else>>
+ $possessiveCap breasts are far, far beyond what $possessive body can sustain without industrial intervention, and they @@.orange;naturally lose mass.@@
+ <<set $slaves[$i].boobs -= 50>>
+ <</if>>
+ <<if (($slaves[$i].inducedNCS == 1) && (random(1,100) > 50))>>
+ This effect is compounded by $possessive @@.orange;NCS.@@
+ <<set $slaves[$i].boobs -= Math.round($slaves[$i].boobs * .1)>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <</if>>
<</if>>
<<if ($slaves[$i].boobs > 40000)>>
- Her titanic breasts are so massive they dwarf her body. She has no choice but to accept immobility.
+ Her titanic breasts are so massive they dwarf her body. She <<if $slaves[$i].sexualFlaw == "breast growth">>happily embraces<<else>>has no choice but to accept<</if>> immobility.
<<elseif ($slaves[$i].boobs > 20000)>>
Her immense breasts are so huge they rest upon the floor even when she tries to stand, taking the weight off her tiny body.
- <<if $slaves[$i].devotion <= 50>>
+ <<if $slaves[$i].sexualFlaw == "breast growth">>
+ She's perfectly fine with dragging them along as a testament to how much she's managed to grow.
+ <<elseif $slaves[$i].devotion <= 50>>
She finds pulling them along @@.mediumorchid;mildly annoying.@@
<<set $slaves[$i].devotion -= 1>>
<<else>>
@@ -6680,7 +6690,9 @@
<</if>>
<<elseif ($slaves[$i].boobs > 6000)>>
Her giant breasts are so big they pin her to the floor, taking the weight off her tiny body.
- <<if $slaves[$i].devotion <= 50>>
+ <<if $slaves[$i].sexualFlaw == "breast growth">>
+ She's perfectly fine with dragging them along as a testament to how much she's managed to grow.
+ <<elseif $slaves[$i].devotion <= 50>>
She finds pulling them along @@.mediumorchid;mildly annoying.@@
<<set $slaves[$i].devotion -= 1>>
<<else>>
@@ -6688,7 +6700,9 @@
<</if>>
<<elseif ($slaves[$i].boobs > 5000)>>
<<if canWalk($slaves[$i])>>
- <<if $slaves[$i].devotion <= 50>>
+ <<if $slaves[$i].sexualFlaw == "breast growth">>
+ Her giant tits are debilitatingly big and a constant reminder of her progress. No amount of discomfort or pain could dissuade her from going bigger.
+ <<elseif $slaves[$i].devotion <= 50>>
Her giant tits are debilitatingly big. They are @@.mediumorchid;very uncomfortable@@ and @@.red;painful@@ for her childish form.
<<set $slaves[$i].devotion -= 3>>
<<set $slaves[$i].health -= 4>>
@@ -6699,7 +6713,9 @@
<<elseif ($slaves[$i].boobs > 2500)>>
<<if ($slaves[$i].muscles <= 80)>>
<<if canWalk($slaves[$i])>>
- <<if $slaves[$i].devotion <= 50>>
+ <<if $slaves[$i].sexualFlaw == "breast growth">>
+ Her huge breasts are troublesome for her childish form, but that only drives her desire to go even bigger.
+ <<elseif $slaves[$i].devotion <= 50>>
Hauling her huge tits around is @@.mediumorchid;uncomfortable@@ for her childish form.
<<set $slaves[$i].devotion -= 2>>
<<else>>
@@ -6710,7 +6726,9 @@
<<elseif ($slaves[$i].boobs > 1000)>>
<<if ($slaves[$i].muscles <= 30)>>
<<if canWalk($slaves[$i])>>
- <<if $slaves[$i].devotion <= 50>>
+ <<if $slaves[$i].sexualFlaw == "breast growth">>
+ The weight of her big boobs serves as a reminder that she needs to get even bigger.
+ <<elseif $slaves[$i].devotion <= 50>>
The weight of her big boobs is @@.mediumorchid;uncomfortable@@ for her slight form.
<<set $slaves[$i].devotion -= 2>>
<<else>>
@@ -6721,27 +6739,29 @@
<</if>>
<<elseif $slaves[$i].physicalAge <= 12>>
<<if ($slaves[$i].boobs > 10000+($slaves[$i].muscles*20))>>
- <<if ($slaves[$i].assignment != "work in the dairy") || ($dairyRestraintsSetting < 2) || $arcologies[0].FSAssetExpansionistResearch == 0>>
- <<if ($slaves[$i].drugs != "breast injections" && $slaves[$i].drugs != "intensive breast injections" && $arcologies[0].FSAssetExpansionistResearch == 0)>>
- <<if $slaves[$i].bellyPreg < 300000 && $slaves[$i].hormoneBalance < 300>>
- <<if ($slaves[$i].boobs > 10000+($slaves[$i].muscles*20))>>
- $possessiveCap breasts are larger than $possessive body can possibly sustain without industrial intervention, and they @@.orange;naturally lose mass.@@
- <<set $slaves[$i].boobs -= 25>>
- <<else>>
- $possessiveCap breasts are far, far beyond what $possessive body can sustain without industrial intervention, and they @@.orange;naturally lose mass.@@
- <<set $slaves[$i].boobs -= 50>>
- <</if>>
- <<if (($slaves[$i].inducedNCS == 1) && (random(1,100) > 50))>>
- This effect is compounded by $possessive @@.orange;NCS.@@
- <<set $slaves[$i].boobs -= Math.round($slaves[$i].boobs * .1)>>
- <</if>>
- <</if>>
- <</if>>
- <</if>>
+ <<if ($slaves[$i].assignment != "work in the dairy") || ($dairyRestraintsSetting < 2) || $arcologies[0].FSAssetExpansionistResearch == 0>>
+ <<if ($slaves[$i].drugs != "breast injections" && $slaves[$i].drugs != "intensive breast injections" && $arcologies[0].FSAssetExpansionistResearch == 0)>>
+ <<if $slaves[$i].bellyPreg < 300000 && $slaves[$i].hormoneBalance < 300>>
+ <<if ($slaves[$i].boobs > 10000+($slaves[$i].muscles*20))>>
+ $possessiveCap breasts are larger than $possessive body can possibly sustain without industrial intervention, and they @@.orange;naturally lose mass.@@
+ <<set $slaves[$i].boobs -= 25>>
+ <<else>>
+ $possessiveCap breasts are far, far beyond what $possessive body can sustain without industrial intervention, and they @@.orange;naturally lose mass.@@
+ <<set $slaves[$i].boobs -= 50>>
+ <</if>>
+ <<if (($slaves[$i].inducedNCS == 1) && (random(1,100) > 50))>>
+ This effect is compounded by $possessive @@.orange;NCS.@@
+ <<set $slaves[$i].boobs -= Math.round($slaves[$i].boobs * .1)>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <</if>>
<</if>>
<<if ($slaves[$i].boobs > 40000)>>
Her immense breasts are so huge they rest upon the floor even when she tries to stand, taking the weight off her small body.
- <<if $slaves[$i].devotion <= 50>>
+ <<if $slaves[$i].sexualFlaw == "breast growth">>
+ She's perfectly fine with dragging them along as a testament to how much she's managed to grow.
+ <<elseif $slaves[$i].devotion <= 50>>
She finds pulling them along @@.mediumorchid;mildly annoying.@@
<<set $slaves[$i].devotion -= 1>>
<<else>>
@@ -6749,7 +6769,9 @@
<</if>>
<<elseif ($slaves[$i].boobs > 12000)>>
Her giant breasts are so big they pin her to the floor, taking the weight off her young body.
- <<if $slaves[$i].devotion <= 50>>
+ <<if $slaves[$i].sexualFlaw == "breast growth">>
+ She's perfectly fine with dragging them along as a testament to how much she's managed to grow.
+ <<elseif $slaves[$i].devotion <= 50>>
She finds pulling them along @@.mediumorchid;mildly annoying.@@
<<set $slaves[$i].devotion -= 1>>
<<else>>
@@ -6758,7 +6780,9 @@
<<elseif ($slaves[$i].boobs > 10000)>>
<<if canWalk($slaves[$i])>>
Her giant tits are debilitatingly big.
- <<if $slaves[$i].devotion <= 50>>
+ <<if $slaves[$i].sexualFlaw == "breast growth">>
+ No amount of discomfort or pain could dissuade her from going bigger.
+ <<elseif $slaves[$i].devotion <= 50>>
They are @@.mediumorchid;very uncomfortable@@ and @@.red;painful@@ for her childish form.
<<set $slaves[$i].devotion -= 3>>
<<set $slaves[$i].health -= 5>>
@@ -6769,7 +6793,9 @@
<<elseif ($slaves[$i].boobs > 5000)>>
<<if ($slaves[$i].muscles <= 80)>>
<<if canWalk($slaves[$i])>>
- <<if $slaves[$i].devotion <= 50>>
+ <<if $slaves[$i].sexualFlaw == "breast growth">>
+ Her huge breasts are troublesome for her childish form, but that only drives her desire to go even bigger.
+ <<elseif $slaves[$i].devotion <= 50>>
Dragging her huge tits around is @@.mediumorchid;uncomfortable@@ and @@.red;painful@@ for her childish form.
<<set $slaves[$i].devotion -= 2>>
<<set $slaves[$i].health -= 4>>
@@ -6781,7 +6807,9 @@
<<elseif ($slaves[$i].boobs > 2000)>>
<<if ($slaves[$i].muscles <= 30)>>
<<if canWalk($slaves[$i])>>
- <<if $slaves[$i].devotion <= 50>>
+ <<if $slaves[$i].sexualFlaw == "breast growth">>
+ The weight of her big boobs serves as a reminder that she needs to get even bigger.
+ <<elseif $slaves[$i].devotion <= 50>>
The weight of her big boobs is @@.mediumorchid;uncomfortable@@ for her slight form.
<<set $slaves[$i].devotion -= 1>>
<<else>>
@@ -6792,40 +6820,50 @@
<</if>>
<<else>>
<<if ($slaves[$i].boobs > 20000+($slaves[$i].muscles*50))>>
- <<if ($slaves[$i].assignment != "work in the dairy") || ($dairyRestraintsSetting < 2) || $arcologies[0].FSAssetExpansionistResearch == 0>>
- <<if ($slaves[$i].drugs != "breast injections" && $slaves[$i].drugs != "intensive breast injections" && $arcologies[0].FSAssetExpansionistResearch == 0)>>
- <<if $slaves[$i].bellyPreg < 300000 && $slaves[$i].hormoneBalance < 300>>
- <<if ($slaves[$i].boobs > 20000+($slaves[$i].muscles*50))>>
- $possessiveCap breasts are larger than $possessive body can possibly sustain without industrial intervention, and they @@.orange;naturally lose mass.@@
- <<set $slaves[$i].boobs -= 25>>
- <<else>>
- $possessiveCap breasts are far, far beyond what $possessive body can sustain without industrial intervention, and they @@.orange;naturally lose mass.@@
- <<set $slaves[$i].boobs -= 50>>
- <</if>>
- <<if (($slaves[$i].inducedNCS == 1) && (random(1,100) > 50))>>
- This effect is compounded by $possessive @@.orange;NCS.@@
- <<set $slaves[$i].boobs -= Math.round($slaves[$i].boobs * .1)>>
- <</if>>
- <</if>>
- <</if>>
- <</if>>
+ <<if ($slaves[$i].assignment != "work in the dairy") || ($dairyRestraintsSetting < 2) || $arcologies[0].FSAssetExpansionistResearch == 0>>
+ <<if ($slaves[$i].drugs != "breast injections" && $slaves[$i].drugs != "intensive breast injections" && $arcologies[0].FSAssetExpansionistResearch == 0)>>
+ <<if $slaves[$i].bellyPreg < 300000 && $slaves[$i].hormoneBalance < 300>>
+ <<if ($slaves[$i].boobs > 20000+($slaves[$i].muscles*50))>>
+ $possessiveCap breasts are larger than $possessive body can possibly sustain without industrial intervention, and they @@.orange;naturally lose mass.@@
+ <<set $slaves[$i].boobs -= 25>>
+ <<else>>
+ $possessiveCap breasts are far, far beyond what $possessive body can sustain without industrial intervention, and they @@.orange;naturally lose mass.@@
+ <<set $slaves[$i].boobs -= 50>>
+ <</if>>
+ <<if (($slaves[$i].inducedNCS == 1) && (random(1,100) > 50))>>
+ This effect is compounded by $possessive @@.orange;NCS.@@
+ <<set $slaves[$i].boobs -= Math.round($slaves[$i].boobs * .1)>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <</if>>
<</if>>
<<if ($slaves[$i].boobs > 25000)>>
- Her immense breasts are so big they pin her to the floor, taking the weight off her youthful body. She finds pulling them along @@.mediumorchid;mildly annoying.@@
- <<set $slaves[$i].devotion -= 1>>
+ Her immense breasts are so big they pin her to the floor, taking the weight off her youthful body.
+ <<if $slaves[$i].sexualFlaw == "breast growth">>
+ She's perfectly fine with dragging them along as a testament to how much she's managed to grow.
+ <<elseif $slaves[$i].devotion <= 50>>
+ She finds pulling them along @@.mediumorchid;mildly annoying.@@
+ <<set $slaves[$i].devotion -= 1>>
+ <<else>>
+ She finds pulling them along a little annoying, but your will is far more important to her.
+ <</if>>
<<elseif ($slaves[$i].boobs > 17000)>>
Her giant tits are debilitatingly big.
- <<if $slaves[$i].devotion <= 50>>
+ <<if $slaves[$i].sexualFlaw == "breast growth">>
+ No amount of discomfort or pain could dissuade her from going bigger.
+ <<elseif $slaves[$i].devotion <= 50>>
They are @@.mediumorchid;very uncomfortable@@ and @@.red;painful@@ for her youthful form.
- <<set $slaves[$i].devotion -= 3>>
- <<set $slaves[$i].health -= 10>>
+ <<set $slaves[$i].devotion -= 3, $slaves[$i].health -= 10>>
<<else>>
She finds them painfully uncomfortable, but finds ways to mitigate it to not distract you with her worries.
<</if>>
<<elseif ($slaves[$i].boobs > 10000)>>
<<if ($slaves[$i].muscles <= 30)>>
<<if canWalk($slaves[$i])>>
- <<if $slaves[$i].devotion <= 50>>
+ <<if $slaves[$i].sexualFlaw == "breast growth">>
+ Her huge breasts are troublesome for her slight form, but that only drives her desire to go even bigger.
+ <<elseif $slaves[$i].devotion <= 50>>
Dragging her huge tits around is @@.mediumorchid;uncomfortable@@ and @@.red;painful@@ for her slight form.
<<set $slaves[$i].devotion -= 2, $slaves[$i].health -= 3>>
<<else>>
@@ -6836,7 +6874,9 @@
<<elseif ($slaves[$i].boobs > 2000)>>
<<if ($slaves[$i].muscles <= 5)>>
<<if canWalk($slaves[$i])>>
- <<if $slaves[$i].devotion <= 50>>
+ <<if $slaves[$i].sexualFlaw == "breast growth">>
+ The weight of her big boobs serves as a reminder that she needs to get even bigger.
+ <<elseif $slaves[$i].devotion <= 50>>
The weight of her big boobs is @@.mediumorchid;uncomfortable@@ for her slight form.
<<set $slaves[$i].devotion -= 1>>
<<else>>
@@ -6848,6 +6888,7 @@
<</if>>
/* I need to be redone phase-7 */
+ /* keep in mind breeder paraphilia overriding mentla effects */
<<if ($slaves[$i].preg > 30)>>
<<if ($slaves[$i].physicalAge < 4)>>
<<if ($slaves[$i].pregType >= 20)>>
@@ -6994,27 +7035,29 @@
<</if>>
<<if $slaves[$i].fuckdoll == 0>>
- <<if $slaves[$i].fetish != "mindbroken">>
- <<if ($slaves[$i].boobs > 20000)>>
- <<if $boobAccessibility == 1>>
- <<if ($slaves[$i].devotion > 20)>>
- She's @@.mediumaquamarine;thankful@@ to you for providing living spaces adapted to life with gigantic boobs.
- <<set $slaves[$i].trust += 1>>
- <</if>>
- <<else>>
- Her gigantic boobs make life a struggle: <<if $buttAccessibility == 1 || $pregAccessibility == 1 || $ballsAccessibility == 1>>she has trouble using appliances and furniture, and constantly bumps into things, but at least the doors have already been widened for your other slaves<<else>>she barely fits through doors, has trouble using appliances and furniture, and constantly bumps into things<</if>>.
- <<if ($slaves[$i].devotion > 50)>>
- Since she's devoted to you, she just does her best.
- <<elseif ($slaves[$i].trust > -20)>>
- This torment makes her @@.gold;less trusting@@ of your willingness to look after her.
- <<set $slaves[$i].trust -= 2>>
- <<else>>
- She already believes you capable of tormenting her, so this proof of your indifference @@.mediumorchid;angers her@@ daily.
- <<set $slaves[$i].devotion -= 2>>
- <</if>>
- <</if>>
- <</if>>
- <</if>>
+ <<if $slaves[$i].fetish != "mindbroken">>
+ <<if ($slaves[$i].boobs > 20000)>>
+ <<if $boobAccessibility == 1>>
+ <<if ($slaves[$i].devotion > 20)>>
+ She's @@.mediumaquamarine;thankful@@ to you for providing living spaces adapted to life with gigantic boobs.
+ <<set $slaves[$i].trust += 1>>
+ <</if>>
+ <<else>>
+ Her gigantic boobs make life a struggle: <<if $buttAccessibility == 1 || $pregAccessibility == 1 || $ballsAccessibility == 1>>she has trouble using appliances and furniture, and constantly bumps into things, but at least the doors have already been widened for your other slaves<<else>>she barely fits through doors, has trouble using appliances and furniture, and constantly bumps into things<</if>>.
+ <<if $slaves[$i].sexualFlaw == "breast growth">>
+ Every little inconvenience just feeds her breast growth obsession, so she's more bothered that they aren't an even bigger problem for her daily life.
+ <<elseif ($slaves[$i].devotion > 50)>>
+ Since she's devoted to you, she just does her best.
+ <<elseif ($slaves[$i].trust > -20)>>
+ This torment makes her @@.gold;less trusting@@ of your willingness to look after her.
+ <<set $slaves[$i].trust -= 2>>
+ <<else>>
+ She already believes you capable of tormenting her, so this proof of your indifference @@.mediumorchid;angers her@@ daily.
+ <<set $slaves[$i].devotion -= 2>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <</if>>
<</if>>
<<if (($slaves[$i].inducedNCS == 0) && ($slaves[$i].lactation > 1))>>
@@ -7576,6 +7619,9 @@
<<elseif SlaveStatsChecker.checkForLisp($slaves[$i])>> /* moderate speech impediment */
<<set _minweeks += 15>>
<</if>>
+ <<if $slaves[$i].accent == 4>>
+ <<set _minweeks += 40>>
+ <</if>>
<<if ($slaves[$i].accent >= 4)>>
<<if ($week - $slaves[$i].weekAcquired) > _minweeks - 5>>
<<set $slaves[$i].accent -= 1>>
diff --git a/src/uncategorized/saServeYourOtherSlaves.tw b/src/uncategorized/saServeYourOtherSlaves.tw
index 74d9a8a5a6583da96a10ceff7ae02a3b75ce1e2a..d17fdc320b9dc197a2c01bfb3b2ad634195dbd01 100644
--- a/src/uncategorized/saServeYourOtherSlaves.tw
+++ b/src/uncategorized/saServeYourOtherSlaves.tw
@@ -372,10 +372,10 @@ is serving ''$slaves[_dom].slaveName'' this week.
<</if>>
<<if canPenetrate($slaves[_dom])>>
<<set _fuckCount = random(15,25)>>
- <<SimpleSlaveSlaveFucking $slaves[$i] $slaves[_dom] _fuckCount>>
+ <<= SimpleSlaveSlaveFucking($slaves[$i], $slaves[_dom], _fuckCount)>>
<<elseif canPenetrate($slaves[$i]) && ((canDoVaginal($slaves[_dom]) && $slaves[_dom].vagina > 0) || (canDoAnal($slaves[_dom]) && $slaves[_dom].anus > 0))>> /* yes, that means she rides her */
<<set _fuckCount = random(15,25)>>
- <<SimpleSlaveSlaveFucking $slaves[_dom] $slaves[$i] _fuckCount>>
+ <<= SimpleSlaveSlaveFucking($slaves[_dom], $slaves[$i], _fuckCount)>>
<<else>>
<<set _oralUse = random(15,25)>>
<</if>>
@@ -388,7 +388,7 @@ is serving ''$slaves[_dom].slaveName'' this week.
$slaves[_dom].slaveName doesn't get to use her still-functional cock as much as she would like; it often stands stiff and untended while she's being used. Not this week: $slaves[$i].slaveName spends the week with $slaves[_dom].slaveName's _domRace dick thrusting in and out of her _subRace body, whenever she feels like having an enthusiastic fuck. @@.hotpink;$slaves[_dom].slaveName loves having someone to tend to her prick at last.@@
<</if>>
<<set _fuckCount = random(9,12)>>
- <<SimpleSlaveSlaveFucking $slaves[$i] $slaves[_dom] _fuckCount>>
+ <<= SimpleSlaveSlaveFucking($slaves[$i], $slaves[_dom], _fuckCount)>>
<<elseif ($slaves[_dom].amp != 1) && ($slaves[_dom].attrXX > 85) && ($slaves[$i].dick == 0) && ($slaves[$i].vagina > -1)>>
<<if ($slaves[$i].devotion < -20)>>
Since $slaves[_dom].slaveName loves girls, $slaves[$i].slaveName finds herself groped, fingered, and toyed with. She spends the week trying to avoid $slaves[_dom].slaveName's playful _domRace hands, but they rove across her _subRace body anyway. @@.hotpink;$slaves[_dom].slaveName enjoys having a nice little toy right at hand,@@ even if she does have to be forced.
@@ -399,7 +399,7 @@ is serving ''$slaves[_dom].slaveName'' this week.
<</if>>
<<if canPenetrate($slaves[_dom])>>
<<set _fuckCount = random(9,12)>>
- <<SimpleSlaveSlaveFucking $slaves[$i] $slaves[_dom] _fuckCount>>
+ <<= SimpleSlaveSlaveFucking($slaves[$i], $slaves[_dom], _fuckCount)>>
<<else>>
<<set _oralUse = random(9,12)>>
<</if>>
@@ -430,22 +430,22 @@ is serving ''$slaves[_dom].slaveName'' this week.
<</if>>
<</if>>
<<set _fuckCount = random(9,12)>>
- <<SimpleSlaveSlaveFucking $slaves[_dom] $slaves[$i] _fuckCount>>
+ <<= SimpleSlaveSlaveFucking($slaves[_dom], $slaves[$i], _fuckCount)>>
<<elseif $slaves[$i].amp == 1>>
$slaves[_dom].slaveName doesn't have any special desires, so she simply uses the helpless $slaves[$i].slaveName for comfort and convenience. $slaves[$i].slaveName finds her helpless _subRace torso being used as a bath toy, a bedwarmer, and for sexual convenience. @@.hotpink;$slaves[_dom].slaveName enjoys the ease and companionship.@@
<<set _fuckCount = random(9,12)>>
- <<SimpleSlaveSlaveFucking $slaves[$i] $slaves[_dom] _fuckCount>>
+ <<= SimpleSlaveSlaveFucking($slaves[$i], $slaves[_dom], _fuckCount)>>
<<else>>
$slaves[_dom].slaveName doesn't have any special desires $slaves[$i].slaveName can satisfy, so she simply uses $slaves[$i].slaveName for comfort and convenience. $slaves[$i].slaveName washes her superior's _domRace body thoroughly and uses her own _subRace body to warm $slaves[_dom].slaveName's bed at night. @@.hotpink;$slaves[_dom].slaveName enjoys the ease and companionship.@@
<<set _fuckCount = random(9,12)>>
- <<SimpleSlaveSlaveFucking $slaves[$i] $slaves[_dom] _fuckCount>>
+ <<= SimpleSlaveSlaveFucking($slaves[$i], $slaves[_dom], _fuckCount)>>
<</if>>
<<set $slaves[$i].oralCount += _oralUse, $oralTotal += _oralUse>>
<<set $slaves[$i].analCount += _analUse, $analTotal += _analUse>>
<<set $slaves[$i].vaginalCount += _vaginalUse, $vaginalTotal += _vaginalUse>>
<<set $slaves[$i].mammaryCount += _mammaryUse, $mammaryTotal += _mammaryUse>>
-<<set $slaves[$i].penetrativeCount += _penetrativeUse, $mammaryTotal += _penetrativeUse>>
+<<set $slaves[$i].penetrativeCount += _penetrativeUse, $penetrativeTotal += _penetrativeUse>>
<<set _cervixPump = _vaginalUse>>
<<set $slaves[$i].need -= ((_penetrativeUse+_vaginalUse+_analUse)*5)>>
diff --git a/src/uncategorized/saTakeClasses.tw b/src/uncategorized/saTakeClasses.tw
index 6ffaaadaeb08ceeb9ad9fdb8db07f66bdef740af..fe6d768cd7826490f2043602ff3571a39ac23ca0 100644
--- a/src/uncategorized/saTakeClasses.tw
+++ b/src/uncategorized/saTakeClasses.tw
@@ -193,7 +193,7 @@
<<if $slaves[$i].voice != 0>>
<<if ($slaves[$i].intelligence > random(-4,4))>>
<<if ($schoolroomUpgradeLanguage == 0)>>
- <<if ($slaves[$i].accent > 3)>>
+ <<if ($slaves[$i].accent > 3) && ($week-$slaves[$i].weekAcquired > 24)>>
$pronounCap has @@.green;learned some $language,@@ and can make $possessive point with some gesturing, though $pronoun speaks $language horribly.
<<set $slaves[$i].accent -= 1>>
<<if $slaves[$i].speechRules == "language lessons">>
@@ -205,8 +205,13 @@
<</if>>
<<else>>
<<if ($slaves[$i].accent > 3)>>
- $pronounCap has @@.green;learned some $language,@@ and can make $possessive point with some gesturing, though $pronoun speaks $language horribly.
- <<set $slaves[$i].accent -= 1>>
+ <<if ($week-$slaves[$i].weekAcquired > 16)>>
+ $pronounCap has @@.green;learned some $language,@@ and can make $possessive point with some gesturing, though $pronoun speaks $language horribly.
+ <<set $slaves[$i].accent -= 1>>
+ <<if $slaves[$i].speechRules == "language lessons">>
+ <<set $slaves[$i].speechRules = "accent elimination">>
+ <</if>>
+ <</if>>
<<elseif ($slaves[$i].accent >= 2)>>
$pronounCap has @@.green;learned decent $language,@@ though $pronoun retains enough of $possessive $slaves[$i].nationality accent to make $possessive voice distinctly sexy.
<<set $slaves[$i].accent = 1>>
diff --git a/src/uncategorized/scheduledEvent.tw b/src/uncategorized/scheduledEvent.tw
index 994b3e2f348897e9396838a7b49b7da78a1313d9..1d5a7df8808ab9a9def2a88b4b50a75ea1fc9ad5 100644
--- a/src/uncategorized/scheduledEvent.tw
+++ b/src/uncategorized/scheduledEvent.tw
@@ -74,21 +74,31 @@
<<set $fcnn.push("...construction of shelters accelerated last quarter, due to fears...")>>
<<set $fcnn.push("...major drought across the entire hemisphere shows no signs of...")>>
<<set $fcnn.push("...medical organization offered no explanation, stating that...")>>
+ <<set $fcnn.push("...just ahead, FCNN Special Report: Immortality and You - Breakthroughs in 'Bodyswapping' technology and what they mean for...")>>
<<elseif $week == 50>>
<<set $fcnn.push("...tested a thermonuclear device of some five megatons last night...")>>
<<set $fcnn.push("...heavy fighting for the third week in the capital city of...")>>
<<set $fcnn.push("...economic recovery looking increasingly unlikely in the event of...")>>
<<set $fcnn.push("...complete exhaustion of safe water reserves across...")>>
<<set $fcnn.push("...climate refugees streamed across the border despite...")>>
+ <<set $fcnn.push("...released a statement today, explaining their refusal to intervene against the pillaging of several Free Cities in Northern...")>>
+ <<set $fcnn.push("...denies allegations of ordering last week's combined arms assault on the arcology known as...")>>
+ <<set $fcnn.push("...Coming Up: Ghost Cities - The truth about recent surge of depopulated metropolitan areas in...")>>
<<elseif $week == 70>>
<<set $fcnn.push("...second low-order nuclear detonation in the city of...")>>
<<set $fcnn.push("...total societal collapse induced by rising sea levels declared today in...")>>
<<set $fcnn.push("...likelihood of containing Influenza-M was downgraded to a lower...")>>
<<set $fcnn.push("...threatened immediate use of chemical weapons should those forces not withdraw...")>>
<<set $fcnn.push("...relief organizations unable to deal with casualties from nuclear exchange between...")>>
+ <<set $fcnn.push("...guerilla fighting intensifies in escalating proxy war between 'Paternalist' and 'Degredationist' Free Cities in the region of...")>>
+ <<set $fcnn.push("...Coming Up- FCNN Special Report about the unpreceded scale of slave insurrections across...")>>
+ <<set $fcnn.push("...invasive plant growth epidemic contested by persistent droughts in eastern...")>>
<<elseif $week == 90>>
<<set $fcnn = ["FCNN service has been temporarily suspended. Please stand by."]>>
<</if>>
+<<if $TFS.schoolUpgrade == 3 && $week < 90 && $TFS.compromiseWeek == $week-1>>
+ <<set $fcnn.push("...Ladies: Do you want dick so much that you want to HAVE a dick? If yes, join the Futanari Sisters today! Learn more at...")>>
+<</if>>
<<if $secExp == 1>>
<<include "attackGenerator">>
diff --git a/src/uncategorized/securityForceNamingColonel.tw b/src/uncategorized/securityForceNamingColonel.tw
index cd722e9206664af877f6c076995f232222f60ee6..cc83926d2f6c16921f43f47c7a163466c738b90f 100644
--- a/src/uncategorized/securityForceNamingColonel.tw
+++ b/src/uncategorized/securityForceNamingColonel.tw
@@ -30,65 +30,55 @@ You close the link to the communication system and read a message from your assi
The figure that enters is not what you were expecting, given your previous experiences with the mercenary groups that work with the arcology owners of the Free Cities. Most mercenaries you've worked with have been grizzled stout men, veterans of the Old World militaries that finally had too much and went private. This one's different, <<if $ColonelCore != "">> likely to be ''$ColonelCore'' <</if>>
<span id="result0">
<<if $ColonelCore == "">> you can guess from her face that at her core she is likely to be:
- <<link "Kind,">>
- <<replace "#result0">>
+ <<link "Kind">>
+ <<replace "#result0" "Security Force Naming-Colonel">>
she strikes you as a kind person.
<<set $ColonelCore = "kind">>
- <<goto "Security Force Naming-Colonel">>
<</replace>>
- <</link>><<link "mischievous,">>
+ <</link>> | <<link "Mischievous" "Security Force Naming-Colonel">>
<<replace "#result0">>
she strikes you as someone who enjoys playfully causing trouble.
<<set $ColonelCore = "mischievous">>
- <<goto "Security Force Naming-Colonel">>
<</replace>>
- <</link>><<link "cruel,">>
+ <</link>> | <<link "Cruel" "Security Force Naming-Colonel">>
<<replace "#result0">>
she strikes you as terribly cruel.
<<set $ColonelCore = "cruel">>
- <<goto "Security Force Naming-Colonel">>
<</replace>>
- <</link>><<link "psychopathic,">>
+ <</link>> | <<link "Psychopathic" "Security Force Naming-Colonel">>
<<replace "#result0">>
she strikes you as a complete psychopath.
<<set $ColonelCore = "psychopathic">>
- <<goto "Security Force Naming-Colonel">>
<</replace>>
- <</link>><<link "sociopathic,">>
+ <</link>> | <<link "Sociopathic" "Security Force Naming-Colonel">>
<<replace "#result0">>
she strikes you as a complete sociopath.
<<set $ColonelCore = "sociopathic">>
- <<goto "Security Force Naming-Colonel">>
<</replace>>
- <</link>><<link "a warmonger,">>
+ <</link>> | <<link "A warmonger" "Security Force Naming-Colonel">>
<<replace "#result0">>
she strikes you as someone who just loves war.
<<set $ColonelCore = "warmonger">>
- <<goto "Security Force Naming-Colonel">>
<</replace>>
- <</link>><<link "jaded,">>
+ <</link>> | <<link "Jaded">>
she strikes you as someone who's seen too much to really care anymore.
<<replace "#result0">>
- <<set $ColonelCore = "jaded">>
- <<goto "Security Force Naming-Colonel">>
+ <<set $ColonelCore = "jaded" "Security Force Naming-Colonel">>
<</replace>>
- <</link>><<link "shell shocked,">>
+ <</link>> | <<link "Shell shocked">>
<<replace "#result0">>
she strikes you as someone who's been through hell.
<<set $ColonelCore = "shell shocked">>
- <<goto "Security Force Naming-Colonel">>
<</replace>>
- <</link>><<link "brazen,">>
+ <</link>> | <<link "Brazen" "Security Force Naming-Colonel">>
<<replace "#result0">>
she strikes you as someone who doesn't know shame.
<<set $ColonelCore = "brazen">>
- <<goto "Security Force Naming-Colonel">>
<</replace>>
- <</link>><<link "collected.">>
+ <</link>> | <<link "Collected" "Security Force Naming-Colonel">>
<<replace "#result0">>
she seems calm and collected.
<<set $ColonelCore = "collected">>
- <<goto "Security Force Naming-Colonel">>
<</replace>>
<</link>>
<</if>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 17c8606c3118dac09ac38f3cf1a3114005eb12d2..5c97ff37267ac8dc5667f6859b66b53b20456fca 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -1081,24 +1081,24 @@ Aphrodisiacs: <span id="aphrodisiacs"><strong><<if $activeSlave.aphrodisiacs > 1
<</if>>
<<if ($activeSlave.pregKnown == 1) && ($pregSpeedControl == 1) && ($activeSlave.breedingMark != 1) && ($activeSlave.indentureRestrictions < 1) && ($activeSlave.broodmother == 0) && $seePreg != 0>>
<br>
- __Pregnancy control__: <span id="pregControl"><<if $activeSlave.pregControl == "labor supressors">>Labor is suppressed<<elseif $activeSlave.pregControl == "slow gestation">>Slowed gestation<<elseif $activeSlave.pregControl == "speed up">>Faster gestation<<else>>Normal gestation<</if>></span>
+ __Pregnancy control__: <<if $activeSlave.pregControl == "labor supressors">>Labor is suppressed<<elseif $activeSlave.pregControl == "slow gestation">>Slowed gestation speed<<elseif $activeSlave.pregControl == "speed up">>Faster gestation speed, staffed clinic recommended<<else>>Normal gestation and birth<</if>>.
<<if ($activeSlave.preg >= 38)>>
<br>
<<if $activeSlave.pregControl == "labor supressors">>
- <<link "Normal Birth">><<set $activeSlave.pregControl = "none">><<replace "#pregControl">>natural birth<</replace>><</link>>
+ <<link "Normal Birth">><<set $activeSlave.pregControl = "none">><<SlaveInteractImpreg>><</link>>
<<else>>
- <<link "Supress Labor">><<set $activeSlave.pregControl = "labor supressors">><<replace "#pregControl">>labor will be suppressed<</replace>><</link>>
+ <<link "Supress Labor">><<set $activeSlave.pregControl = "labor supressors">><<SlaveInteractImpreg>><</link>>
<</if>>
<<elseif ($activeSlave.preg < 40)>>
<br>
<<if $activeSlave.pregControl != "none">>
- <<link "Normal Gestation">><<set $activeSlave.pregControl = "none">><<replace "#pregControl">>normal gestation speed<</replace>><</link>> |
+ <<link "Normal Gestation">><<set $activeSlave.pregControl = "none">><<SlaveInteractImpreg>><</link>> |
<</if>>
<<if $activeSlave.pregControl != "slow Gestation">>
- <<link "Slow Gestation">><<set $activeSlave.pregControl = "slow gestation">><<replace "#pregControl">>slowed gestation speed<</replace>><</link>> |
+ <<link "Slow Gestation">><<set $activeSlave.pregControl = "slow gestation">><<SlaveInteractImpreg>><</link>> |
<</if>>
<<if $activeSlave.pregControl != "speed up">>
- <<link "Fast Gestation">><<set $activeSlave.pregControl = "speed up">><<replace "#pregControl">>fast gestation speed, staffed clinic recommended<</replace>><</link>>
+ <<link "Fast Gestation">><<set $activeSlave.pregControl = "speed up">><<SlaveInteractImpreg>><</link>>
<</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index 673970c0a2e414260eb5521e827c38862e8e70b7..bd8e53d38bf4c517f220938e993547973a80dbf1 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -605,6 +605,21 @@
<br>[[Summary Options]]
<br>[[Description Options]]
<br>
+<<elseif _Pass == "propagandaHub" || _Pass == "securityHQ" || _Pass == "secBarracks" || _Pass == "riotControlCenter">>
+ <br>
+ <<if $propHub == 1>>
+ <br><span id="propHub"><<link "Manage PR">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "propagandaHub">><</link>></span> @@.cyan;[Shift+H]@@
+ <</if>>
+ <<if $secHQ == 1>>
+ <br><span id="securityHQ"><<link "Manage Security">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "securityHQ">><</link>></span> @@.cyan;[Shift+S]@@
+ <</if>>
+ <<if $secBarracks == 1>>
+ <br><span id="secBarracks"><<link "Manage Military">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "secBarracks">><</link>></span> @@.cyan;[Shift+A]@@
+ <</if>>
+ <<if $riotCenter == 1>>
+ <br><span id="riotCenter"><<link "Manage Rebels">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "riotControlCenter">><</link>></span> @@.cyan;[Shift+R]@@
+ <</if>>
+ <br>
<<else>>
<br><br><br><br><br><br><br><br>
<</if>>
diff --git a/src/uncategorized/tfsFarmUpgrade.tw b/src/uncategorized/tfsFarmUpgrade.tw
index 86065aea86ef1f1663c54486422816784dd28853..d12bae78add0c01db9e2c65882c896aa90430c06 100644
--- a/src/uncategorized/tfsFarmUpgrade.tw
+++ b/src/uncategorized/tfsFarmUpgrade.tw
@@ -9,7 +9,7 @@ You receive yet another personal call from an older Futanari Sister, one of the
<<else>>
politely, "I would like to ask a favor of you on behalf of myself and my Sisters." She looks less confident than the older Sisters usually do, but steels herself and asks. "May we use your organ farm? We would like to really complete our transformations. We
<</if>>
-can pay for the costs of using it, but we have no other way of accessing such advanced technology."
+<<if $TFS.schoolUpgrade == 3 && $TFS.compromiseWeek+15 <= $week>>have a rather cheap one to grow dicks for the girls and we<</if>> can pay for the costs of using it, but we have no other way of accessing such advanced technology."
<br><br>
@@ -42,6 +42,24 @@ whether we will use contraception after we are transformed." She shudders sudden
<<set $failedElite += 275>>
<</replace>>
<</link>>
+ <<if $seeHyperPreg == 1>>
+ <br><<link "Permit them access, and encourage them to embrace hyperpregnancy.">>
+ <<replace "#result">>
+ You signify your assent, telling the Sister that the organ farm will accept seed tissue from any of them for the purpose of fabricating ovaries, so long as they are willing to bear as many children as they can handle. To your mild surprise, she responds with cutely inelegant crying. You add that you think the world needs many more Futanari Sisters, especially ones as cute and sexy as you're confident her countless daughters will be. At that, she breaks down completely, one of her hands going to rub her belly gently. It takes her a long time to manage to thank to properly, and she hurries to end the call before she can embarrass herself further.<<if $arcologies[0].FSRestartDecoration == 100>> The Societal Elite are @@.red;outraged@@ that you would not only allow such a breach of eugenics to occur, but encourage it to such an obscene degree.<</if>>
+ <<set $TFS.farmUpgrade = 3>>
+ <<set $failedElite += 1000>>
+ <</replace>>
+ <</link>>
+ <</if>>
+ /*
+ <br><<link "Decline, but grant them something more fitting">>
+ <<replace "#result">>
+ You signify your assent, telling the Sister that the organ farm will accept seed tissue from any of them for the purpose of fabricating testicular ovaries, which shou. To your mild surprise, she responds with cutely inelegant crying. You add that you think the world needs more Futanari Sisters, especially ones as cute and sexy as you're confident her many daughters will be. At that, she breaks down completely, one of her hands going to rub her balls gently. It takes her a long time to manage to thank to properly, and she hurries to end the call before she can embarrass herself further.<<if $arcologies[0].FSRestartDecoration == 100>> The Societal Elite are @@.red;outraged@@ that you would not only allow such a breach of eugenics to occur, but encourage it.<</if>>
+ <<set $TFS.farmUpgrade = 4>>
+ <<set $failedElite += 100>>
+ <</replace>>
+ <</link>>
+ */
<</if>>
<br><<link "Decline">>
<<replace "#result">>
diff --git a/src/uncategorized/theFutanariSisters.tw b/src/uncategorized/theFutanariSisters.tw
index a725478be051ce983a2e7184cf97bbc8d9bb7232..ab0d75b8f8a16871e0145c2bd50a0075022bb132 100644
--- a/src/uncategorized/theFutanariSisters.tw
+++ b/src/uncategorized/theFutanariSisters.tw
@@ -13,13 +13,24 @@ You pay a visit to the Futanari Sisters. They occupy a suite remodeled for their
<br><br>
This is a large, circular room with a shallow depression in the floor, filled with pillows and naked, fucking futas. Every possible interaction between mouths, nipples, breasts, penises, vaginas, and anuses is taking place, with most participants managing several at once. They are all very, very pretty, and it's easier to distinguish the older ones by their bigger tits, asses and cocks than by their apparent age. The older futas tend to be on top, but this is by no means the rule, and they like to switch around often.
<<if $TFS.farmUpgrade == 2>>
-<<if $TFS.farmUpgradeAsked < $week - 10>>
- <br><br>
- It's been long enough since you allowed them to use your organ farm to add ovaries to themselves and instructed them not to use contraceptives that most of them are visibly pregnant. This hasn't slowed their sexual congress at all, though. They've become much more focused on vaginal, and there's an obvious eagerness to cum inside Sisters who aren't obviously pregnant.
-<<else>>
- <br><br>
- It hasn't been long enough since you allowed them to use your organ farm to add ovaries to themselves for the effects to be obvious yet. Most of them are doubtless pregnant, however. There's been a subtle shift in their sexual behavior, too: they're much more likely to focus on vaginal sex than they were before, so much so that they often double penetrate each others' pussies. When there aren't any cunts available, they do their best to hold their orgasms until one opens up, so to speak.
-<</if>>
+ <<if $TFS.farmUpgradeAsked < $week - 10>>
+ <br><br>
+ It's been long enough since you allowed them to use your organ farm to add ovaries to themselves and instructed them not to use contraceptives that most of them are visibly pregnant. This hasn't slowed their sexual congress at all, though. They've become much more focused on vaginal, and there's an obvious eagerness to cum inside Sisters who aren't obviously pregnant.
+ <<else>>
+ <br><br>
+ It hasn't been long enough since you allowed them to use your organ farm to add ovaries to themselves for the effects to be obvious yet. Most of them are doubtless pregnant, however. There's been a subtle shift in their sexual behavior, too: they're much more likely to focus on vaginal sex than they were before, so much so that they often double penetrate each others' pussies. When there aren't any cunts available, they do their best to hold their orgasms until one opens up, so to speak.
+ <</if>>
+<<elseif $TFS.farmUpgrade == 3>>
+ <<if $TFS.farmUpgradeAsked < $week - 20>>
+ <br><br>
+ It's been long enough since you allowed them to use your organ farm to add ovaries to themselves and instructed them not to use contraceptives that most of them are extremely pregnant. This hasn't slowed their sexual congress at all, though they've had to get creative with their positioning. They've become much more focused on vaginal, and there's an obvious eagerness to cum inside Sisters who aren't obviously pregnant.
+ <<elseif $TFS.farmUpgradeAsked < $week - 10>>
+ <br><br>
+ It's been long enough since you allowed them to use your organ farm to add ovaries to themselves and instructed them not to use contraceptives that most of them are visibly pregnant. This hasn't slowed their sexual congress at all, though. They've become much more focused on vaginal, and there's an obvious eagerness to cum inside Sisters who aren't obviously pregnant.
+ <<else>>
+ <br><br>
+ It hasn't been long enough since you allowed them to use your organ farm to add ovaries to themselves for the effects to be obvious yet. Most of them are doubtless pregnant, however. There's been a subtle shift in their sexual behavior, too: they're much more likely to focus on vaginal sex than they were before, so much so that they often double penetrate each others' pussies. When there aren't any cunts available, they do their best to hold their orgasms until one opens up, so to speak.
+ <</if>>
<</if>>
<br><br>
Visitors are not common: in fact, visitors are only as frequent as you feel like visiting. It takes a while before they notice you. When a dreamy-eyed young futa finally does, she reaches a lazy hand over to alert the eldest one present by tugging on one of her nipples and pointing in your direction. The elder looks over at you and gives you a friendly wave followed by a wait-one-moment gesture. She's curled up on her back with her cockhead in her own mouth, using both hands to give her own shaft a boob job while a younger futa is eats her ass and fingers her pussy. The futa matron orgasms promptly, sucking down her own cum. She gets up languidly, her plush body, softening forearm-sized dick, and enormous natural boobs making it a wonderful sight.
@@ -73,7 +84,20 @@ Visitors are not common: in fact, visitors are only as frequent as you feel like
<<else>>
-//The Futanari Sisters use the same legalistic structures as other slave schools, but are actually very different. They're quite enigmatic, and inquiry into their cultlike methods is politely discouraged. All the Sisters own the institution together, and seem to share the goal of pursuing transformation of themselves to fit the classic futanari fetish - that is, to transform themselves into beautiful, curvaceous women with large dicks. All Sisters remain within the closed society for at least seven years. The Sisters fund themselves by selling members into slavery: interestingly, the more impressive a member is, the older she seems to be when sold; there may be a sort of selection mechanism by which the losers are sold immediately and the winners remain, leading the Sisters. This does not mean that ex-Sisters are unhappy with enslavement. On the contrary, it seems to be an expected stage of their lives, and not shameful. <<if $TFS.schoolUpgrade != 0>><br><br>Since you have supported the faction within the Sisters that favors <<if $TFS.schoolUpgrade == 1>>futas without balls, its members will now appear without visible testicles and increased submissiveness.<<else>>futa balls, its members will now appear with extremely large testicles and increased sex drives.<</if>> As a major <<if $PC.title == 0>>benefactrix<<else>>benefactor<</if>> of the institution, you also receive a discount on them.<</if>>//
+//The Futanari Sisters use the same legalistic structures as other slave schools, but are actually very different. They're quite enigmatic, and inquiry into their cultlike methods is politely discouraged. All the Sisters own the institution together, and seem to share the goal of pursuing transformation of themselves to fit the classic futanari fetish - that is, to transform themselves into beautiful, curvaceous women with large dicks. All Sisters remain within the closed society for at least seven years. The Sisters fund themselves by selling members into slavery: interestingly, the more impressive a member is, the older she seems to be when sold; there may be a sort of selection mechanism by which the losers are sold immediately and the winners remain, leading the Sisters. This does not mean that ex-Sisters are unhappy with enslavement. On the contrary, it seems to be an expected stage of their lives, and not shameful.
+<<if $TFS.schoolUpgrade != 0>>
+ <br><br>
+ Since you have supported the faction within the Sisters that favors
+ <<if $TFS.schoolUpgrade == 3>>
+ a mix of futas with and without balls; its female members will appear without balls, while its male members will appear with extremely large testicles.
+ <<if $TFS.compromiseWeek+15 > $week>>Or they will, in around (($TFS.compromiseWeek+15)-$week) weeks.<</if>>
+ <<elseif $TFS.schoolUpgrade == 1>>
+ futas without balls, its members will now appear without visible testicles and increased submissiveness.
+ <<else>>
+ futa balls, its members will now appear with extremely large testicles and increased sex drives.
+ <</if>>
+ As a major <<if $PC.title == 0>>benefactrix<<else>>benefactor<</if>> of the institution, you also receive a discount on them.
+<</if>>//
The Sisters offer a member selected for sale into slavery for inspection via video call. The feed is of an exhausted futa, fast asleep. Whatever ceremonies the Sisters perform before releasing a member into slavery, they seem to have tired her out. There are indistinct but obviously sexual sounds audible in the background; it sounds like an orgy with a very large number of participants is going on nearby.
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index f7ff2965ae717bcfe5d4eb5cf45212f117883d2f..a05ed87f3f01186845979856aec73a13081a4f1e 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -34,118 +34,6 @@
<</if>>
<</widget>>
-/%
- Call as <<SimpleSlaveSlaveFucking subslave domslave 5>> or <<SimpleSlaveSlaveFucking subslave domslave>>
- $arg[2] is how many times to increment either the Vaginal, Anal, or Oral counts, depending on availability on $arg[0].
- If left undefined it will assume it to be 1.
- Intended to be a simple "x got fucked y times by z and I don't want to keep coding it".
-%/
-<<widget "SimpleSlaveSlaveFucking">>
-<<if $args[2]>>
- <<for _miscW = 0; _miscW < $args[2]; _miscW++>>
- <<set _fuckTarget = random(1,100)>>
- <<if $args[0].nipples == "fuckable" && canPenetrate($args[1]) && _fuckTarget > 80>>
- <<if passage() == "SA serve your other slaves">>
- <<if $args[0].ID == $slaves[$i].ID>>
- <<set _mammaryUse++>>
- <<set $penetrativeTotal++, $args[1].penetrativeTotal++>>
- <<else>>
- <<set _penetrativeUse++>>
- <<set $mammaryTotal++, $args[0].mammaryCount++>>
- <</if>>
- <<else>>
- <<set $mammaryTotal++, $args[0].mammaryCount++>>
- <<set $penetrativeTotal++, $args[1].penetrativeCount++>>
- <</if>>
- <<elseif canDoVaginal($args[0]) && $args[0].vagina > 0 && canPenetrate($args[1]) && _fuckTarget > 33>>
- <<if passage() == "SA serve your other slaves">>
- <<if $args[0].ID == $slaves[$i].ID>>
- <<set _vaginalUse++>>
- <<set $penetrativeTotal++, $args[1].penetrativeCount++>>
- <<else>>
- <<set _penetrativeUse++>>
- <<set $vaginalTotal++, $args[0].vaginalCount++>>
- <</if>>
- <<else>>
- <<set $vaginalTotal++, $args[0].vaginalCount++>>
- <<set $penetrativeTotal++, $args[1].penetrativeCount++>>
- <</if>>
- <<if canImpreg($args[0], $args[1])>>
- <<= knockMeUp($args[0], 3, 0, $args[1].ID, 1)>>
- <</if>>
- <<elseif canDoAnal($args[0]) && $args[0].anus > 0 && canPenetrate($args[1]) && _fuckTarget > 10>>
- <<if canImpreg($args[0], $args[1])>>
- <<= knockMeUp($args[0], 3, 1, $args[1].ID, 1)>>
- <</if>>
- <<if passage() == "SA serve your other slaves">>
- <<if $args[0].ID == $slaves[$i].ID>>
- <<set _analUse++>>
- <<set $penetrativeTotal++, $args[1].penetrativeCount++>>
- <<else>>
- <<set _penetrativeUse++>>
- <<set $analTotal++, $args[0].analCount++>>
- <</if>>
- <<else>>
- <<set $analTotal++, $args[0].analCount++>>
- <<set $penetrativeTotal++, $args[1].penetrativeCount++>>
- <</if>>
- <<else>>
- <<set $oralTotal++, $args[0].oralCount++>>
- <</if>>
- <</for>>
-<<else>>
- <<set _fuckTarget = random(1,100)>>
- <<if $args[0].nipples == "fuckable" && canPenetrate($args[1]) && _fuckTarget > 80>>
- <<if passage() == "SA serve your other slaves">>
- <<if $args[0].ID == $slaves[$i].ID>>
- <<set _mammaryUse++>>
- <<set $penetrativeTotal++, $args[1].penetrativeTotal++>>
- <<else>>
- <<set _penetrativeUse++>>
- <<set $mammaryTotal++, $args[0].mammaryCount++>>
- <</if>>
- <<else>>
- <<set $mammaryTotal++, $args[0].mammaryCount++>>
- <<set $penetrativeTotal++, $args[1].penetrativeCount++>>
- <</if>>
- <<elseif canDoVaginal($args[0]) && $args[0].vagina > 0 && canPenetrate($args[1]) && _fuckTarget > 33>>
- <<if passage() == "SA serve your other slaves">>
- <<if $args[0].ID == $slaves[$i].ID>>
- <<set _vaginalUse++>>
- <<set $penetrativeTotal++, $args[1].penetrativeCount++>>
- <<else>>
- <<set _penetrativeUse++>>
- <<set $vaginalTotal++, $args[0].vaginalCount++>>
- <</if>>
- <<else>>
- <<set $vaginalTotal++, $args[0].vaginalCount++>>
- <<set $penetrativeTotal++, $args[1].penetrativeCount++>>
- <</if>>
- <<if canImpreg($args[0], $args[1])>>
- <<= knockMeUp($args[0], 3, 0, $args[1].ID, 1)>>
- <</if>>
- <<elseif canDoAnal($args[0]) && $args[0].anus > 0 && canPenetrate($args[1]) && _fuckTarget > 10>>
- <<if passage() == "SA serve your other slaves">>
- <<if $args[0].ID == $slaves[$i].ID>>
- <<set _analUse++>>
- <<set $penetrativeTotal++, $args[1].penetrativeCount++>>
- <<else>>
- <<set _penetrativeUse++>>
- <<set $analTotal++, $args[0].analCount++>>
- <</if>>
- <<else>>
- <<set $analTotal++, $args[0].analCount++>>
- <<set $penetrativeTotal++, $args[1].penetrativeCount++>>
- <</if>>
- <<if canImpreg($args[0], $args[1])>>
- <<= knockMeUp($args[0], 3, 1, $args[1].ID, 1)>>
- <</if>>
- <<else>>
- <<set $oralTotal++, $args[0].oralCount++>>
- <</if>>
-<</if>>
-<</widget>>
-
/%
Call as <<SimpleVaginaFuck slave 5>> or <<SimpleVaginaFuck slave>>
$arg[1] is how many times to increment either the Vaginal count.
@@ -535,26 +423,26 @@
<</if>>
<</if>>
<</if>>
-<<if ($activeSlave.pregKnown == 1) && ($pregSpeedControl == 1) && ($activeSlave.breedingMark != 1) && ($activeSlave.indentureRestrictions < 1) && ($activeSlave.broodmother == 0)>>
+<<if ($activeSlave.pregKnown == 1) && ($pregSpeedControl == 1) && ($activeSlave.breedingMark != 1) && ($activeSlave.indentureRestrictions < 1) && ($activeSlave.broodmother == 0) && $seePreg != 0>>
<br>
- __Pregnancy control__: <span id="pregControl"><<if $activeSlave.pregControl == "labor supressors">>Labor is suppressed<<elseif $activeSlave.pregControl == "slow gestation">>Slowed gestation<<elseif $activeSlave.pregControl == "speed up">>Faster gestation<<else>>Normal gestation<</if>></span>
+ __Pregnancy control__: <<if $activeSlave.pregControl == "labor supressors">>Labor is suppressed<<elseif $activeSlave.pregControl == "slow gestation">>Slowed gestation speed<<elseif $activeSlave.pregControl == "speed up">>Faster gestation speed, staffed clinic recommended<<else>>Normal gestation and birth<</if>>.
<<if ($activeSlave.preg >= 38)>>
<br>
<<if $activeSlave.pregControl == "labor supressors">>
- <<link "Normal Birth">><<set $activeSlave.pregControl = "none">><<replace "#pregControl">>natural birth<</replace>><</link>>
+ <<link "Normal Birth">><<set $activeSlave.pregControl = "none">><<SlaveInteractImpreg>><</link>>
<<else>>
- <<link "Supress Labor">><<set $activeSlave.pregControl = "labor supressors">><<replace "#pregControl">>labor will be suppressed<</replace>><</link>>
+ <<link "Supress Labor">><<set $activeSlave.pregControl = "labor supressors">><<SlaveInteractImpreg>><</link>>
<</if>>
<<elseif ($activeSlave.preg < 40)>>
<br>
<<if $activeSlave.pregControl != "none">>
- <<link "Normal Gestation">><<set $activeSlave.pregControl = "none">><<replace "#pregControl">>normal gestation speed<</replace>><</link>> |
+ <<link "Normal Gestation">><<set $activeSlave.pregControl = "none">><<SlaveInteractImpreg>><</link>> |
<</if>>
<<if $activeSlave.pregControl != "slow Gestation">>
- <<link "Slow Gestation">><<set $activeSlave.pregControl = "slow gestation">><<replace "#pregControl">>slowed gestation speed<</replace>><</link>> |
+ <<link "Slow Gestation">><<set $activeSlave.pregControl = "slow gestation">><<SlaveInteractImpreg>><</link>> |
<</if>>
<<if $activeSlave.pregControl != "speed up">>
- <<link "Fast Gestation">><<set $activeSlave.pregControl = "speed up">><<replace "#pregControl">>fast gestation speed, staffed clinic recommended<</replace>><</link>>
+ <<link "Fast Gestation">><<set $activeSlave.pregControl = "speed up">><<SlaveInteractImpreg>><</link>>
<</if>>
<</if>>
<</if>>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index e2149e49376985ed397f68f5122ab6d6895fd938..1ad45982fda0d8d688729ccde69bfbe13ab813d1 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -3492,7 +3492,11 @@
<<set $activeSlaveOneTimeMinAge = 25>>
<<set $activeSlaveOneTimeMaxAge = 29>>
<<set $one_time_age_overrides_pedo_mode = 1>>
- <<include "Generate XY Slave">>
+ <<if $TFS.schoolUpgrade == 3 && $TFS.compromiseWeek+15 <= $week>>
+ <<include "Generate New Slave">>
+ <<else>>
+ <<include "Generate XY Slave">>
+ <</if>>
<<set $activeSlave.origin = "You bought her from the enigmatic Futanari Sisters after they sold her into slavery.">>
<<set $activeSlave.career = "a Futanari Sister">>
<<set $activeSlave.faceShape = either("sensual", "exotic")>>
@@ -3501,7 +3505,15 @@
<<set $activeSlave.intelligence = -2>>
<<set $activeSlave.hips = 0>>
<<set $activeSlave.face = either(35,35,35,75,100)>>
- <<if $TFS.schoolUpgrade == 1>>
+ <<if $TFS.schoolUpgrade == 3 && $TFS.compromiseWeek+15 <= $week>>
+ <<if $activeSlave.genes == "XY">>
+ <<set $activeSlave.balls = 6>>
+ <<set $activeSlave.scrotum = $activeSlave.balls>>
+ <<else>>
+ <<set $activeSlave.balls = 1>>
+ <<set $activeSlave.scrotum = 0>>
+ <</if>>
+ <<elseif $TFS.schoolUpgrade == 1>>
<<set $activeSlave.balls = 1>>
<<set $activeSlave.scrotum = 0>>
<<elseif $TFS.schoolUpgrade == 2>>
@@ -3525,7 +3537,15 @@
<<set $activeSlave.intelligence = -1>>
<<set $activeSlave.hips = 1>>
<<set $activeSlave.face = either(35,35,35,75,100)>>
- <<if $TFS.schoolUpgrade == 1>>
+ <<if $TFS.schoolUpgrade == 3 && $TFS.compromiseWeek+15 <= $week>>
+ <<if $activeSlave.genes == "XY">>
+ <<set $activeSlave.balls = 7>>
+ <<set $activeSlave.scrotum = $activeSlave.balls>>
+ <<else>>
+ <<set $activeSlave.balls = 1>>
+ <<set $activeSlave.scrotum = 0>>
+ <</if>>
+ <<elseif $TFS.schoolUpgrade == 1>>
<<set $activeSlave.balls = 1>>
<<set $activeSlave.scrotum = 0>>
<<elseif $TFS.schoolUpgrade == 2>>
@@ -3545,7 +3565,15 @@
<<set $activeSlave.intelligence = 0>>
<<set $activeSlave.hips = 2>>
<<set $activeSlave.face = either(35,35,75,75,100)>>
- <<if $TFS.schoolUpgrade == 1>>
+ <<if $TFS.schoolUpgrade == 3 && $TFS.compromiseWeek+15 <= $week>>
+ <<if $activeSlave.genes == "XY">>
+ <<set $activeSlave.balls = 8>>
+ <<set $activeSlave.scrotum = $activeSlave.balls>>
+ <<else>>
+ <<set $activeSlave.balls = 1>>
+ <<set $activeSlave.scrotum = 0>>
+ <</if>>
+ <<elseif $TFS.schoolUpgrade == 1>>
<<set $activeSlave.balls = 1>>
<<set $activeSlave.scrotum = 0>>
<<elseif $TFS.schoolUpgrade == 2>>
@@ -3569,7 +3597,15 @@
<<set $activeSlave.intelligence = 1>>
<<set $activeSlave.hips = 2>>
<<set $activeSlave.face = either(35,75,75,100,100)>>
- <<if $TFS.schoolUpgrade == 1>>
+ <<if $TFS.schoolUpgrade == 3 && $TFS.compromiseWeek+15 <= $week>>
+ <<if $activeSlave.genes == "XY">>
+ <<set $activeSlave.balls = 9>>
+ <<set $activeSlave.scrotum = $activeSlave.balls>>
+ <<else>>
+ <<set $activeSlave.balls = 1>>
+ <<set $activeSlave.scrotum = 0>>
+ <</if>>
+ <<elseif $TFS.schoolUpgrade == 1>>
<<set $activeSlave.balls = 1>>
<<set $activeSlave.scrotum = 0>>
<<elseif $TFS.schoolUpgrade == 2>>
@@ -3593,7 +3629,15 @@
<<set $activeSlave.intelligence = 2>>
<<set $activeSlave.hips = 2>>
<<set $activeSlave.face = either(35,75,100,100,100)>>
- <<if $TFS.schoolUpgrade == 1>>
+ <<if $TFS.schoolUpgrade == 3 && $TFS.compromiseWeek+15 <= $week>>
+ <<if $activeSlave.genes == "XY">>
+ <<set $activeSlave.balls = 10>>
+ <<set $activeSlave.scrotum = $activeSlave.balls>>
+ <<else>>
+ <<set $activeSlave.balls = 1>>
+ <<set $activeSlave.scrotum = 0>>
+ <</if>>
+ <<elseif $TFS.schoolUpgrade == 1>>
<<set $activeSlave.balls = 1>>
<<set $activeSlave.scrotum = 0>>
<<elseif $TFS.schoolUpgrade == 2>>
@@ -3619,19 +3663,24 @@
<<set $activeSlave.boobs = 50*((10*_sisterAge)+random(10,20))>>
<<set $activeSlave.dick = _sisterAge+random(1,2)>>
<<if $activeSlave.foreskin > 0>><<set $activeSlave.foreskin = $activeSlave.dick>><</if>>
- <<set $activeSlave.preg = -2>>
+ <<set $activeSlave.preg = -3>>
<<if $TFS.farmUpgrade > 0>>
<<set $activeSlave.ovaries = 1>>
<<set $activeSlave.preg = -1>>
- <<if $TFS.farmUpgrade == 2>>
+ <<if $TFS.farmUpgrade >= 2>>
<<if $week - $TFS.farmUpgradeAsked < 35>>
<<set $activeSlave.preg = random(1,($week - $TFS.farmUpgradeAsked))>>
<<else>>
<<set $activeSlave.preg = random(1,40)>>
<</if>>
+ <<if $TFS.farmUpgrade == 3>>
+ <<set $activeSlave.pregType = random(20,40)>>
+ <<set $activeSlave.pregAdaptation = 500>>
+ <<else>>
+ <<set $activeSlave.pregType = 1>>
+ <</if>>
+ <<set $activeSlave.pregWeek = $activeSlave.preg>>
<</if>>
- <<set $activeSlave.pregType = 1>>
- <<set $activeSlave.pregWeek = $activeSlave.preg>>
<</if>>
<<run SetBellySize($activeSlave)>>
<<set $activeSlave.intelligenceImplant = 1>>
@@ -3645,7 +3694,9 @@
<<set $activeSlave.trust = random(60,75)>>
<<set $activeSlave.health = random(60,80)>>
<<set $activeSlave.muscles = 20>>
- <<set $activeSlave.shoulders = 1>>
+ <<if $activeSlave.genes == "XY">>
+ <<set $activeSlave.shoulders = 1>>
+ <</if>>
<<set $activeSlave.vaginalSkill = 100>>
<<set $activeSlave.oralSkill = 100>>
<<set $activeSlave.analSkill = 100>>