diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 4ade08a892c85fddf4a024cfc22afe04c5714d04..e47c942fe83a503bb66657ee59c1952962eeb7c9 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,11 +2,17 @@
0.10.7.1-1.1.x
+11/30/2018
+
+ 4
+ -added buttplug attachments to the RA
+ -fixes
+
11/29/2018
3
-more fixes
- -uncommented incubator semen donations
+ -uncommented incubator semen harvesting
11/28/2018
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index c53fb06f7cc5cab4566e4178580c5713d339f5b3..1eab24cbd759667235793ad535f11419e1ae347e 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -3032,6 +3032,7 @@ window.emptyDefaultRule = function emptyDefaultRule() {
bellyAccessory: "no default setting",
aVirginButtplug: "no default setting",
buttplug: "no default setting",
+ buttplugAttachment: "no default setting",
eyeColor: "no default setting",
makeup: "no default setting",
nails: "no default setting",
@@ -15066,6 +15067,7 @@ window.DefaultRules = (function() {
else
ProcessNonVirginButtplugs(slave, rule);
}
+ ProcessButtplugAttachments(slave, rule); // contains a clear condition for no buttplug
}
function ProcessAnalVirginButtplugs(slave, rule) {
@@ -15182,6 +15184,27 @@ window.DefaultRules = (function() {
}
}
+ function ProcessButtplugAttachments(slave, rule) {
+ // apply buttplug accessories to slaves
+ if (slave.buttplug === "none" && slave.buttplugAttachment !== "none") {
+ slave.buttplugAttachment = "none"; //clears buttplug attachments when buttplugs are removed above
+ } else if ((rule.buttplugAttachment !== undefined) && (rule.buttplugAttachment !== "no default setting")) {
+ if ((slave.buttplugAttachment !== rule.buttplugAttachment)) {
+ slave.buttplugAttachment = rule.buttplugAttachment;
+ switch (slave.buttplugAttachment) {
+
+ case "none":
+ r += `<br>${slave.slaveName} has been instructed not to use an attachment for her anal accessory.`;
+ break;
+
+ default:
+ r += `<br>${slave.slaveName} has been given a slave.buttplugAttachment to attach to her buttplug.`;
+ break;
+ }
+ }
+ }
+ }
+
function ProcessBellyImplant(slave, rule) {
// Here is belly implant size control, it's used in Surgery Degradation passage to setup devotion and trust changes.
// silent calls to surgery degradation have been replaced with a js function, which is less hacky
@@ -17674,6 +17697,7 @@ window.rulesAssistantOptions = (function() {
}
this.appendChild(new ButtplugsVirginsList());
this.appendChild(new ButtplugsOtherList());
+ this.appendChild(new ButtplugAttachmentsList());
this.appendChild(new ImplantVolumeList());
}
@@ -18127,6 +18151,21 @@ window.rulesAssistantOptions = (function() {
}
}
+ class ButtplugAttachmentsList extends List {
+ constructor() {
+ const accs = [];
+ setup.buttplugAttachments.forEach(acc => {
+ if (acc.fs === undefined && acc.rs === undefined)
+ accs.push([acc.name, acc.value]);
+ else if (acc.rs === "buyTails" && V.toysBoughtButtPlugTails === 1)
+ accs.push([acc.name + " (Purchased)", acc.value]);
+ });
+ super("Buttplug attachments for slaves with buttplugs", accs);
+ this.setValue(current_rule.set.buttplugAttachment);
+ this.onchange = (value) => current_rule.set.buttplugAttachment = value;
+ }
+ }
+
class ImplantVolumeList extends List {
constructor() {
const pairs = [
@@ -18670,7 +18709,8 @@ window.rulesAssistantOptions = (function() {
["Permissive", "permissive"],
["Sapphic", "sapphic"],
["Masturbation", "masturbation"],
- ["Restrictive", "restrictive"]
+ ["Restrictive", "restrictive"],
+ ["Chastity", "chastity"]
];
super("Release rules", pairs);
this.setValue(current_rule.set.releaseRules);
diff --git a/src/art/assistantArt.tw b/src/art/assistantArt.tw
index 516de1971da39c8e56f476315e23ec13f7ea0327..511da7a1d5aa2fe1ee03d4b0018a416d90118220 100644
--- a/src/art/assistantArt.tw
+++ b/src/art/assistantArt.tw
@@ -119,12 +119,14 @@ window.assistantArt = function assistantArt(sizePlacement) {
}
}
- if (sizePlacement === 3) {
- fileName = `<img src=${fileName} style='float:right; border:3px hidden'/>`;
- } else if (V.imageChoice === 1) {
- fileName = `<img src=${fileName} style='float:right; border:3px hidden' width='282' height='602'/>`;
- } else /* V.imageChoice === 0 */ {
- fileName = `<img src=${fileName} style='float:right; border:3px hidden' width='300' height='300'/>`;
+ if (filename !== "") {
+ if (sizePlacement === 3) {
+ fileName = `<img src=${fileName} style='float:right; border:3px hidden'/>`;
+ } else if (V.imageChoice === 1) {
+ fileName = `<img src=${fileName} style='float:right; border:3px hidden' width='282' height='602'/>`;
+ } else /* V.imageChoice === 0 */ {
+ fileName = `<img src=${fileName} style='float:right; border:3px hidden' width='300' height='300'/>`;
+ }
}
}
return fileName;
diff --git a/src/facilities/brothel/brothelAssignmentScene.tw b/src/facilities/brothel/brothelAssignmentScene.tw
index 9981f414e4d6029f9635f2d45d9c64ecc720db39..679fdcdd13500b0d023d02f240766a222dc029d7 100644
--- a/src/facilities/brothel/brothelAssignmentScene.tw
+++ b/src/facilities/brothel/brothelAssignmentScene.tw
@@ -23,170 +23,344 @@ You tell $him $he's to report to <<if $Madam != 0>>$Madam.slaveName immediately,
<br><br>
<<if $activeSlave.devotion > 50>>
-<<if ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetish != "none")>>
- $He looks excited. "<<Master>>, I hoped you would <<s>>end me down there <<s>>ometime!
- <<switch $activeSlave.fetish>>
- <<case "submissive">>
- I mean, I'll have to do whatever the cu<<s>>tomer<<s>> pay for, right?" $His eyes go a little unfocused. "And, they'll hold me down..." $He trails off.
- <<case "masochist">>
- I mean, it'<<s>> hard being a brothel whore, right? And when I get tired or <<s>>ore, I'll <<s>>till be <<s>>old. Even when it hurt<<s>> me to fuck any more." $His eyes glow with an unhealthy light.
- <<case "cumslut">>
- I mean," $he licks $his lips unconsciously,
- <<if $activeSlave.attrXX > $activeSlave.attrXY>>
- "I hear there are <<s>>ome ni<<c>>e ladie<<s>> that go there for lunchtime cunnilingu<<s>>."
+ <<if ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetish != "none")>>
+ $He looks excited.
+ <<if canTalk($activeSlave)>>
+ "<<Master>>, I hoped you would <<s>>end me down there <<s>>ometime!<</if>>
+ <<switch $activeSlave.fetish>>
+ <<case "submissive">>
+ I mean, I'll have to do whatever the cu<<s>>tomer<<s>> pay for, right?" $His eyes go a little unfocused. "And, they'll hold me down..." $He trails off.
+ <<case "masochist">>
+ I mean, it'<<s>> hard being a brothel whore, right? And when I get tired or <<s>>ore, I'll <<s>>till be <<s>>old. Even when it hurt<<s>> me to fuck any more." $His eyes glow with an unhealthy light.
+ <<case "cumslut">>
+ I mean," $he licks $his lips unconsciously,
+ <<if $activeSlave.attrXX > $activeSlave.attrXY>>
+ "I hear there are <<s>>ome ni<<c>>e ladie<<s>> that go there for lunchtime cunnilingu<<s>>."
+ <<else>>
+ "the blowjob<<s>>. Ju<<s>>t, the blowjob<<s>>. That'<<s>> all."
+ <</if>>
+ <<case "humiliation">>
+ There'<<s>> a window that fa<<c>>e<<s>> the hallway there, right? <<if $Madam != 0>>Do you think $Madam.slaveName would let me<<else>>Could I<</if>> get fucked there? Where everyone could <<s>>ee me being fucked for money?"
+ <<case "buttslut">>
+ I mean," and $he shifts $his weight, $his mind obviously on $his backdoor,
+ <<if $activeSlave.attrXX > $activeSlave.attrXY>>
+ "there have to be ladie<<s>> who want to buttfuck a whore, right? At lea<<s>>t, I really hope there are."
+ <<else>>
+ "the other girl<<s>> tell me that whore<<s>> there get fucked up the a<<ss>> all day and all night. <<S>>ounds like fun to me."
+ <</if>>
+ <<case "boobs">>
+ I mean," and $he sticks out $his chest a little,
+ <<if $activeSlave.attrXX > $activeSlave.attrXY>>
+ "I hear from the other girl<<s>> there'<<s>> thi<<s>> ni<<c>>e lady who goe<<s>> there every morning and pay<<s>> to have a whore <<s>>uck her nipple<<s>> for, like, an hour. I," $he licks $his lips, "could do that."
+ <<else>>
+ "the other girl<<s>> tell me that whore<<s>> there get tittyfucked all the time. <<s>>ound<<s>> like fun to me."
+ <</if>>
+ <<case "pregnancy">>
+ I mean," $he says meditatively,
+ <<if $activeSlave.attrXX > $activeSlave.attrXY>>
+ "I hear from the other girl<<s>> there'<<s>> thi<<s>> pregnant lady who goe<<s>> there every night and pay<<s>> to have a whore cuddle her. Ju<<s>>t cuddle, all night. That would be kind of hard, ju<<s>>t cuddling, but I could do it."
+ <<elseif $activeSlave.vagina == -1>>
+ "<<s>>ince it'<<s>> all bareback, I'm going to have a fuckton of cum in me. I wonder how much cum it take<<s>> to get a butthole pregnant? I'm gonna try, anyway."
+ <<elseif isFertile($activeSlave)>>
+ "<<s>>ince it'<<s>> all bareback, I'm going to have a fuckton of cum in me. I wonder how much cum it would take to get my poor womb pregnant?"
+ <<elseif $activeSlave.pregKnown == 1>>
+ "I'm going to be a pregnant whore. That'<<s>> pretty fucking <<s>>e<<x>>y."
+ <<elseif $activeSlave.preg > 0>>
+ "<<s>>ince it'<<s>> all bareback, I'm going to have a fuckton of cum in me. I wonder how much cum it would take to get my poor womb pregnant?"
+ <<elseif $activeSlave.ovaries == 1 && $activeSlave.pubertyXX == 0>>
+ "I can't wait till I can get pregnant. That'd be pretty fucking <<s>>e<<x>>y."
+ <<else>>
+ "I hear from the other girl<<s>> there'<<s>> thi<<s>> pregnant lady who goe<<s>> there every night and pay<<s>> to have a whore cuddle her. Ju<<s>>t cuddle, all night. That would be kind of hard, ju<<s>>t cuddling, but I could do it."
+ <</if>>
+ <<case "dom">>
+ I heard from the other girl<<s>> that <<s>>ome <<c>>iti<<z>>en<<s>> bring their girl<<s>> there. Ju<<s>>t to make them take it from a whore."
+ <<case "sadist">>
+ I heard from the other girl<<s>> that <<s>>ome <<c>>iti<<z>>en<<s>> bring their girl<<s>> there. Becau<<s>>e nobody know<<s>> how to hurt a bitch like a whore doe<<s>>." $He shivers.
+ <</switch>>
<<else>>
- "the blowjob<<s>>. Ju<<s>>t, the blowjob<<s>>. That'<<s>> all."
+ <<switch $activeSlave.fetish>>
+ <<case "submissive">>
+ $He gestures that $he'll be at the mercy of $his customers. $His eyes go a little unfocused as $he clearly begins to fantasize.
+ <<case "masochist">>
+ $He gestures that $he'll probably get roughed up by some of $his customers and that there will be no breaks for $his sore holes. $His eyes glow with an unhealthy light as $he clearly begins to fantasize.
+ <<case "cumslut">>
+ $He licks $his lips unconsciously and motions
+ <<if $activeSlave.attrXX > $activeSlave.attrXY>>
+ tounging a clit.
+ <<else>>
+ sucking cock.
+ <</if>>
+ <<case "humiliation">>
+ $He gestures if $he could be fucked in public there.
+ <<case "buttslut">>
+ $He shifts $his weight, $his mind obviously on $his backdoor, and gestures
+ <<if $activeSlave.attrXX > $activeSlave.attrXY>>
+ if any girls would want to buttfuck $him.
+ <<else>>
+ that $he knows whores take it up the ass there and can't wait to join them.
+ <</if>>
+ <<case "boobs">>
+ $He sticks out $his chest a little and gestures
+ <<if $activeSlave.attrXX > $activeSlave.attrXY>>
+ that $he's heard a women comes by each day just to have her nipples sucked. $He licks $his lips, clearly savoring the thought.
+ <<else>>
+ that $he knows tittyfucking is popular there and can't wait to give $his pair up for sale.
+ <</if>>
+ <<case "pregnancy">>
+ $He gestures
+ <<if $activeSlave.attrXX > $activeSlave.attrXY>>
+ that $he's heard that a pregnant women has been coming every night to pay for a whore to cuddle her. $He asks if $he could be that $girl.
+ <<elseif $activeSlave.vagina == -1>>
+ how much $he wishes $he could get pregnant from all the cum loads $he's going to get shot up $his rear.
+ <<elseif isFertile($activeSlave)>>
+ that $he knows all the sex is bareback. By the look in $his eyes, you can tell $he is wondering how long it will take for some guys seed to take root in $him.
+ <<elseif $activeSlave.pregKnown == 1>>
+ how sexy $he thinks pregnant whores are.
+ <<elseif $activeSlave.preg > 0>>
+ that $he knows all the sex is bareback. By the look in $his eyes, you can tell $he is wondering how long it will take for some guys seed to take root in $him.
+ <<elseif $activeSlave.ovaries == 1 && $activeSlave.pubertyXX == 0>>
+ how excited $he is for the day $he starts $his menstrual cycle. Will $he even see $his first period, or will every egg $he makes get fertilized?
+ <<else>>
+ that $he's heard a pregnant women has been coming every night to pay for a whore to cuddle her. $He hopes that one day $he'll be chosen.
+ <</if>>
+ <<case "dom">>
+ $He gestures that $he knows citizens sometimes bring their toys there just to let them get pushed around by a whore. $He'd like that to be true. A lot.
+ <<case "sadist">>
+ $He gestures that $he knows citizens sometimes bring their toys there for punishment. $He shivers with anticipation.
+ <</switch>>
<</if>>
- <<case "humiliation">>
- There'<<s>> a window that fa<<c>>e<<s>> the hallway there, right? <<if $Madam != 0>>Do you think $Madam.slaveName would let me<<else>>Could I<</if>> get fucked there? Where everyone could <<s>>ee me being fucked for money?"
- <<case "buttslut">>
- I mean," and $he shifts $his weight, $his mind obviously on $his backdoor,
- <<if $activeSlave.attrXX > $activeSlave.attrXY>>
- "there have to be ladie<<s>> who want to buttfuck a whore, right? At lea<<s>>t, I really hope there are."
+ <<else>>
+ $He looks
+ <<if canTalk($activeSlave)>>
+ determined. "<<Master>>, I will do my be<<s>>t to be a good whore, and get lot<<s>> of <<c>>iti<<z>>en<<s>> to pay good money for my body."
<<else>>
- "the other girl<<s>> tell me that whore<<s>> there get fucked up the a<<ss>> all day and all night. <<S>>ounds like fun to me."
+ determined and gestures that $he'll do $his best to get lots of citizens to pay to use $him.
<</if>>
- <<case "boobs">>
- I mean," and $he sticks out $his chest a little,
- <<if $activeSlave.attrXX > $activeSlave.attrXY>>
- "I hear from the other girl<<s>> there'<<s>> thi<<s>> ni<<c>>e lady who goe<<s>> there every morning and pay<<s>> to have a whore <<s>>uck her nipple<<s>> for, like, an hour. I," $he licks $his lips, "could do that."
- <<else>>
- "the other girl<<s>> tell me that whore<<s>> there get tittyfucked all the time. <<s>>ound<<s>> like fun to me."
- <</if>>
- <<case "pregnancy">>
- I mean," $he says meditatively,
- <<if $activeSlave.attrXX > $activeSlave.attrXY>>
- "I hear from the other girl<<s>> there'<<s>> thi<<s>> pregnant lady who goe<<s>> there every night and pay<<s>> to have a whore cuddle her. Ju<<s>>t cuddle, all night. That would be kind of hard, ju<<s>>t cuddling, but I could do it."
- <<elseif $activeSlave.vagina == -1>>
- "<<s>>ince it'<<s>> all bareback, I'm going to have a fuckton of cum in me. I wonder how much cum it take<<s>> to get a butthole pregnant? I'm gonna try, anyway."
- <<elseif isFertile($activeSlave)>>
- "<<s>>ince it'<<s>> all bareback, I'm going to have a fuckton of cum in me. I wonder how much cum it would take to get my poor womb pregnant?"
- <<elseif $activeSlave.pregKnown == 1>>
- "I'm going to be a pregnant whore. That'<<s>> pretty fucking <<s>>e<<x>>y."
- <<elseif $activeSlave.preg > 0>>
- "<<s>>ince it'<<s>> all bareback, I'm going to have a fuckton of cum in me. I wonder how much cum it would take to get my poor womb pregnant?"
- <<elseif $activeSlave.ovaries == 1 && $activeSlave.pubertyXX == 0>>
- "I can't wait till I can get pregnant. That'd be pretty fucking <<s>>e<<x>>y."
- <<else>>
- "I hear from the other girl<<s>> there'<<s>> thi<<s>> pregnant lady who goe<<s>> there every night and pay<<s>> to have a whore cuddle her. Ju<<s>>t cuddle, all night. That would be kind of hard, ju<<s>>t cuddling, but I could do it."
- <</if>>
- <<case "dom">>
- I heard from the other girl<<s>> that <<s>>ome <<c>>iti<<z>>en<<s>> bring their girl<<s>> there. Ju<<s>>t to make them take it from a whore."
- <<case "sadist">>
- I heard from the other girl<<s>> that <<s>>ome <<c>>iti<<z>>en<<s>> bring their girl<<s>> there. Becau<<s>>e nobody know<<s>> how to hurt a bitch like a whore doe<<s>>." $He shivers.
- <</switch>>
-<<else>>
- $He looks determined. "<<Master>>, I will do my be<<s>>t to be a good whore, and get lot<<s>> of <<c>>iti<<z>>en<<s>> to pay good money for my body."
-<</if>>
+ <</if>>
<<elseif ($activeSlave.devotion > 20) || (($activeSlave.devotion >= -20) && ($activeSlave.trust < -20) && ($activeSlave.trust >= -50))>>
-
-<<if ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetish != "none")>>
- $He looks cautiously excited. "<<Master>>,
- <<switch $activeSlave.fetish>>
- <<case "submissive">>
- I'll have to do whatever the cu<<s>>tomer<<s>> pay for, right?" $His eyes go a little unfocused. "And, they'll hold me down..." $He trails off.
- <<case "masochist">>
- it'<<s>> hard being a brothel whore, right? And when I get tired or <<s>>ore, I'll <<s>>till be <<s>>old. Even when it hurt<<s>> me to fuck any more." $His eyes glow with an unhealthy light.
- <<case "cumslut">>
- <<if $activeSlave.attrXX > $activeSlave.attrXY>>
- "I hear there are <<s>>ome ni<<c>>e ladie<<s>> that go there for lunchtime cunnilingu<<s>>."
+ <<if canTalk($activeSlave)>>
+ <<if ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetish != "none")>>
+ $He looks cautiously excited. "<<Master>>,
+ <<switch $activeSlave.fetish>>
+ <<case "submissive">>
+ I'll have to do whatever the cu<<s>>tomer<<s>> pay for, right?" $His eyes go a little unfocused. "And, they'll hold me down..." $He trails off.
+ <<case "masochist">>
+ it'<<s>> hard being a brothel whore, right? And when I get tired or <<s>>ore, I'll <<s>>till be <<s>>old. Even when it hurt<<s>> me to fuck any more." $His eyes glow with an unhealthy light.
+ <<case "cumslut">>
+ <<if $activeSlave.attrXX > $activeSlave.attrXY>>
+ "I hear there are <<s>>ome ni<<c>>e ladie<<s>> that go there for lunchtime cunnilingu<<s>>."
+ <<else>>
+ "the blowjob<<s>>. Ju<<s>>t, the blowjob<<s>>. That'<<s>> all."
+ <</if>>
+ <<case "humiliation">>
+ there'<<s>> a window that fa<<c>>e<<s>> the hallway there, right? <<if $Madam != 0>>Do you think $Madam.slaveName would let me<<else>>Could I<</if>> get fucked there? Where everyone could <<s>>ee me being fucked for money?"
+ <<case "buttslut">>
+
+ uh," and $he shifts $his weight, $his mind obviously on $his backdoor,
+ <<if $activeSlave.attrXX > $activeSlave.attrXY>>
+ "there have to be ladie<<s>> who want to buttfuck a whore, right? At lea<<s>>t, I really hope there are."
+ <<else>>
+ "the other girl<<s>> tell me that whore<<s>> there get fucked up the a<<ss>> all day and all night. <<s>>ounds like fun to me."
+ <</if>>
+ <<case "boobs">>
+ $He sticks out $his chest a little and gestures
+ <<if $activeSlave.attrXX > $activeSlave.attrXY>>
+ that $he's heard a women comes by each day just to have her nipples sucked. $He licks $his lips, clearly savoring the thought.
+ <<else>>
+ that $he knows tittyfucking is popular there and can't wait to give $his pair up for sale.
+ <</if>>
+ <<case "pregnancy">>
+ <<if $activeSlave.attrXX > $activeSlave.attrXY>>
+ I hear from the other girl<<s>> there'<<s>> thi<<s>> pregnant lady who goe<<s>> there every night and pay<<s>> to have a whore cuddle her. Ju<<s>>t cuddle, all night. That would be kind of hard, ju<<s>>t cuddling, but I could do it."
+ <<elseif $activeSlave.vagina == -1>>
+ <<s>>ince it'<<s>> all bareback, I'm going to have a fuckton of cum in me. I wonder how much cum it take<<s>> to get a butthole pregnant? I'm gonna try, anyway."
+ <<elseif isFertile($activeSlave)>>
+ <<s>>ince it'<<s>> all bareback, I'm going to have a fuckton of cum in me. I wonder how much cum it would take to get my poor womb pregnant?"
+ <<elseif $activeSlave.pregKnown == 1>>
+ "I'm going to be a pregnant whore. That'<<s>> pretty fucking <<s>>e<<x>>y."
+ <<elseif $activeSlave.preg > 0>>
+ "<<s>>ince it'<<s>> all bareback, I'm going to have a fuckton of cum in me. I wonder how much cum it would take to get my poor womb pregnant?"
+ <<elseif $activeSlave.ovaries == 1 && $activeSlave.pubertyXX == 0>>
+ "I can't wait till I can get pregnant. That'd be pretty fucking <<s>>e<<x>>y."
+ <<else>>
+ "I hear from the other girl<<s>> there'<<s>> thi<<s>> pregnant lady who goe<<s>> there every night and pay<<s>> to have a whore cuddle her. Ju<<s>>t cuddle, all night. That would be kind of hard, ju<<s>>t cuddling, but I could do it."
+ <</if>>
+ <<case "dom">>
+ I heard from the other girl<<s>> that <<s>>ome <<c>>iti<<z>>en<<s>> bring their girl<<s>> there. Ju<<s>>t to make them take it from a whore."
+ <<case "sadist">>
+ I heard from the other girl<<s>> that <<s>>ome <<c>>iti<<z>>en<<s>> bring their girl<<s>> there. Becau<<s>>e nobody know<<s>> how to hurt a bitch like a whore doe<<s>>." $He shivers.
+ <</switch>>
+ <<elseif $activeSlave.sexualFlaw != "none">>
+ "Ye<<s>>, <<Master>>," $he says obediently. $He hesitates, looking concerned.
+ <<switch $activeSlave.sexualFlaw>>
+ <<case "hates oral">>
+ "I - I'm going to h-have to <<s>>uck a lot of dick there, aren't I." $He swallows nervously. $His lower lip quivers, and $he does $his best not to cry in front of you.
+ <<case "hates anal">>
+ "C-cu<<s>>tomer<<s>> are really going to ream me up the butt hole, aren't they." $He <<if $activeSlave.amp == 1>>shifts uncomfortably, unconsciously trying to shield $his rear as best $he can manage without limbs.<<else>>unconsciously reaches around behind $himself, not quite shielding $his anus with $his hands.<</if>> $His lower lip quivers, and $he does $his best not to cry in front of you.
+ <<case "hates penetration">>
+ "C-cu<<s>>tomer<<s>> are really going to fuck me <<s>>ore, aren't they." $He <<if $activeSlave.amp == 1>>shifts uncomfortably, unconsciously trying to shield $his rear as best $he can manage without limbs.<<elseif $activeSlave.vagina > 0>>unconsciously lets $his hands fall to $his crotch, but catches $himself and doesn't quite shield $his pussy.<<else>>unconsciously reaches around behind $himself, not quite shielding $his anus with $his hands.<</if>> $His lower lip quivers, and $he does $his best not to cry in front of you.
+ <<case "repressed">>
+ "Being a whore i<<s>> a <<s>>in," $he <<say>>s quietly, half to $himself. "I'm going t-to b-be <<s>>o dirty. I'm going to h-hell." $He starts to cry quietly. "<<S>>-<<s>>orry, <<Master>>. I'll do my be<<s>>t."
+ <<case "idealistic">>
+ "I'm going to be <<s>>old for <<s>>e<<x>>," $he <<say>>s quietly, half to $himself. "Men are going to pay, and then they're g-going to <<s>>tick their dick<<s>> in me, and then they're going to leave." $He starts to cry quietly. "<<S>>-<<s>>orry, <<Master>>. I'll do my be<<s>>t."
+ <<case "shamefast">>
+ "I'm going to be meat in a brothel," $he <<say>>s quietly, half to $himself. "I'm going to <<s>>tand there naked with the other girl<<s>>, and men will pick me and then u<<s>>e my body. Over and over." $He starts to cry quietly. "<<S>>-<<s>>orry, <<Master>>. I'll do my be<<s>>t."
+ <<case "apathetic">>
+ "I gue<<ss>> I'll lie there," $he sighs quietly, half to $himself. "A man will pay and then he'll come in to my room where I'm lying on the bed, and he'll <<s>>tick his cock in me and cum and leave. And then the next man will come in." $He starts to cry quietly. "<<S>>-<<s>>orry, <<Master>>. I'll do my be<<s>>t."
+ <<case "crude">>
+ "Okay," $he <<say>>s, thinking. "My poor cornhole i<<s>> going to be <<s>>uch a <<s>>eminal <<s>>ewer." $He looks doubtful. "<<Sh>>ould I not have <<s>>aid that, <<Master>>?"
+ <<case "judgemental">>
+ "Gro<<ss>>," $he <<say>>s curtly. "Well, no more hand<<s>>ome boy<<s>> for me, then. Fat pathetic guy<<s>> who patroni<<z>>e whore<<s>>, all the way down. Fuck."
+ <</switch>>
<<else>>
- "the blowjob<<s>>. Ju<<s>>t, the blowjob<<s>>. That'<<s>> all."
+ $He tries to be brave. "<<Master>>, I will do my be<<s>>t to be a good whore." Then, half to $himself, $he adds in a small voice, "I can do thi<<s>>."
<</if>>
- <<case "humiliation">>
- there'<<s>> a window that fa<<c>>e<<s>> the hallway there, right? <<if $Madam != 0>>Do you think $Madam.slaveName would let me<<else>>Could I<</if>> get fucked there? Where everyone could <<s>>ee me being fucked for money?"
- <<case "buttslut">>
- uh," and $he shifts $his weight, $his mind obviously on $his backdoor,
- <<if $activeSlave.attrXX > $activeSlave.attrXY>>
- "there have to be ladie<<s>> who want to buttfuck a whore, right? At lea<<s>>t, I really hope there are."
+ <<else>>
+ <<if ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetish != "none")>>
+ $He looks cautiously excited.
+ <<switch $activeSlave.fetish>>
+ <<case "submissive">>
+ $His eyes go a little unfocused before $he snaps back to attention and gestures that $he'll have to do whatever they want. $His attention wavers once more.
+ <<case "masochist">>
+ $He gestures if brothel whores get breaks when they get sore. Before you can tell $him no, $his eyes glow with an unhealthy light and $he expresses that $he'd like it more if it hurt.
+ <<case "cumslut">>
+ <<if $activeSlave.attrXX > $activeSlave.attrXY>>
+ $He gestures that $he heard a rumor that some ladies swing by during lunchtime for a quick eating out.
+ <<else>>
+ As drool starts to leak from $his mouth, it's pretty obvious $he can't wait to start sucking.
+ <</if>>
+ <<case "humiliation">>
+ $He asks if there is a window that $he could be stationed in for all to see.
+ <<case "buttslut">>
+ $He shifts $his weight, $his mind obviously on $his backdoor, and gestures
+ <<if $activeSlave.attrXX > $activeSlave.attrXY>>
+ if any girls would want to buttfuck $him.
+ <<else>>
+ that $he knows whores take it up the ass there and can't wait to join them.
+ <</if>>
+ <<case "boobs">>
+ er," and $he sticks out $his chest a little,
+ <<if $activeSlave.attrXX > $activeSlave.attrXY>>
+ "I hear from the other girl<<s>> there'<<s>> thi<<s>> ni<<c>>e lady who goe<<s>> there every morning and pay<<s>> to have a whore <<s>>uck her nipple<<s>> for, like, an hour. I," $he licks $his lips, "could do that."
+ <<else>>
+ "the other girl<<s>> tell me that whore<<s>> there get tittyfucked all the time. <<s>>ound<<s>> like fun to me."
+ <</if>>
+ <<case "pregnancy">>
+ $He gestures
+ <<if $activeSlave.attrXX > $activeSlave.attrXY>>
+ that $he's heard that a pregnant women has been coming every night to pay for a whore to cuddle her. $He asks if $he could be that $girl.
+ <<elseif $activeSlave.vagina == -1>>
+ how much $he wishes $he could get pregnant from all the cum loads $he's going to get shot up $his rear.
+ <<elseif isFertile($activeSlave)>>
+ that $he knows all the sex is bareback. By the look in $his eyes, you can tell $he is wondering how long it will take for some guys seed to take root in $him.
+ <<elseif $activeSlave.pregKnown == 1>>
+ how sexy $he thinks pregnant whores are.
+ <<elseif $activeSlave.preg > 0>>
+ that $he knows all the sex is bareback. By the look in $his eyes, you can tell $he is wondering how long it will take for some guys seed to take root in $him.
+ <<elseif $activeSlave.ovaries == 1 && $activeSlave.pubertyXX == 0>>
+ how excited $he is for the day $he starts $his menstrual cycle. Will $he even see $his first period, or will every egg $he makes get fertilized?
+ <<else>>
+ that $he's heard a pregnant women has been coming every night to pay for a whore to cuddle her. $He hopes that one day $he'll be chosen.
+ <</if>>
+ <<case "dom">>
+ $He gestures that $he knows citizens sometimes bring their toys there just to let them get pushed around by a whore. $He'd like that to be true. A lot.
+ <<case "sadist">>
+ $He gestures that $he knows citizens sometimes bring their toys there for punishment. $He shivers with anticipation.
+ <</switch>>
+ <<elseif $activeSlave.sexualFlaw != "none">>
+ $He nods obediently before hesitating with a concerned look on $his face.
+ <<switch $activeSlave.sexualFlaw>>
+ <<case "hates oral">>
+ $He slowly gestures if blowjobs are popular there while swallowing nervously. $His lower lip starts to quiver, and $he does $his best not to cry in front of you.
+ <<case "hates anal">>
+ $He slowly gestures if anal is popular there and <<if $activeSlave.amp == 1>>shifts uncomfortably, unconsciously trying to shield $his rear as best $he can manage without limbs.<<else>>unconsciously reaches around behind $himself, not quite shielding $his anus with $his hands.<</if>> $His lower lip quivers, and $he does $his best not to cry in front of you.
+ <<case "hates penetration">>
+ $He slowly gestures that he understands that customers will expect to fuck $him and <<if $activeSlave.amp == 1>>shifts uncomfortably, unconsciously trying to shield $his rear as best $he can manage without limbs.<<elseif $activeSlave.vagina > 0>>unconsciously lets $his hands fall to $his crotch, but catches $himself and doesn't quite shield $his pussy.<<else>>unconsciously reaches around behind $himself, not quite shielding $his anus with $his hands.<</if>> $His lower lip quivers, and $he does $his best not to cry in front of you.
+ <<case "repressed">>
+ $He shakely gestures that $he'll be a sinner, but if that's what you want, $he'll do it. $He starts to cry quietly.
+ <<case "idealistic">>
+ $He shakely gestures that $he'll do $his best to please any men that use $him. $He starts to cry quietly.
+ <<case "shamefast">>
+ $He shakely gestures that $he'll do $his best to use $his naked body to attract men and entice passersby. $He starts to cry quietly.
+ <<case "apathetic">>
+ $He shakely gestures that $he'll do $his best to take cock. $He starts to cry quietly.
+ <<case "crude">>
+ $He gestures that $his body is going to become so foul after a day's worth of fucks. $He pauses for a moment, doubtful over whether $he should have said that or not.
+ <<case "judgemental">>
+ $He gestures $his disapointment that only the most pathetic of losers will be fucking $him now. $He pauses for a moment, doubtful over whether $he should have said that or not.
+ <</switch>>
<<else>>
- "the other girl<<s>> tell me that whore<<s>> there get fucked up the a<<ss>> all day and all night. <<s>>ounds like fun to me."
+ $He puts on a brave face and gestures that $he'll do $his best. As you send $him off, you catch sight of $him trying to reassure $himself.
<</if>>
- <<case "boobs">>
- er," and $he sticks out $his chest a little,
- <<if $activeSlave.attrXX > $activeSlave.attrXY>>
- "I hear from the other girl<<s>> there'<<s>> thi<<s>> ni<<c>>e lady who goe<<s>> there every morning and pay<<s>> to have a whore <<s>>uck her nipple<<s>> for, like, an hour. I," $he licks $his lips, "could do that."
+ <</if>>
+
+<<elseif ($activeSlave.trust < -20)>>
+
+ <<if canTalk($activeSlave)>>
+ <<if $activeSlave.sexualFlaw != "none">>
+ "Yes, <<Master>>," $he says automatically. $He's badly frightened, and says in a small voice, half to $himself,
+ <<switch $activeSlave.sexualFlaw>>
+ <<case "hates oral">>
+ "I - I'm going to h-have to <<s>>uck a lot of dick, aren't I." $He swallows and tries to control $himself out of fear, but finally gasps out, "Oh God, I'm <<s>>cared," and bursts into tears.
+ <<case "hates anal">>
+ "C-cu<<s>>tomer<<s>> are really going to ream me up the butt hole, aren't they." $He <<if $activeSlave.amp == 1>>shifts uncomfortably, unconsciously trying to shield $his rear as best $he can manage without limbs.<<else>>unconsciously reaches around behind $himself, not quite shielding $his anus with $his hands.<</if>> $His lower lip quivers and $he tries to control $himself out of fear, but finally gasps out, "Oh God, I'm <<s>>cared," and bursts into tears.
+ <<case "hates penetration">>
+ "C-cu<<s>>tomer<<s>> are really going to fuck me <<s>>ore, aren't they." $He <<if $activeSlave.amp == 1>>shifts uncomfortably, unconsciously trying to shield $his rear as best $he can manage without limbs.<<elseif $activeSlave.vagina > 0>>unconsciously lets $his hands fall to $his crotch, but catches $himself and doesn't quite shield $his pussy.<<else>>unconsciously reaches around behind $himself, not quite shielding $his anus with $his hands.<</if>> $His lower lip quivers, and $he tries to control $himself out of fear, but finally gasps out, "Oh God, I'm <<s>>cared," and bursts into tears.
+ <<case "repressed">>
+ "Being a whore i<<s>> a <<s>>in," $he <<say>>s quietly, half to $himself. "I'm going t-to b-be <<s>>o dirty. I'm going to h-hell." $He starts to cry quietly. $He tries to get $himself back under control, out of fear, but finally wails, "Oh God, I'm <<s>>orry, p-plea<<s>>e forgive me God," and dissolves into sobbing.
+ <<case "idealistic">>
+ "I'm going to be <<s>>old for <<s>>e<<x>>," $he <<say>>s quietly, half to $himself. "Men are going to pay, and then they're g-going to <<s>>tick their dick<<s>> in me, and then they're going to leave." $He starts to cry openly. "<<S>>-<<s>>orry, <<Master>>. P-plea<<s>>se don't beat me. I'll do it."
+ <<case "shamefast">>
+ "I'm going to be meat in a brothel," $he <<say>>s quietly, half to $himself. "I'm going to <<s>>tand there naked with the other girl<<s>>, and men will pick me and then u<<s>>e my body. Over and over." $He starts to cry openly. "<<S>>-<<s>>orry, <<Master>>. P-plea<<s>>se don't beat me. I'll do it."
+ <<case "apathetic">>
+ "I gue<<ss>> I'll lie there," $he sighs quietly, half to $himself. "A man will pay and then he'll come in to my room where I'm lying on the bed, and he'll <<s>>tick his cock in me and cum and leave. And then the next man will come in." $He starts to cry quietly. "<<S>>-<<s>>orry, <<Master>>. P-plea<<s>>se don't beat me. I'll let it happen."
+ <<case "crude">>
+ "Okay," $he <<say>>s, thinking. "My poor cornhole is going to be <<s>>uch a <<s>>eminal <<s>>ewer." $He looks doubtful. "<<Sh>>ould I not have <<s>>aid that, <<Master>>?"
+ <<case "judgemental">>
+ "Gro<<ss>>," $he <<say>>s curtly. "Well, no more hand<<s>>ome boy<<s>> for me, then. Fat pathetic guy<<s>> who patroni<<z>>e whore<<s>>, all the way down. Fuck."
+ <</switch>>
<<else>>
- "the other girl<<s>> tell me that whore<<s>> there get tittyfucked all the time. <<s>>ound<<s>> like fun to me."
+ $He does $his best to control $himself and avoid punishment. "<<Master>>, I will." $He holds $himself together until you dismiss $him; as $he turns away to go, the tears come fast, and $he almost runs into the doorframe on $his way out, blind with weeping.
<</if>>
- <<case "pregnancy">>
- <<if $activeSlave.attrXX > $activeSlave.attrXY>>
- I hear from the other girl<<s>> there'<<s>> thi<<s>> pregnant lady who goe<<s>> there every night and pay<<s>> to have a whore cuddle her. Ju<<s>>t cuddle, all night. That would be kind of hard, ju<<s>>t cuddling, but I could do it."
- <<elseif $activeSlave.vagina == -1>>
- <<s>>ince it'<<s>> all bareback, I'm going to have a fuckton of cum in me. I wonder how much cum it take<<s>> to get a butthole pregnant? I'm gonna try, anyway."
- <<elseif isFertile($activeSlave)>>
- <<s>>ince it'<<s>> all bareback, I'm going to have a fuckton of cum in me. I wonder how much cum it would take to get my poor womb pregnant?"
- <<elseif $activeSlave.pregKnown == 1>>
- "I'm going to be a pregnant whore. That'<<s>> pretty fucking <<s>>e<<x>>y."
- <<elseif $activeSlave.preg > 0>>
- "<<s>>ince it'<<s>> all bareback, I'm going to have a fuckton of cum in me. I wonder how much cum it would take to get my poor womb pregnant?"
- <<elseif $activeSlave.ovaries == 1 && $activeSlave.pubertyXX == 0>>
- "I can't wait till I can get pregnant. That'd be pretty fucking <<s>>e<<x>>y."
+ <<else>>
+ <<if $activeSlave.sexualFlaw != "none">>
+ $He automatically gestures consent. $He's badly frightened, and gingerly continues
+ <<switch $activeSlave.sexualFlaw>>
+ <<case "hates oral">>
+ by asking if $he'll have to suck a lot of dick. $He swallows and tries to control $himself out of fear, but finally loses composure and bursts into tears.
+ <<case "hates anal">>
+ by asking if $he'll be assfucked a lot. $He <<if $activeSlave.amp == 1>>shifts uncomfortably, unconsciously trying to shield $his rear as best $he can manage without limbs.<<else>>unconsciously reaches around behind $himself, not quite shielding $his anus with $his hands.<</if>> $His lower lip quivers and $he tries to control $himself out of fear, but finally loses composure and bursts into tears.
+ <<case "hates penetration">>
+ by asking if $he's going to be constantly fucked. $He <<if $activeSlave.amp == 1>>shifts uncomfortably, unconsciously trying to shield $his rear as best $he can manage without limbs.<<elseif $activeSlave.vagina > 0>>unconsciously lets $his hands fall to $his crotch, but catches $himself and doesn't quite shield $his pussy.<<else>>unconsciously reaches around behind $himself, not quite shielding $his anus with $his hands.<</if>> $His lower lip quivers, and $he tries to control $himself out of fear, but finally loses composure and bursts into tears.
+ <<case "repressed">>
+ that being a whore is a sin. $He starts to cry quietly. $He tries to get $himself back under control, out of fear, but finally wails and dissolves into prayers intermixed with sobbing.
+ <<case "idealistic">>
+ that sex should be with the one you love, not random men. $He starts to cry openly while begging you not to beat $him.
+ <<case "shamefast">>
+ that $he doesn't want to be naked in a line up for men to choose from. $He starts to cry openly while begging you not to beat $him.
+ <<case "apathetic">>
+ that all $he has to do is lie there and take it. $He starts to cry quietly.
+ <<case "crude">>
+ by asking if men enjoy fucking a thoroughly seeded hole. $He pauses for a moment, doubtful over whether $he should have said that or not.
+ <<case "judgemental">>
+ by expressing $his disappointment with the type of men that frequent brothels.
+ <</switch>>
<<else>>
- "I hear from the other girl<<s>> there'<<s>> thi<<s>> pregnant lady who goe<<s>> there every night and pay<<s>> to have a whore cuddle her. Ju<<s>>t cuddle, all night. That would be kind of hard, ju<<s>>t cuddling, but I could do it."
+ $He does $his best to control $himself and avoid punishment. "<<Master>>, I will." $He holds $himself together until you dismiss $him; as $he turns away to go, the tears come fast, and $he almost runs into the doorframe on $his way out, blind with weeping.
<</if>>
- <<case "dom">>
- I heard from the other girl<<s>> that <<s>>ome <<c>>iti<<z>>en<<s>> bring their girl<<s>> there. Ju<<s>>t to make them take it from a whore."
- <<case "sadist">>
- I heard from the other girl<<s>> that <<s>>ome <<c>>iti<<z>>en<<s>> bring their girl<<s>> there. Becau<<s>>e nobody know<<s>> how to hurt a bitch like a whore doe<<s>>." $He shivers.
- <</switch>>
-<<elseif $activeSlave.sexualFlaw != "none">>
- "Ye<<s>>, <<Master>>," $he says obediently. $He hesitates, looking concerned.
- <<switch $activeSlave.sexualFlaw>>
- <<case "hates oral">>
- "I - I'm going to h-have to <<s>>uck a lot of dick there, aren't I." $He swallows nervously. $His lower lip quivers, and $he does $his best not to cry in front of you.
- <<case "hates anal">>
- "C-cu<<s>>tomer<<s>> are really going to ream me up the butt hole, aren't they." $He <<if $activeSlave.amp == 1>>shifts uncomfortably, unconsciously trying to shield $his rear as best $he can manage without limbs.<<else>>unconsciously reaches around behind $himself, not quite shielding $his anus with $his hands.<</if>> $His lower lip quivers, and $he does $his best not to cry in front of you.
- <<case "hates penetration">>
- "C-cu<<s>>tomer<<s>> are really going to fuck me <<s>>ore, aren't they." $He <<if $activeSlave.amp == 1>>shifts uncomfortably, unconsciously trying to shield $his rear as best $he can manage without limbs.<<elseif $activeSlave.vagina > 0>>unconsciously lets $his hands fall to $his crotch, but catches $himself and doesn't quite shield $his pussy.<<else>>unconsciously reaches around behind $himself, not quite shielding $his anus with $his hands.<</if>> $His lower lip quivers, and $he does $his best not to cry in front of you.
- <<case "repressed">>
- "Being a whore i<<s>> a <<s>>in," $he <<say>>s quietly, half to $himself. "I'm going t-to b-be <<s>>o dirty. I'm going to h-hell." $He starts to cry quietly. "<<S>>-<<s>>orry, <<Master>>. I'll do my be<<s>>t."
- <<case "idealistic">>
- "I'm going to be <<s>>old for <<s>>e<<x>>," $he <<say>>s quietly, half to $himself. "Men are going to pay, and then they're g-going to <<s>>tick their dick<<s>> in me, and then they're going to leave." $He starts to cry quietly. "<<S>>-<<s>>orry, <<Master>>. I'll do my be<<s>>t."
- <<case "shamefast">>
- "I'm going to be meat in a brothel," $he <<say>>s quietly, half to $himself. "I'm going to <<s>>tand there naked with the other girl<<s>>, and men will pick me and then u<<s>>e my body. Over and over." $He starts to cry quietly. "<<S>>-<<s>>orry, <<Master>>. I'll do my be<<s>>t."
- <<case "apathetic">>
- "I gue<<ss>> I'll lie there," $he sighs quietly, half to $himself. "A man will pay and then he'll come in to my room where I'm lying on the bed, and he'll <<s>>tick his cock in me and cum and leave. And then the next man will come in." $He starts to cry quietly. "<<S>>-<<s>>orry, <<Master>>. I'll do my be<<s>>t."
- <<case "crude">>
- "Okay," $he <<say>>s, thinking. "My poor cornhole i<<s>> going to be <<s>>uch a <<s>>eminal <<s>>ewer." $He looks doubtful. "<<Sh>>ould I not have <<s>>aid that, <<Master>>?"
- <<case "judgemental">>
- "Gro<<ss>>," $he <<say>>s curtly. "Well, no more hand<<s>>ome boy<<s>> for me, then. Fat pathetic guy<<s>> who patroni<<z>>e whore<<s>>, all the way down. Fuck."
- <</switch>>
-<<else>>
- $He tries to be brave. "<<Master>>, I will do my be<<s>>t to be a good whore." Then, half to $himself, $he adds in a small voice, "I can do thi<<s>>."
-<</if>>
-
-<<elseif ($activeSlave.trust < -20)>>
-
-<<if $activeSlave.sexualFlaw != "none">>
- "Yes, <<Master>>," $he says automatically. $He's badly frightened, and says in a small voice, half to $himself,
- <<switch $activeSlave.sexualFlaw>>
- <<case "hates oral">>
- "I - I'm going to h-have to <<s>>uck a lot of dick, aren't I." $He swallows and tries to control $himself out of fear, but finally gasps out, "Oh God, I'm <<s>>cared," and bursts into tears.
- <<case "hates anal">>
- "C-cu<<s>>tomer<<s>> are really going to ream me up the butt hole, aren't they." $He <<if $activeSlave.amp == 1>>shifts uncomfortably, unconsciously trying to shield $his rear as best $he can manage without limbs.<<else>>unconsciously reaches around behind $himself, not quite shielding $his anus with $his hands.<</if>> $His lower lip quivers and $he tries to control $himself out of fear, but finally gasps out, "Oh God, I'm <<s>>cared," and bursts into tears.
- <<case "hates penetration">>
- "C-cu<<s>>tomer<<s>> are really going to fuck me <<s>>ore, aren't they." $He <<if $activeSlave.amp == 1>>shifts uncomfortably, unconsciously trying to shield $his rear as best $he can manage without limbs.<<elseif $activeSlave.vagina > 0>>unconsciously lets $his hands fall to $his crotch, but catches $himself and doesn't quite shield $his pussy.<<else>>unconsciously reaches around behind $himself, not quite shielding $his anus with $his hands.<</if>> $His lower lip quivers, and $he tries to control $himself out of fear, but finally gasps out, "Oh God, I'm <<s>>cared," and bursts into tears.
- <<case "repressed">>
- "Being a whore i<<s>> a <<s>>in," $he <<say>>s quietly, half to $himself. "I'm going t-to b-be <<s>>o dirty. I'm going to h-hell." $He starts to cry quietly. $He tries to get $himself back under control, out of fear, but finally wails, "Oh God, I'm <<s>>orry, p-plea<<s>>e forgive me God," and dissolves into sobbing.
- <<case "idealistic">>
- "I'm going to be <<s>>old for <<s>>e<<x>>," $he <<say>>s quietly, half to $himself. "Men are going to pay, and then they're g-going to <<s>>tick their dick<<s>> in me, and then they're going to leave." $He starts to cry openly. "<<S>>-<<s>>orry, <<Master>>. P-plea<<s>>se don't beat me. I'll do it."
- <<case "shamefast">>
- "I'm going to be meat in a brothel," $he <<say>>s quietly, half to $himself. "I'm going to <<s>>tand there naked with the other girl<<s>>, and men will pick me and then u<<s>>e my body. Over and over." $He starts to cry openly. "<<S>>-<<s>>orry, <<Master>>. P-plea<<s>>se don't beat me. I'll do it."
- <<case "apathetic">>
- "I gue<<ss>> I'll lie there," $he sighs quietly, half to $himself. "A man will pay and then he'll come in to my room where I'm lying on the bed, and he'll <<s>>tick his cock in me and cum and leave. And then the next man will come in." $He starts to cry quietly. "<<S>>-<<s>>orry, <<Master>>. P-plea<<s>>se don't beat me. I'll let it happen."
- <<case "crude">>
- "Okay," $he <<say>>s, thinking. "My poor cornhole is going to be <<s>>uch a <<s>>eminal <<s>>ewer." $He looks doubtful. "<<Sh>>ould I not have <<s>>aid that, <<Master>>?"
- <<case "judgemental">>
- "Gro<<ss>>," $he <<say>>s curtly. "Well, no more hand<<s>>ome boy<<s>> for me, then. Fat pathetic guy<<s>> who patroni<<z>>e whore<<s>>, all the way down. Fuck."
- <</switch>>
-<<else>>
- $He does $his best to control $himself and avoid punishment. "<<Master>>, I will." $He holds $himself together until you dismiss $him; as $he turns away to go, the tears come fast, and $he almost runs into the doorframe on $his way out, blind with weeping.
-<</if>>
+ <</if>>
<<else>>
-$He manages to get "Oh fuck n-" out before the compliance systems activate and $he's poleaxed to the ground. Anticipating this, you had <<if $Madam != 0>>$Madam.slaveName <<else>>another, more obedient slave<</if>> standing by to haul $him away. It'll take a couple of hundred customers, but being sold in a brothel for rape should knock the resistance out of $him.
+ $He manages to
+ <<if canTalk($activeSlave)>>
+ get "Oh fuck n-" out
+ <<elseif $activeSlave.amp != 1>>
+ flip you an incredibly rude gesture
+ <<else>>
+ get an incredibly rude gesture out
+ <</if>>
+ before the compliance systems activate and $he's poleaxed to the ground. Anticipating this, you had <<if $Madam != 0>>$Madam.slaveName <<else>>another, more obedient slave<</if>> standing by to haul $him away. It'll take a couple of hundred customers, but being sold in a brothel for rape should knock the resistance out of $him.
<</if>> /* CLOSES DEVOTION */
diff --git a/src/facilities/farmyard/farmyard.tw b/src/facilities/farmyard/farmyard.tw
index bd2354c6e034d205aac95b20799f12b498d85f03..69922242888916be10a46d22f301e8e85c4b0a07 100644
--- a/src/facilities/farmyard/farmyard.tw
+++ b/src/facilities/farmyard/farmyard.tw
@@ -71,8 +71,8 @@ $farmyardNameCaps is an oasis of growth in the midst of the jungle of steel and
$farmyardNameCaps is working steadily. Farmhands are moving about, looking after the animals and crops.
<<elseif $Farmer != 0>>
$Farmer.slaveName is alone in $farmyardName, and has nothing to do but look after the animals and crops.
-<<else>>
- $farmyardNameCaps is empty and quiet. <<link "Decommission the Farmyard" "Main">><<set $farmyardName = "the Farmyard", $farmyard = 0, $farmyardSlaves = 0, $farmyardDecoration = "standard", $farmyardUpgrade = {pump: 0, fertilizer: 0, hydroponics: 0, machinery: 0, seeds: 0, lab: 0}, $farmyardLab = 0, $farmyardLabUpgrades = {animalOvaries: 0, animalTesticles: 0, animalMpreg: 0}, $farmyardCrops = 0, $farmyardKennels = 0, $farmyardStable = 0, $farmyardCages = 0, $activeCanine = 0, $activeHooved = 0, $activeFeline = 0, $animalsBought = {canines: 0, hooved: 0, felines: 0, labradorRetrievers: 0, germanShepherds: 0, goldenRetrievers: 0, frenchBulldogs: 0, bulldogs: 0, beagles: 0, poodles: 0, rottweilers: 0, yorkshireTerriers: 0, siberianHuskies: 0, horses: 0, siameses: 0, persians: 0, maineCoons: 0, ragdolls: 0, bengals: 0, abbysinians: 0, birmans: 0, orientalShorthairs: 0, sphynxes: 0, russianBlues: 0, wolves: 0, foxes: 0, jackals: 0, dingos: 0, zebras: 0, cougars: 0, jaguars: 0, pumas: 0, lynx: 0, leopards: 0, lions: 0, tigers: 0}, $pitAnimal = 0, $canines = [], $hooved = [], $felines = []>>
+<<else>> /* TODO: is there any way of cleaning up $animalsBought? I can't think of a good way */
+ $farmyardNameCaps is empty and quiet. <<link "Decommission the Farmyard" "Main">><<set $farmyardName = "the Farmyard", $farmyard = 0, $farmyardSlaves = 0, $farmyardDecoration = "standard", $farmyardUpgrade = {pump: 0, fertilizer: 0, hydroponics: 0, machinery: 0, seeds: 0, lab: 0}, $farmyardLab = 0, $farmyardLabUpgrades = {animalOvaries: 0, animalTesticles: 0, animalMpreg: 0}, $farmyardCrops = 0, $farmyardKennels = 0, $farmyardStable = 0, $farmyardCages = 0, $activeCanine = -1, $activeHooved = -1, $activeFeline = -1, $animalsBought = {canines: 0, hooved: 0, felines: 0, labradorRetrievers: 0, germanShepherds: 0, goldenRetrievers: 0, frenchBulldogs: 0, bulldogs: 0, beagles: 0, poodles: 0, rottweilers: 0, yorkshireTerriers: 0, siberianHuskies: 0, horses: 0, siameses: 0, persians: 0, maineCoons: 0, ragdolls: 0, bengals: 0, abbysinians: 0, birmans: 0, orientalShorthairs: 0, sphynxes: 0, russianBlues: 0, wolves: 0, foxes: 0, jackals: 0, dingos: 0, zebras: 0, cougars: 0, jaguars: 0, pumas: 0, lynx: 0, leopards: 0, lions: 0, tigers: 0}, $pitAnimal = 0, $canines = [], $hooved = [], $felines = []>>
<<set _far = $sectors.findIndex(function(s) { return s.type == "Farmyard"; })>>
<<if _far != -1>>
<<set $sectors[_far].type = "Manufacturing">>
diff --git a/src/facilities/nursery/saNanny.tw b/src/facilities/nursery/saNanny.tw
new file mode 100644
index 0000000000000000000000000000000000000000..d05791bc01b25b4b9309271548da573656d71a68
--- /dev/null
+++ b/src/facilities/nursery/saNanny.tw
@@ -0,0 +1,5 @@
+:: SA Nanny [nobr]
+
+works as a nanny this week.
+
+/* TODO: this needs to be written */
\ No newline at end of file
diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw
index 7764bb8426dffdece29a7b47edf5f6cabc04fab6..f6d782655869f508e80b4bc84c1e3c417cfcb2c9 100644
--- a/src/init/setupVars.tw
+++ b/src/init/setupVars.tw
@@ -2066,6 +2066,12 @@ Then pick _namePool.random(), or display those names as possible choices, or do
{name: "Long, large plug", value: "long, large plug", rs: "buyBigPlugs"},
{name: "Huge plug", value: "huge plug"}, {name: "Long, huge plug", value: "long, huge plug", rs: "buyBigPlugs"}]>>
+<<set setup.buttplugAttachments = [
+ {name: "No default setting", value: "no default setting"},
+ {name: "None", value: "none"},
+ {name: "Tail", value: "tail", rs: "buyTails"},
+ {name: "Fox tail", value: "fox tail", rs: "buyTails"}, {name: "Cat tail", value: "cat tail", rs: "buyTails"}]>>
+
<<set setup.facilityCareers = ["be confined in the arcade", "be confined in the cellblock", "be the Attendant", "be the DJ", "be the Farmer", "be the Madam", "be the Matron", "be the Milkmaid", "be the Nurse", "be the Schoolteacher", "be the Stewardess", "be the Wardeness", "be your Concubine", "get treatment in the clinic", "learn in the schoolroom", "live with your Head Girl", "rest in the spa", "serve in the club", "serve in the master suite", "work as a farmhand", "work as a nanny", "work as a servant", "work in the brothel", "work in the dairy"]>>
<<set setup.lightColorMap = {
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index dde5f8948af3d0b737969e187958f2e4fd563c5a..7b1f295a1c8eba6ad8675a9712e9ce5dec6f0e1c 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -578,9 +578,9 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $farmyardStable = 0>>
<<set $farmyardKennels = 0>>
<<set $farmyardCages = 0>>
-<<set $activeCanine = 0>>
-<<set $activeHooved = 0>>
-<<set $activeFeline = 0>>
+<<set $activeCanine = -1>>
+<<set $activeHooved = -1>>
+<<set $activeFeline = -1>>
<<set $farmyardLab = 0>>
<<set $farmyardLabUpgrades = {animalOvaries: 0, animalTesticles: 0, animalMpreg: 0}>>
<<set $animalsBought = {canines: 0, hooved: 0, felines: 0, labradorRetrievers: 0, germanShepherds: 0, goldenRetrievers: 0, frenchBulldogs: 0, bulldogs: 0, beagles: 0, poodles: 0, rottweilers: 0, yorkshireTerriers: 0, siberianHuskies: 0, horses: 0, siameses: 0, persians: 0, maineCoons: 0, ragdolls: 0, bengals: 0, abbysinians: 0, birmans: 0, orientalShorthairs: 0, sphynxes: 0, russianBlues: 0, wolves: 0, foxes: 0, jackals: 0, dingos: 0, zebras: 0, cougars: 0, jaguars: 0, pumas: 0, lynx: 0, leopards: 0, lions: 0, tigers: 0}>>
diff --git a/src/js/DefaultRules.tw b/src/js/DefaultRules.tw
index 9cac5e730f6431a39ce1812f2ef4b010a082fe8a..c33e6bb3e46b863bda3db02e98463e009fe551f5 100644
--- a/src/js/DefaultRules.tw
+++ b/src/js/DefaultRules.tw
@@ -768,13 +768,14 @@ window.DefaultRules = (function() {
}
function ProcessAnalAccessories(slave, rule) {
- // apply buttplugs to slave
+ // apply buttplugs and buttplug accessories to slave
if ((slave.vaginalAccessory !== "anal chastity") && (slave.vaginalAccessory !== "combined chastity") && (slave.dickAccessory !== "anal chastity") && (slave.dickAccessory !== "combined chastity")) {
if (slave.anus === 0)
ProcessAnalVirginButtplugs(slave, rule);
else
ProcessNonVirginButtplugs(slave, rule);
}
+ ProcessButtplugAttachments(slave, rule);
}
function ProcessAnalVirginButtplugs(slave, rule) {
@@ -891,6 +892,27 @@ window.DefaultRules = (function() {
}
}
+ function ProcessButtplugAttachments(slave, rule) {
+ // apply buttplug accessories to slaves
+ if (slave.buttplug === "none" && slave.buttplugAttachment !== "none") {
+ slave.buttplugAttachment = "none"; //clears buttplug attachments when buttplugs are removed above
+ } else if ((rule.buttplugAttachment !== undefined) && (rule.buttplugAttachment !== "no default setting")) {
+ if ((slave.buttplugAttachment !== rule.buttplugAttachment)) {
+ slave.buttplugAttachment = rule.buttplugAttachment;
+ switch (slave.buttplugAttachment) {
+
+ case "none":
+ r += `<br>${slave.slaveName} has been instructed not to use an attachment for her anal accessory.`;
+ break;
+
+ default:
+ r += `<br>${slave.slaveName} has been given a slave.buttplugAttachment to attach to her buttplug.`;
+ break;
+ }
+ }
+ }
+ }
+
function ProcessBellyImplant(slave, rule) {
// Here is belly implant size control, it's used in Surgery Degradation passage to setup devotion and trust changes.
// silent calls to surgery degradation have been replaced with a js function, which is less hacky
diff --git a/src/js/rulesAssistant.tw b/src/js/rulesAssistant.tw
index 093ee3e2479b8752adda6829ee9d0d8bc0eb8fd4..f496cdbb87f7c4fa67cb445b27257a44f7263ee5 100644
--- a/src/js/rulesAssistant.tw
+++ b/src/js/rulesAssistant.tw
@@ -218,6 +218,7 @@ window.emptyDefaultRule = function emptyDefaultRule() {
bellyAccessory: "no default setting",
aVirginButtplug: "no default setting",
buttplug: "no default setting",
+ buttplugAttachment: "no default setting",
eyeColor: "no default setting",
makeup: "no default setting",
nails: "no default setting",
diff --git a/src/js/rulesAssistantOptions.tw b/src/js/rulesAssistantOptions.tw
index df8d33f70b56c2bc55c7ccd4e846ff180e600e99..2e8f49cbe35dac54a05f4bbacf34589668e23771 100644
--- a/src/js/rulesAssistantOptions.tw
+++ b/src/js/rulesAssistantOptions.tw
@@ -924,6 +924,7 @@ window.rulesAssistantOptions = (function() {
}
this.appendChild(new ButtplugsVirginsList());
this.appendChild(new ButtplugsOtherList());
+ this.appendChild(new ButtplugAttachmentsList());
this.appendChild(new ImplantVolumeList());
}
@@ -1377,6 +1378,21 @@ window.rulesAssistantOptions = (function() {
}
}
+ class ButtplugAttachmentsList extends List {
+ constructor() {
+ const accs = [];
+ setup.buttplugAttachments.forEach(acc => {
+ if (acc.fs === undefined && acc.rs === undefined)
+ accs.push([acc.name, acc.value]);
+ else if (acc.rs === "buyTails" && V.toysBoughtButtPlugTails === 1)
+ accs.push([acc.name + " (Purchased)", acc.value]);
+ });
+ super("Buttplug attachments for slaves with buttplugs", accs);
+ this.setValue(current_rule.set.buttplugAttachment);
+ this.onchange = (value) => current_rule.set.buttplugAttachment = value;
+ }
+ }
+
class ImplantVolumeList extends List {
constructor() {
const pairs = [
@@ -1920,7 +1936,8 @@ window.rulesAssistantOptions = (function() {
["Permissive", "permissive"],
["Sapphic", "sapphic"],
["Masturbation", "masturbation"],
- ["Restrictive", "restrictive"]
+ ["Restrictive", "restrictive"],
+ ["Chastity", "chastity"]
];
super("Release rules", pairs);
this.setValue(current_rule.set.releaseRules);
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 733cf1c03c6b30e2a2effc163e5c2a1a2d1e2d95..d28f0c5da7653d0baa62b0840e3b817ffd86f715 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -363,6 +363,14 @@
<<if ndef $PC.ballType>>
<<set $PC.ballType = "human">>
<</if>>
+<<if ndef $PC.geneticQuirks>>
+ <<set $PC.geneticQuirks = {macromastia: 0, gigantomastia: 0, fertility: 0, hyperFertility: 0, superfetation: 0, gigantism: 0, dwarfism: 0, pFace: 0, uFace: 0, albinism: 0, rearLipedema: 0, wellHung: 1, wGain: 0, wLoss: 0, androgyny: 0}>>
+ <<if $PC.birthMaster > 0>>
+ <<set $PC.geneticQuirks.fertility = 2>>
+ <<elseif $PC.career == "servant">>
+ <<set $PC.geneticQuirks.fertility = 1>>
+ <</if>>
+<</if>>
<<if $releaseID < 1032>>
<<if $PC.pregSource == -1>>
<<set $PC.pregSource = -6>>
@@ -835,13 +843,13 @@
<<unset $defaultFelinePlural = "cougars">>
<</if>>
<<if ndef $activeCanine>>
- <<set $activeCanine = 0>>
+ <<set $activeCanine = -1>>
<</if>>
<<if ndef $activeHooved>>
- <<set $activeHooved = 0>>
+ <<set $activeHooved = -1>>
<</if>>
<<if ndef $activeFeline>>
- <<set $activeFeline = 0>>
+ <<set $activeFeline = -1>>
<</if>>
<<if def $boughtWolves>>
<<unset $boughtWolves>>
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index b1be9dc6a07a86dc4a21b2cacd5253e969b1b5a1..5dc2e0fbb5fd2c230e829361e9083b06a979e271 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -23,270 +23,270 @@ _upperClassP = 1,
_topClass = 0,
_topClassP = 1>>
<<if $arcologies[0].FSSupremacist != "unset">>
- <<set _FSScore += $arcologies[0].FSSupremacist,
- _slaveDemandU *= 1 + Math.trunc($arcologies[0].FSSupremacist / 20) * 0.04,
- _slaveDemandT *= 1 + Math.trunc($arcologies[0].FSSupremacist / 20) * 0.05,
- _lowerClass += Math.trunc($arcologies[0].FSSupremacist / 20) * -80,
- _lowerClassP *= 1 + Math.trunc($arcologies[0].FSSupremacist / 20) * -0.004,
- _middleClass += Math.trunc($arcologies[0].FSSupremacist / 20) * -16,
- _middleClassP *= 1 + Math.trunc($arcologies[0].FSSupremacist / 20) * -0.002,
- _upperClass += Math.trunc($arcologies[0].FSSupremacist / 20) * 5.4,
- _upperClassP *= 1 + Math.trunc($arcologies[0].FSSupremacist / 20) * 0.002,
- _topClass += Math.trunc($arcologies[0].FSSupremacist / 20) * 2,
- _topClassP *= 1 + Math.trunc($arcologies[0].FSSupremacist / 20) * 0.004>>
+ <<set _FSScore += Math.min($arcologies[0].FSSupremacist, 100),
+ _slaveDemandU *= 1 + Math.trunc(Math.min($arcologies[0].FSSupremacist, 100) / 20) * 0.04,
+ _slaveDemandT *= 1 + Math.trunc(Math.min($arcologies[0].FSSupremacist, 100) / 20) * 0.05,
+ _lowerClass += Math.trunc(Math.min($arcologies[0].FSSupremacist, 100) / 20) * -80,
+ _lowerClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSSupremacist, 100) / 20) * -0.004,
+ _middleClass += Math.trunc(Math.min($arcologies[0].FSSupremacist, 100) / 20) * -16,
+ _middleClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSSupremacist, 100) / 20) * -0.002,
+ _upperClass += Math.trunc(Math.min($arcologies[0].FSSupremacist, 100) / 20) * 5.4,
+ _upperClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSSupremacist, 100) / 20) * 0.002,
+ _topClass += Math.trunc(Math.min($arcologies[0].FSSupremacist, 100) / 20) * 2,
+ _topClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSSupremacist, 100) / 20) * 0.004>>
Your racial policies are concentrating power in the hands of $arcologies[0].FSSupremacistRace people. /*perhaps too obvious to bother with printing?*/
<</if>>
<<if $arcologies[0].FSSubjugationist != "unset">>
- <<set _FSScore += $arcologies[0].FSSubjugationist,
- _slaveDemandU *= 1 + Math.trunc($arcologies[0].FSSubjugationist / 20) * 0.04,
- _slaveDemandT *= 1 + Math.trunc($arcologies[0].FSSubjugationist / 20) * 0.05,
- _lowerClass += Math.trunc($arcologies[0].FSSubjugationist / 20) * -80,
- _lowerClassP *= 1 + Math.trunc($arcologies[0].FSSubjugationist / 20) * -0.004,
- _middleClass += Math.trunc($arcologies[0].FSSubjugationist / 20) * -16,
- _middleClassP *= 1 + Math.trunc($arcologies[0].FSSubjugationist / 20) * -0.002,
- _upperClass += Math.trunc($arcologies[0].FSSubjugationist / 20) * 5.4,
- _upperClassP *= 1 + Math.trunc($arcologies[0].FSSubjugationist / 20) * 0.002,
- _topClass += Math.trunc($arcologies[0].FSSubjugationist / 20) * 2,
- _topClassP *= 1 + Math.trunc($arcologies[0].FSSubjugationist / 20) * 0.004>>
+ <<set _FSScore += Math.min($arcologies[0].FSSubjugationist, 100),
+ _slaveDemandU *= 1 + Math.trunc(Math.min($arcologies[0].FSSubjugationist, 100) / 20) * 0.04,
+ _slaveDemandT *= 1 + Math.trunc(Math.min($arcologies[0].FSSubjugationist, 100) / 20) * 0.05,
+ _lowerClass += Math.trunc(Math.min($arcologies[0].FSSubjugationist, 100) / 20) * -80,
+ _lowerClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSSubjugationist, 100) / 20) * -0.004,
+ _middleClass += Math.trunc(Math.min($arcologies[0].FSSubjugationist, 100) / 20) * -16,
+ _middleClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSSubjugationist, 100) / 20) * -0.002,
+ _upperClass += Math.trunc(Math.min($arcologies[0].FSSubjugationist, 100) / 20) * 5.4,
+ _upperClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSSubjugationist, 100) / 20) * 0.002,
+ _topClass += Math.trunc(Math.min($arcologies[0].FSSubjugationist, 100) / 20) * 2,
+ _topClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSSubjugationist, 100) / 20) * 0.004>>
Your racial policies are stripping all power from the $arcologies[0].FSSubjugationistRace people. /*perhaps too obvious to bother with printing?*/
<</if>>
<<if $arcologies[0].FSGenderRadicalist != "unset">>
- <<set _FSScore += $arcologies[0].FSGenderRadicalist,
- _slaveDemandU *= 1 + Math.trunc($arcologies[0].FSGenderRadicalist / 20) * 0.02,
- _slaveDemandT *= 1 + Math.trunc($arcologies[0].FSGenderRadicalist / 20) * 0.025,
- _lowerClass += Math.trunc($arcologies[0].FSGenderRadicalist / 20) * -40,
- _lowerClassP *= 1 + Math.trunc($arcologies[0].FSGenderRadicalist / 20) * -0.002,
- _topClass += Math.trunc($arcologies[0].FSGenderRadicalist / 20),
- _topClassP *= 1 + Math.trunc($arcologies[0].FSGenderRadicalist / 20) * 0.002>>
+ <<set _FSScore += Math.min($arcologies[0].FSGenderRadicalist, 100),
+ _slaveDemandU *= 1 + Math.trunc(Math.min($arcologies[0].FSGenderRadicalist, 100) / 20) * 0.02,
+ _slaveDemandT *= 1 + Math.trunc(Math.min($arcologies[0].FSGenderRadicalist, 100) / 20) * 0.025,
+ _lowerClass += Math.trunc(Math.min($arcologies[0].FSGenderRadicalist, 100) / 20) * -40,
+ _lowerClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSGenderRadicalist, 100) / 20) * -0.002,
+ _topClass += Math.trunc(Math.min($arcologies[0].FSGenderRadicalist, 100) / 20),
+ _topClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSGenderRadicalist, 100) / 20) * 0.002>>
Your radical views on gender are scaring away the more traditionally minded.
<</if>>
<<if $arcologies[0].FSGenderFundamentalist != "unset">>
- <<set _FSScore += $arcologies[0].FSGenderFundamentalist,
- _lowerClass += Math.trunc($arcologies[0].FSGenderFundamentalist / 20) * 40,
- _lowerClassP *= 1 + Math.trunc($arcologies[0].FSGenderFundamentalist / 20) * 0.002,
- _topClass += Math.trunc($arcologies[0].FSGenderFundamentalist / 20) * -1,
- _topClassP *= 1 + Math.trunc($arcologies[0].FSGenderFundamentalist / 20) * -0.002>>
+ <<set _FSScore += Math.min($arcologies[0].FSGenderFundamentalist, 100),
+ _lowerClass += Math.trunc(Math.min($arcologies[0].FSGenderFundamentalist, 100) / 20) * 40,
+ _lowerClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSGenderFundamentalist, 100) / 20) * 0.002,
+ _topClass += Math.trunc(Math.min($arcologies[0].FSGenderFundamentalist, 100) / 20) * -1,
+ _topClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSGenderFundamentalist, 100) / 20) * -0.002>>
Your traditional views on gender are comforting to many, unimaginative to some.
<</if>>
<<if $arcologies[0].FSPaternalist != "unset">>
- <<set _FSScore += $arcologies[0].FSPaternalist,
- _slaveDemandU *= 1 + Math.trunc($arcologies[0].FSPaternalist / 20) * -0.04,
- _slaveDemandT *= 1 + Math.trunc($arcologies[0].FSPaternalist / 20) * -0.05,
- _expirationFS *= 1 + Math.trunc($arcologies[0].FSPaternalist / 20) * -0.1,
- _slaveProductivity += Math.trunc($arcologies[0].FSPaternalist / 20) * 0.02,
- _lowerClass += Math.trunc($arcologies[0].FSPaternalist / 20) * 80,
- _lowerClassP *= 1 + Math.trunc($arcologies[0].FSPaternalist / 20) * 0.004,
- _welfareFS *= 1 + Math.trunc($arcologies[0].FSPaternalist / 20) * -0.1,
- _middleClass += Math.trunc($arcologies[0].FSPaternalist / 20) * 16,
- _middleClassP *= 1 + Math.trunc($arcologies[0].FSPaternalist / 20) * 0.002,
- _upperClass += Math.trunc($arcologies[0].FSPaternalist / 20) * -5.4,
- _upperClassP *= 1 + Math.trunc($arcologies[0].FSPaternalist / 20) * -0.002,
- _topClass += Math.trunc($arcologies[0].FSPaternalist / 20) * -2,
- _topClassP *= 1 + Math.trunc($arcologies[0].FSPaternalist / 20) * -0.002>>
+ <<set _FSScore += Math.min($arcologies[0].FSPaternalist, 100),
+ _slaveDemandU *= 1 + Math.trunc(Math.min($arcologies[0].FSPaternalist, 100) / 20) * -0.04,
+ _slaveDemandT *= 1 + Math.trunc(Math.min($arcologies[0].FSPaternalist, 100) / 20) * -0.05,
+ _expirationFS *= 1 + Math.trunc(Math.min($arcologies[0].FSPaternalist, 100) / 20) * -0.1,
+ _slaveProductivity += Math.trunc(Math.min($arcologies[0].FSPaternalist, 100) / 20) * 0.02,
+ _lowerClass += Math.trunc(Math.min($arcologies[0].FSPaternalist, 100) / 20) * 80,
+ _lowerClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSPaternalist, 100) / 20) * 0.004,
+ _welfareFS *= 1 + Math.trunc(Math.min($arcologies[0].FSPaternalist, 100) / 20) * -0.1,
+ _middleClass += Math.trunc(Math.min($arcologies[0].FSPaternalist, 100) / 20) * 16,
+ _middleClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSPaternalist, 100) / 20) * 0.002,
+ _upperClass += Math.trunc(Math.min($arcologies[0].FSPaternalist, 100) / 20) * -5.4,
+ _upperClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSPaternalist, 100) / 20) * -0.002,
+ _topClass += Math.trunc(Math.min($arcologies[0].FSPaternalist, 100) / 20) * -2,
+ _topClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSPaternalist, 100) / 20) * -0.002>>
Poor citizens can rely on their better-off peers in $arcologies[0].name.
<</if>>
<<if $arcologies[0].FSDegradationist != "unset">>
- <<set _FSScore += $arcologies[0].FSDegradationist,
- _slaveDemandU *= 1 + Math.trunc($arcologies[0].FSDegradationist / 20) * 0.04,
- _slaveDemandT *= 1 + Math.trunc($arcologies[0].FSDegradationist / 20) * 0.05,
- _expirationFS *= 1 + Math.trunc($arcologies[0].FSDegradationist / 20) * 0.1,
- _slaveProductivity += Math.trunc($arcologies[0].FSDegradationist / 20) * 0.01,
- _lowerClass += Math.trunc($arcologies[0].FSDegradationist / 20) * -80,
- _lowerClassP *= 1 + Math.trunc($arcologies[0].FSDegradationist / 20) * -0.004,
- _welfareFS *= 1 + Math.trunc($arcologies[0].FSDegradationist / 20) * 0.1,
- _middleClass += Math.trunc($arcologies[0].FSDegradationist / 20) * -16,
- _middleClassP *= 1 + Math.trunc($arcologies[0].FSDegradationist / 20) * -0.002,
- _upperClass += Math.trunc($arcologies[0].FSDegradationist / 20) * 5.4,
- _upperClassP *= 1 + Math.trunc($arcologies[0].FSDegradationist / 20) * 0.002,
- _topClass += Math.trunc($arcologies[0].FSDegradationist / 20) * 2,
- _topClassP *= 1 + Math.trunc($arcologies[0].FSDegradationist / 20) * 0.004>>
+ <<set _FSScore += Math.min($arcologies[0].FSDegradationist, 100),
+ _slaveDemandU *= 1 + Math.trunc(Math.min($arcologies[0].FSDegradationist, 100) / 20) * 0.04,
+ _slaveDemandT *= 1 + Math.trunc(Math.min($arcologies[0].FSDegradationist, 100) / 20) * 0.05,
+ _expirationFS *= 1 + Math.trunc(Math.min($arcologies[0].FSDegradationist, 100) / 20) * 0.1,
+ _slaveProductivity += Math.trunc(Math.min($arcologies[0].FSDegradationist, 100) / 20) * 0.01,
+ _lowerClass += Math.trunc(Math.min($arcologies[0].FSDegradationist, 100) / 20) * -80,
+ _lowerClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSDegradationist, 100) / 20) * -0.004,
+ _welfareFS *= 1 + Math.trunc(Math.min($arcologies[0].FSDegradationist, 100) / 20) * 0.1,
+ _middleClass += Math.trunc(Math.min($arcologies[0].FSDegradationist, 100) / 20) * -16,
+ _middleClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSDegradationist, 100) / 20) * -0.002,
+ _upperClass += Math.trunc(Math.min($arcologies[0].FSDegradationist, 100) / 20) * 5.4,
+ _upperClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSDegradationist, 100) / 20) * 0.002,
+ _topClass += Math.trunc(Math.min($arcologies[0].FSDegradationist, 100) / 20) * 2,
+ _topClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSDegradationist, 100) / 20) * 0.004>>
The arcology is a cutthroat place in which falling into slavery is very easy.
<</if>>
<<if $arcologies[0].FSBodyPurist != "unset">>
- <<set _FSScore += $arcologies[0].FSBodyPurist,
- _lowerClass += Math.trunc($arcologies[0].FSBodyPurist / 20) * 40,
- _lowerClassP *= 1 + Math.trunc($arcologies[0].FSBodyPurist / 20) * 0.002,
- _upperClass += Math.trunc($arcologies[0].FSBodyPurist / 20) * -2.7,
- _upperClassP *= 1 + Math.trunc($arcologies[0].FSBodyPurist / 20) * -0.001,
- _topClass += Math.trunc($arcologies[0].FSBodyPurist / 20) * -0.5,
- _topClassP *= 1 + Math.trunc($arcologies[0].FSBodyPurist / 20) * -0.001>>
+ <<set _FSScore += Math.min($arcologies[0].FSBodyPurist, 100),
+ _lowerClass += Math.trunc(Math.min($arcologies[0].FSBodyPurist, 100) / 20) * 40,
+ _lowerClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSBodyPurist, 100) / 20) * 0.002,
+ _upperClass += Math.trunc(Math.min($arcologies[0].FSBodyPurist, 100) / 20) * -2.7,
+ _upperClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSBodyPurist, 100) / 20) * -0.001,
+ _topClass += Math.trunc(Math.min($arcologies[0].FSBodyPurist, 100) / 20) * -0.5,
+ _topClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSBodyPurist, 100) / 20) * -0.001>>
Body purist fashion standards comfort the poor stand as they stand out less from their more fortunate neighbors.
<</if>>
<<if $arcologies[0].FSTransformationFetishist != "unset">>
- <<set _FSScore += $arcologies[0].FSTransformationFetishist,
- _slaveDemandU *= 1 + Math.trunc($arcologies[0].FSTransformationFetishist / 20) * 0.02,
- _slaveDemandT *= 1 + Math.trunc($arcologies[0].FSTransformationFetishist / 20) * 0.025,
- _lowerClass += Math.trunc($arcologies[0].FSTransformationFetishist / 20) * -40,
- _lowerClassP *= 1 + Math.trunc($arcologies[0].FSTransformationFetishist / 20) * -0.002,
- _upperClass += Math.trunc($arcologies[0].FSTransformationFetishist / 20) * 2.7,
- _upperClassP *= 1 + Math.trunc($arcologies[0].FSTransformationFetishist / 20) * 0.001,
- _topClass += Math.trunc($arcologies[0].FSTransformationFetishist / 20) * 0.5,
- _topClassP *= 1 + Math.trunc($arcologies[0].FSTransformationFetishist / 20) * 0.001>>
+ <<set _FSScore += Math.min($arcologies[0].FSTransformationFetishist, 100),
+ _slaveDemandU *= 1 + Math.trunc(Math.min($arcologies[0].FSTransformationFetishist, 100) / 20) * 0.02,
+ _slaveDemandT *= 1 + Math.trunc(Math.min($arcologies[0].FSTransformationFetishist, 100) / 20) * 0.025,
+ _lowerClass += Math.trunc(Math.min($arcologies[0].FSTransformationFetishist, 100) / 20) * -40,
+ _lowerClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSTransformationFetishist, 100) / 20) * -0.002,
+ _upperClass += Math.trunc(Math.min($arcologies[0].FSTransformationFetishist, 100) / 20) * 2.7,
+ _upperClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSTransformationFetishist, 100) / 20) * 0.001,
+ _topClass += Math.trunc(Math.min($arcologies[0].FSTransformationFetishist, 100) / 20) * 0.5,
+ _topClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSTransformationFetishist, 100) / 20) * 0.001>>
The lower class fear the kind of transformations could be forced on them if they ever end up enslaved, whereas the rich enjoy weilding such power.
<</if>>
<<if $arcologies[0].FSYouthPreferentialist != "unset">>
- <<set _FSScore += $arcologies[0].FSYouthPreferentialist,
- _slaveDemandU *= 1 + Math.trunc($arcologies[0].FSYouthPreferentialist / 20) * 0.02,
- _slaveDemandT *= 1 + Math.trunc($arcologies[0].FSYouthPreferentialist / 20) * 0.025,
- _lowerClass += Math.trunc($arcologies[0].FSYouthPreferentialist / 20) * 40,
- _lowerClassP *= 1 + Math.trunc($arcologies[0].FSYouthPreferentialist / 20) * 0.002,
- _middleClass += Math.trunc($arcologies[0].FSYouthPreferentialist / 20) * -5.4,
- _middleClassP *= 1 + Math.trunc($arcologies[0].FSYouthPreferentialist / 20) * -0.002>>
+ <<set _FSScore += Math.min($arcologies[0].FSYouthPreferentialist, 100),
+ _slaveDemandU *= 1 + Math.trunc(Math.min($arcologies[0].FSYouthPreferentialist, 100) / 20) * 0.02,
+ _slaveDemandT *= 1 + Math.trunc(Math.min($arcologies[0].FSYouthPreferentialist, 100) / 20) * 0.025,
+ _lowerClass += Math.trunc(Math.min($arcologies[0].FSYouthPreferentialist, 100) / 20) * 40,
+ _lowerClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSYouthPreferentialist, 100) / 20) * 0.002,
+ _middleClass += Math.trunc(Math.min($arcologies[0].FSYouthPreferentialist, 100) / 20) * -5.4,
+ _middleClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSYouthPreferentialist, 100) / 20) * -0.002>>
Preference for youth makes the young poor in your arcology feel appreciated despite their lack of wealth.
<</if>>
<<if $arcologies[0].FSMaturityPreferentialist != "unset">>
- <<set _FSScore += $arcologies[0].FSMaturityPreferentialist,
- _slaveDemandU *= 1 + Math.trunc($arcologies[0].FSMaturityPreferentialist / 20) * 0.02,
- _slaveDemandT *= 1 + Math.trunc($arcologies[0].FSMaturityPreferentialist / 20) * 0.025,
- _lowerClass += Math.trunc($arcologies[0].FSMaturityPreferentialist / 20) * -40,
- _lowerClassP *= 1 + Math.trunc($arcologies[0].FSMaturityPreferentialist / 20) * -0.002,
- _middleClass += Math.trunc($arcologies[0].FSMaturityPreferentialist / 20) * 5.4,
- _middleClassP *= 1 + Math.trunc($arcologies[0].FSMaturityPreferentialist / 20) * 0.002>>
+ <<set _FSScore += Math.min($arcologies[0].FSMaturityPreferentialist, 100),
+ _slaveDemandU *= 1 + Math.trunc(Math.min($arcologies[0].FSMaturityPreferentialist, 100) / 20) * 0.02,
+ _slaveDemandT *= 1 + Math.trunc(Math.min($arcologies[0].FSMaturityPreferentialist, 100) / 20) * 0.025,
+ _lowerClass += Math.trunc(Math.min($arcologies[0].FSMaturityPreferentialist, 100) / 20) * -40,
+ _lowerClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSMaturityPreferentialist, 100) / 20) * -0.002,
+ _middleClass += Math.trunc(Math.min($arcologies[0].FSMaturityPreferentialist, 100) / 20) * 5.4,
+ _middleClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSMaturityPreferentialist, 100) / 20) * 0.002>>
Preference for maturity makes the middle class of your arcology feel like their experience is finally properly appreciated.
<</if>>
<<if $arcologies[0].FSSlimnessEnthusiast != "unset">>
- <<set _FSScore += $arcologies[0].FSSlimnessEnthusiast>>
+ <<set _FSScore += Math.min($arcologies[0].FSSlimnessEnthusiast, 100)>>
<</if>>
<<if $arcologies[0].FSAssetExpansionist != "unset">>
- <<set _FSScore += $arcologies[0].FSAssetExpansionist>>
+ <<set _FSScore += Math.min($arcologies[0].FSAssetExpansionist, 100)>>
<</if>>
<<if $arcologies[0].FSPastoralist != "unset">>
- <<set _FSScore += $arcologies[0].FSPastoralist,
- _slaveDemandU *= 1 + Math.trunc($arcologies[0].FSPastoralist / 20) * 0.04,
- _slaveDemandT *= 1 + Math.trunc($arcologies[0].FSPastoralist / 20) * 0.05,
- _lowerClass += Math.trunc($arcologies[0].FSPastoralist / 20) * -80,
- _lowerClassP *= 1 + Math.trunc($arcologies[0].FSPastoralist / 20) * -0.004,
- _middleClass += Math.trunc($arcologies[0].FSPastoralist / 20) * 16,
- _middleClassP *= 1 + Math.trunc($arcologies[0].FSPastoralist / 20) * 0.002,
- _upperClass += Math.trunc($arcologies[0].FSPastoralist / 20) * 2.7,
- _upperClassP *= 1 + Math.trunc($arcologies[0].FSPastoralist / 20) * 0.001,
- _topClass += Math.trunc($arcologies[0].FSPastoralist / 20) * 0.5,
- _topClassP *= 1 + Math.trunc($arcologies[0].FSPastoralist / 20) * 0.001>>
+ <<set _FSScore += Math.min($arcologies[0].FSPastoralist, 100),
+ _slaveDemandU *= 1 + Math.trunc(Math.min($arcologies[0].FSPastoralist, 100) / 20) * 0.04,
+ _slaveDemandT *= 1 + Math.trunc(Math.min($arcologies[0].FSPastoralist, 100) / 20) * 0.05,
+ _lowerClass += Math.trunc(Math.min($arcologies[0].FSPastoralist, 100) / 20) * -80,
+ _lowerClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSPastoralist, 100) / 20) * -0.004,
+ _middleClass += Math.trunc(Math.min($arcologies[0].FSPastoralist, 100) / 20) * 16,
+ _middleClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSPastoralist, 100) / 20) * 0.002,
+ _upperClass += Math.trunc(Math.min($arcologies[0].FSPastoralist, 100) / 20) * 2.7,
+ _upperClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSPastoralist, 100) / 20) * 0.001,
+ _topClass += Math.trunc(Math.min($arcologies[0].FSPastoralist, 100) / 20) * 0.5,
+ _topClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSPastoralist, 100) / 20) * 0.001>>
The pastoralization of $arcologies[0].name spurs a whole industry around human produce.
<</if>>
<<if $arcologies[0].FSPhysicalIdealist != "unset">>
- <<set _FSScore += $arcologies[0].FSPhysicalIdealist,
- _slaveDemandU *= 1 + Math.trunc($arcologies[0].FSPhysicalIdealist / 20) * 0.02,
- _slaveDemandT *= 1 + Math.trunc($arcologies[0].FSPhysicalIdealist / 20) * 0.025,
- _slaveProductivity += Math.trunc($arcologies[0].FSPhysicalIdealist / 20) * 0.01,
- _lowerClass += Math.trunc($arcologies[0].FSPhysicalIdealist / 20) * -40,
- _lowerClassP *= 1 + Math.trunc($arcologies[0].FSPhysicalIdealist / 20) * -0.002,
- _upperClass += Math.trunc($arcologies[0].FSPhysicalIdealist / 20) * 2.7,
- _upperClassP *= 1 + Math.trunc($arcologies[0].FSPhysicalIdealist / 20) * 0.001,
- _topClass += Math.trunc($arcologies[0].FSPhysicalIdealist / 20) * 0.5,
- _topClassP *= 1 + Math.trunc($arcologies[0].FSPhysicalIdealist / 20) * 0.001>>
+ <<set _FSScore += Math.min($arcologies[0].FSPhysicalIdealist, 100),
+ _slaveDemandU *= 1 + Math.trunc(Math.min($arcologies[0].FSPhysicalIdealist, 100) / 20) * 0.02,
+ _slaveDemandT *= 1 + Math.trunc(Math.min($arcologies[0].FSPhysicalIdealist, 100) / 20) * 0.025,
+ _slaveProductivity += Math.trunc(Math.min($arcologies[0].FSPhysicalIdealist, 100) / 20) * 0.01,
+ _lowerClass += Math.trunc(Math.min($arcologies[0].FSPhysicalIdealist, 100) / 20) * -40,
+ _lowerClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSPhysicalIdealist, 100) / 20) * -0.002,
+ _upperClass += Math.trunc(Math.min($arcologies[0].FSPhysicalIdealist, 100) / 20) * 2.7,
+ _upperClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSPhysicalIdealist, 100) / 20) * 0.001,
+ _topClass += Math.trunc(Math.min($arcologies[0].FSPhysicalIdealist, 100) / 20) * 0.5,
+ _topClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSPhysicalIdealist, 100) / 20) * 0.001>>
Fit slaves and citizens are more productive! However, your arcology's poor do not look forward to even more toil and sweat.
<</if>>
<<if $arcologies[0].FSChattelReligionist != "unset">>
- <<set _FSScore += $arcologies[0].FSChattelReligionist,
- _slaveDemandU *= 1 + Math.trunc($arcologies[0].FSChattelReligionist / 20) * 0.02,
- _slaveDemandT *= 1 + Math.trunc($arcologies[0].FSChattelReligionist / 20) * 0.025,
- _lowerClass += Math.trunc($arcologies[0].FSChattelReligionist / 20) * -40,
- _lowerClassP *= 1 + Math.trunc($arcologies[0].FSChattelReligionist / 20) * -0.002,
- _upperClass += Math.trunc($arcologies[0].FSChattelReligionist / 20) * 2.7,
- _upperClassP *= 1 + Math.trunc($arcologies[0].FSChattelReligionist / 20) * 0.001,
- _topClass += Math.trunc($arcologies[0].FSChattelReligionist / 20) * 0.5,
- _topClassP *= 1 + Math.trunc($arcologies[0].FSChattelReligionist / 20) * 0.001>>
+ <<set _FSScore += Math.min($arcologies[0].FSChattelReligionist, 100),
+ _slaveDemandU *= 1 + Math.trunc(Math.min($arcologies[0].FSChattelReligionist, 100) / 20) * 0.02,
+ _slaveDemandT *= 1 + Math.trunc(Math.min($arcologies[0].FSChattelReligionist, 100) / 20) * 0.025,
+ _lowerClass += Math.trunc(Math.min($arcologies[0].FSChattelReligionist, 100) / 20) * -40,
+ _lowerClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSChattelReligionist, 100) / 20) * -0.002,
+ _upperClass += Math.trunc(Math.min($arcologies[0].FSChattelReligionist, 100) / 20) * 2.7,
+ _upperClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSChattelReligionist, 100) / 20) * 0.001,
+ _topClass += Math.trunc(Math.min($arcologies[0].FSChattelReligionist, 100) / 20) * 0.5,
+ _topClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSChattelReligionist, 100) / 20) * 0.001>>
Chattel Religionism helps some poor citizens see slavery as a spiritually pure fate.
<</if>>
<<if $arcologies[0].FSRomanRevivalist != "unset">>
- <<set _FSScore += $arcologies[0].FSRomanRevivalist,
- _slaveDemandU *= 1 + Math.trunc($arcologies[0].FSRomanRevivalist / 20) * 0.02,
- _slaveDemandT *= 1 + Math.trunc($arcologies[0].FSRomanRevivalist / 20) * 0.025,
- _welfareFS *= 1 + Math.trunc($arcologies[0].FSRomanRevivalist / 20) * -0.05,
- _lowerClass += Math.trunc($arcologies[0].FSRomanRevivalist / 20) * 40,
- _lowerClassP *= 1 + Math.trunc($arcologies[0].FSRomanRevivalist / 20) * 0.002,
- _topClass += Math.trunc($arcologies[0].FSRomanRevivalist / 20) * -5.4,
- _topClassP *= 1 + Math.trunc($arcologies[0].FSRomanRevivalist / 20) * -0.002>>
+ <<set _FSScore += Math.min($arcologies[0].FSRomanRevivalist, 100),
+ _slaveDemandU *= 1 + Math.trunc(Math.min($arcologies[0].FSRomanRevivalist, 100) / 20) * 0.02,
+ _slaveDemandT *= 1 + Math.trunc(Math.min($arcologies[0].FSRomanRevivalist, 100) / 20) * 0.025,
+ _welfareFS *= 1 + Math.trunc(Math.min($arcologies[0].FSRomanRevivalist, 100) / 20) * -0.05,
+ _lowerClass += Math.trunc(Math.min($arcologies[0].FSRomanRevivalist, 100) / 20) * 40,
+ _lowerClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSRomanRevivalist, 100) / 20) * 0.002,
+ _topClass += Math.trunc(Math.min($arcologies[0].FSRomanRevivalist, 100) / 20) * -5.4,
+ _topClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSRomanRevivalist, 100) / 20) * -0.002>>
Your citizens take pride in looking after each other.
<</if>>
<<if $arcologies[0].FSEgyptianRevivalist != "unset">>
- <<set _FSScore += $arcologies[0].FSEgyptianRevivalist,
- _slaveDemandU *= 1 + Math.trunc($arcologies[0].FSEgyptianRevivalist / 20) * 0.02,
- _slaveDemandT *= 1 + Math.trunc($arcologies[0].FSEgyptianRevivalist / 20) * 0.025,
- _welfareFS *= 1 + Math.trunc($arcologies[0].FSEgyptianRevivalist / 20) * -0.05,
- _lowerClass += Math.trunc($arcologies[0].FSEgyptianRevivalist / 20) * 40,
- _lowerClassP *= 1 + Math.trunc($arcologies[0].FSEgyptianRevivalist / 20) * 0.002,
- _topClass += Math.trunc($arcologies[0].FSEgyptianRevivalist / 20) * -5.4,
- _topClassP *= 1 + Math.trunc($arcologies[0].FSEgyptianRevivalist / 20) * -0.002>>
+ <<set _FSScore += Math.min($arcologies[0].FSEgyptianRevivalist, 100),
+ _slaveDemandU *= 1 + Math.trunc(Math.min($arcologies[0].FSEgyptianRevivalist, 100) / 20) * 0.02,
+ _slaveDemandT *= 1 + Math.trunc(Math.min($arcologies[0].FSEgyptianRevivalist, 100) / 20) * 0.025,
+ _welfareFS *= 1 + Math.trunc(Math.min($arcologies[0].FSEgyptianRevivalist, 100) / 20) * -0.05,
+ _lowerClass += Math.trunc(Math.min($arcologies[0].FSEgyptianRevivalist, 100) / 20) * 40,
+ _lowerClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSEgyptianRevivalist, 100) / 20) * 0.002,
+ _topClass += Math.trunc(Math.min($arcologies[0].FSEgyptianRevivalist, 100) / 20) * -5.4,
+ _topClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSEgyptianRevivalist, 100) / 20) * -0.002>>
Egyptian Revivalism is benevolent in some ways, and charity is common here.
<</if>>
<<if $arcologies[0].FSEdoRevivalist != "unset">>
- <<set _FSScore += $arcologies[0].FSEdoRevivalist,
- _slaveDemandU *= 1 + Math.trunc($arcologies[0].FSEdoRevivalist / 20) * 0.02,
- _slaveDemandT *= 1 + Math.trunc($arcologies[0].FSEdoRevivalist / 20) * 0.025>>
+ <<set _FSScore += Math.min($arcologies[0].FSEdoRevivalist, 100),
+ _slaveDemandU *= 1 + Math.trunc(Math.min($arcologies[0].FSEdoRevivalist, 100) / 20) * 0.02,
+ _slaveDemandT *= 1 + Math.trunc(Math.min($arcologies[0].FSEdoRevivalist, 100) / 20) * 0.025>>
<</if>>
<<if $arcologies[0].FSArabianRevivalist != "unset">>
- <<set _FSScore += $arcologies[0].FSArabianRevivalist,
- _slaveDemandU *= 1 + Math.trunc($arcologies[0].FSArabianRevivalist / 20) * 0.02,
- _slaveDemandT *= 1 + Math.trunc($arcologies[0].FSArabianRevivalist / 20) * 0.025>>
+ <<set _FSScore += Math.min($arcologies[0].FSArabianRevivalist, 100),
+ _slaveDemandU *= 1 + Math.trunc(Math.min($arcologies[0].FSArabianRevivalist, 100) / 20) * 0.02,
+ _slaveDemandT *= 1 + Math.trunc(Math.min($arcologies[0].FSArabianRevivalist, 100) / 20) * 0.025>>
<</if>>
<<if $arcologies[0].FSChineseRevivalist != "unset">>
- <<set _FSScore += $arcologies[0].FSDegradationist,
- _slaveDemandU *= 1 + Math.trunc($arcologies[0].FSDegradationist / 20) * 0.02,
- _slaveDemandT *= 1 + Math.trunc($arcologies[0].FSDegradationist / 20) * 0.025>>
+ <<set _FSScore += Math.min($arcologies[0].FSDegradationist, 100),
+ _slaveDemandU *= 1 + Math.trunc(Math.min($arcologies[0].FSDegradationist, 100) / 20) * 0.02,
+ _slaveDemandT *= 1 + Math.trunc(Math.min($arcologies[0].FSDegradationist, 100) / 20) * 0.025>>
<</if>>
<<if $arcologies[0].FSAztecRevivalist != "unset">>
- <<set _FSScore += $arcologies[0].FSAztecRevivalist,
- _slaveDemandU *= 1 + Math.trunc($arcologies[0].FSAztecRevivalist / 20) * 0.02,
- _slaveDemandT *= 1 + Math.trunc($arcologies[0].FSAztecRevivalist / 20) * 0.025>>
+ <<set _FSScore += Math.min($arcologies[0].FSAztecRevivalist, 100),
+ _slaveDemandU *= 1 + Math.trunc(Math.min($arcologies[0].FSAztecRevivalist, 100) / 20) * 0.02,
+ _slaveDemandT *= 1 + Math.trunc(Math.min($arcologies[0].FSAztecRevivalist, 100) / 20) * 0.025>>
<</if>>
<<if $arcologies[0].FSNull != "unset">>
- <<set _FSScore += $arcologies[0].FSNull,
- _slaveDemandU *= 1 + Math.trunc($arcologies[0].FSNull / 20) * -0.02,
- _slaveDemandT *= 1 + Math.trunc($arcologies[0].FSNull / 20) * -0.025,
- _lowerClass += Math.trunc($arcologies[0].FSNull / 20) * 80,
- _lowerClassP *= 1 + Math.trunc($arcologies[0].FSNull / 20) * 0.004,
- _middleClass += Math.trunc($arcologies[0].FSNull / 20) * 16,
- _middleClassP *= 1 + Math.trunc($arcologies[0].FSNull / 20) * 0.002,
- _upperClass += Math.trunc($arcologies[0].FSNull / 20) * -5.4,
- _upperClassP *= 1 + Math.trunc($arcologies[0].FSNull / 20) * -0.002,
- _topClass += Math.trunc($arcologies[0].FSNull / 20) * -2,
- _topClassP *= 1 + Math.trunc($arcologies[0].FSNull / 20) * -0.004>>
+ <<set _FSScore += Math.min($arcologies[0].FSNull, 100),
+ _slaveDemandU *= 1 + Math.trunc(Math.min($arcologies[0].FSNull, 100) / 20) * -0.02,
+ _slaveDemandT *= 1 + Math.trunc(Math.min($arcologies[0].FSNull, 100) / 20) * -0.025,
+ _lowerClass += Math.trunc(Math.min($arcologies[0].FSNull, 100) / 20) * 80,
+ _lowerClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSNull, 100) / 20) * 0.004,
+ _middleClass += Math.trunc(Math.min($arcologies[0].FSNull, 100) / 20) * 16,
+ _middleClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSNull, 100) / 20) * 0.002,
+ _upperClass += Math.trunc(Math.min($arcologies[0].FSNull, 100) / 20) * -5.4,
+ _upperClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSNull, 100) / 20) * -0.002,
+ _topClass += Math.trunc(Math.min($arcologies[0].FSNull, 100) / 20) * -2,
+ _topClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSNull, 100) / 20) * -0.004>>
Your arcology's vibrant, open culture helps everyone succeed, preventing many struggling citizens from falling into slavery.
<</if>>
<<if $arcologies[0].FSRepopulationFocus != "unset">>
- <<set _FSScore += $arcologies[0].FSRepopulationFocus,
- _slaveDemandU *= 1 + Math.trunc($arcologies[0].FSRepopulationFocus / 20) * 0.04,
- _slaveDemandT *= 1 + Math.trunc($arcologies[0].FSRepopulationFocus / 20) * 0.05,
- _slaveProductivity += Math.trunc($arcologies[0].FSRepopulationFocus / 20) * -0.01,
- _lowerClass += Math.trunc($arcologies[0].FSRepopulationFocus / 20) * 80,
- _lowerClassP *= 1 + Math.trunc($arcologies[0].FSRepopulationFocus / 20) * 0.004,
- _middleClass += Math.trunc($arcologies[0].FSRepopulationFocus / 20) * 16,
- _middleClassP *= 1 + Math.trunc($arcologies[0].FSRepopulationFocus / 20) * 0.002,
- _upperClass += Math.trunc($arcologies[0].FSRepopulationFocus / 20) * -5.4,
- _upperClassP *= 1 + Math.trunc($arcologies[0].FSRepopulationFocus / 20) * -0.002,
- _topClass += Math.trunc($arcologies[0].FSRepopulationFocus / 20) * -2,
- _topClassP *= 1 + Math.trunc($arcologies[0].FSRepopulationFocus / 20) * -0.004>>
+ <<set _FSScore += Math.min($arcologies[0].FSRepopulationFocus, 100),
+ _slaveDemandU *= 1 + Math.trunc(Math.min($arcologies[0].FSRepopulationFocus, 100) / 20) * 0.04,
+ _slaveDemandT *= 1 + Math.trunc(Math.min($arcologies[0].FSRepopulationFocus, 100) / 20) * 0.05,
+ _slaveProductivity += Math.trunc(Math.min($arcologies[0].FSRepopulationFocus, 100) / 20) * -0.01,
+ _lowerClass += Math.trunc(Math.min($arcologies[0].FSRepopulationFocus, 100) / 20) * 80,
+ _lowerClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSRepopulationFocus, 100) / 20) * 0.004,
+ _middleClass += Math.trunc(Math.min($arcologies[0].FSRepopulationFocus, 100) / 20) * 16,
+ _middleClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSRepopulationFocus, 100) / 20) * 0.002,
+ _upperClass += Math.trunc(Math.min($arcologies[0].FSRepopulationFocus, 100) / 20) * -5.4,
+ _upperClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSRepopulationFocus, 100) / 20) * -0.002,
+ _topClass += Math.trunc(Math.min($arcologies[0].FSRepopulationFocus, 100) / 20) * -2,
+ _topClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSRepopulationFocus, 100) / 20) * -0.004>>
You've made repopulation a priority and the less fortunate hope all these new children will make their lives easier in the future, but the wealthy are wary.
<</if>>
<<if $arcologies[0].FSRestart != "unset">>
- <<set _FSScore += $arcologies[0].FSRestart,
- _slaveDemandU *= 1 + Math.trunc($arcologies[0].FSRestart / 20) * 0.04,
- _slaveDemandT *= 1 + Math.trunc($arcologies[0].FSRestart / 20) * 0.05,
- _lowerClass += Math.trunc($arcologies[0].FSRestart / 20) * -80,
- _lowerClassP *= 1 + Math.trunc($arcologies[0].FSRestart / 20) * -0.004,
- _middleClass += Math.trunc($arcologies[0].FSRestart / 20) * -16,
- _middleClassP *= 1 + Math.trunc($arcologies[0].FSRestart / 20) * -0.002,
- _upperClass += Math.trunc($arcologies[0].FSRestart / 20) * 5.4,
- _upperClassP *= 1 + Math.trunc($arcologies[0].FSRestart / 20) * 0.002,
- _topClass += Math.trunc($arcologies[0].FSRestart / 20) * 2,
- _topClassP *= 1 + Math.trunc($arcologies[0].FSRestart / 20) * 0.004>>
+ <<set _FSScore += Math.min($arcologies[0].FSRestart, 100),
+ _slaveDemandU *= 1 + Math.trunc(Math.min($arcologies[0].FSRestart, 100) / 20) * 0.04,
+ _slaveDemandT *= 1 + Math.trunc(Math.min($arcologies[0].FSRestart, 100) / 20) * 0.05,
+ _lowerClass += Math.trunc(Math.min($arcologies[0].FSRestart, 100) / 20) * -80,
+ _lowerClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSRestart, 100) / 20) * -0.004,
+ _middleClass += Math.trunc(Math.min($arcologies[0].FSRestart, 100) / 20) * -16,
+ _middleClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSRestart, 100) / 20) * -0.002,
+ _upperClass += Math.trunc(Math.min($arcologies[0].FSRestart, 100) / 20) * 5.4,
+ _upperClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSRestart, 100) / 20) * 0.002,
+ _topClass += Math.trunc(Math.min($arcologies[0].FSRestart, 100) / 20) * 2,
+ _topClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSRestart, 100) / 20) * 0.004>>
Highly restricted breeding pleases the powerful, but the less fortunate may seek reproductive freedom elsewhere.
<</if>>
<<if $arcologies[0].FSHedonisticDecadence != "unset">>
- <<set _FSScore += $arcologies[0].FSHedonisticDecadence,
- _slaveDemandU *= 1 + Math.trunc($arcologies[0].FSHedonisticDecadence / 20) * 0.02,
- _slaveDemandT *= 1 + Math.trunc($arcologies[0].FSHedonisticDecadence / 20) * 0.025,
- _slaveProductivity += Math.trunc($arcologies[0].FSHedonisticDecadence / 20) * -0.01,
- _lowerClass += Math.trunc($arcologies[0].FSHedonisticDecadence / 20) * 40,
- _lowerClassP *= 1 + Math.trunc($arcologies[0].FSHedonisticDecadence / 20) * 0.002,
- _middleClass += Math.trunc($arcologies[0].FSHedonisticDecadence / 20) * -16,
- _middleClassP *= 1 + Math.trunc($arcologies[0].FSHedonisticDecadence / 20) * -0.002,
- _upperClass += Math.trunc($arcologies[0].FSHedonisticDecadence / 20) * -5.4,
- _upperClassP *= 1 + Math.trunc($arcologies[0].FSHedonisticDecadence / 20) * -0.002,
- _topClass += Math.trunc($arcologies[0].FSHedonisticDecadence / 20),
- _topClassP *= 1 + Math.trunc($arcologies[0].FSHedonisticDecadence / 20) * 0.002>>
+ <<set _FSScore += Math.min($arcologies[0].FSHedonisticDecadence, 100),
+ _slaveDemandU *= 1 + Math.trunc(Math.min($arcologies[0].FSHedonisticDecadence, 100) / 20) * 0.02,
+ _slaveDemandT *= 1 + Math.trunc(Math.min($arcologies[0].FSHedonisticDecadence, 100) / 20) * 0.025,
+ _slaveProductivity += Math.trunc(Math.min($arcologies[0].FSHedonisticDecadence, 100) / 20) * -0.01,
+ _lowerClass += Math.trunc(Math.min($arcologies[0].FSHedonisticDecadence, 100) / 20) * 40,
+ _lowerClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSHedonisticDecadence, 100) / 20) * 0.002,
+ _middleClass += Math.trunc(Math.min($arcologies[0].FSHedonisticDecadence, 100) / 20) * -16,
+ _middleClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSHedonisticDecadence, 100) / 20) * -0.002,
+ _upperClass += Math.trunc(Math.min($arcologies[0].FSHedonisticDecadence, 100) / 20) * -5.4,
+ _upperClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSHedonisticDecadence, 100) / 20) * -0.002,
+ _topClass += Math.trunc(Math.min($arcologies[0].FSHedonisticDecadence, 100) / 20),
+ _topClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSHedonisticDecadence, 100) / 20) * 0.002>>
Your citizens enjoy the pleasures of life to their fullest, but some prefer to earn these pleasures.
<</if>>
@@ -586,25 +586,29 @@ $lowerClass -= _enslaved>>
/*Bad weather switch*/
<<if $weatherToday.severity > 3>>
<<if $secExp == 1>>
- <<if $docks || $railway < 4>>
+ <<if $docks && $railway < 4>>
<<set _weatherFreeze = 1>>
+ <br>//The terrible weather is @@.red;preventing people from entering or leaving@@ your arcology. Improving your transport infrastructure will prevent this from happening.//
<<else>>
<<set _weatherFreeze = 0>>
<</if>>
<<elseif $antiWeatherFreeze < 2>>
<<set _weatherFreeze = 1>>
+ <br>//The terrible weather is @@.red;preventing people from entering or leaving@@ your arcology. Improving your transport infrastructure will prevent this from happening.//
<<else>>
<<set _weatherFreeze = 0>>
<</if>>
<<elseif $weatherToday.severity > 2>>
<<if $secExp == 1>>
- <<if $docks || $railway < 3>>
+ <<if $docks && $railway < 3>>
<<set _weatherFreeze = 1>>
+ <br>//The terrible weather is @@.red;preventing people from entering or leaving@@ your arcology. Improving your transport infrastructure will prevent this from happening.//
<<else>>
<<set _weatherFeeze = 0>>
<</if>>
<<elseif $antiWeatherFreeze < 1>>
<<set _weatherFreeze = 1>>
+ <br>//The terrible weather is @@.red;preventing people from entering or leaving@@ your arcology. Improving your transport infrastructure will prevent this from happening.//
<<else>>
<<set _weatherFreeze = 0>>
<</if>>
@@ -651,18 +655,8 @@ $lowerClass -= _enslaved>>
<<set _LSCD = Math.trunc(($LSCBase * ($localEcon / 100)) + ($arcologies[0].prosperity * 4) + (($middleClass + $visitors * 0.6) * 1.5) + (($upperClass + $visitors * 0.2) * 3.5) + ($topClass * 18)),
/*Demand for owning slaves*/
_SCD = Math.trunc(($upperClass * ($slaveDemandU + _slaveDemandU)) + ($topClass * ($slaveDemandT + _slaveDemandT)))>>
-/*More slaves than there is work*/
-<<if $NPCSlaves > (_LSCD / ($slaveProductivity + _slaveProductivity)) - $helots + _SCD>>
- <<set _NPCSlavesSold = $NPCSlaves - Math.trunc(_LSCD / ($slaveProductivity + _slaveProductivity) - $helots + _SCD),
- $menialDemandFactor -= _NPCSlavesSold,
- $NPCSlaves = Math.trunc(_LSCD / ($slaveProductivity + _slaveProductivity))>>
- <<if _NPCSlavesSold > 1>>
- <br>@@.red;<<print _NPCSlavesSold>> slaves@@ were sold by your inhabitants. There was so little work that they failed to earn their keep.
- <<elseif _NPCSlavesSold > 0>>
- <br>@@.red;One slave was sold by your inhabitants. There was so little work that it failed to earn its keep.
- <</if>>
/*More slaves than they know what to do with*/
-<<elseif $NPCSlaves > _SCD * 1.6>>
+<<if $NPCSlaves > _SCD * 1.6>>
<<set _NPCSlavesSold = $NPCSlaves - Math.trunc(_SCD * 1.6),
$menialDemandFactor -= _NPCSlavesSold,
$NPCSlaves = Math.trunc(_SCD * 1.6)>>
@@ -671,6 +665,16 @@ _SCD = Math.trunc(($upperClass * ($slaveDemandU + _slaveDemandU)) + ($topClass *
<<elseif _NPCSlavesSold > 0>>
<br>@@.red;One slave@@ was sold by your inhabitants. They've got more than enough of them already.
<</if>>
+/*More slaves than there is work*/
+<<elseif $NPCSlaves > (_LSCD / ($slaveProductivity + _slaveProductivity)) - $helots + _SCD>>
+ <<set _NPCSlavesSold = $NPCSlaves - Math.trunc(_LSCD / ($slaveProductivity + _slaveProductivity) - $helots + _SCD),
+ $menialDemandFactor -= _NPCSlavesSold,
+ $NPCSlaves = Math.trunc(_LSCD / ($slaveProductivity + _slaveProductivity))>>
+ <<if _NPCSlavesSold > 1>>
+ <br>@@.red;<<print _NPCSlavesSold>> slaves@@ were sold by your inhabitants. There was so little work that they failed to earn their keep.
+ <<elseif _NPCSlavesSold > 0>>
+ <br>@@.red;One slave was sold by your inhabitants. There was so little work that it failed to earn its keep.
+ <</if>>
/*Cutting back on slaves*/
<<elseif $NPCSlaves > _SCD * 1.4>>
<<if $slaveCostFactor > 0.95>>
@@ -759,7 +763,7 @@ _SCD = Math.trunc(($upperClass * ($slaveDemandU + _slaveDemandU)) + ($topClass *
/*Need more slaves still*/
<<if $NPCSlaves < _SCD>>
<<set _NPCSlavesBought = Math.trunc((_SCD - $NPCSlaves) * 0.75) + 1,
- $menialSupplyFactor - _NPCSlavesBought,
+ $menialSupplyFactor -= _NPCSlavesBought,
$NPCSlaves += _NPCSlavesBought>>
<<if _NPCSlavesBought > 1>>
<br>@@.green;<<print _NPCSlavesBought>> slaves@@ were bought by your inhabitants. They did not have enough of them to satisfy their needs.
diff --git a/src/uncategorized/pit.tw b/src/uncategorized/pit.tw
index c81d2202f98a7781569199dd9025c6f50eb5d452..545cfec7a7711cdc58690b85e62c8197ad1328c5 100644
--- a/src/uncategorized/pit.tw
+++ b/src/uncategorized/pit.tw
@@ -1,6 +1,6 @@
:: Pit [nobr]
-<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Pit", $showEncyclopedia = 1, $encyclopedia = "Pit", _DL = $fighterIDs.length, _SL = $slaves.length>>
+<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Pit", $showEncyclopedia = 1, $encyclopedia = "Pit", _DL = $fighterIDs.length, _SL = $slaves.length, _CL = $canines.length, _HL = $hooved.length, _FL = $felines.length>>
<<showallAssignmentFilter>>
<<if $pitName != "the Pit">>
<<set $pitNameCaps = $pitName.replace("the ", "The ")>>
@@ -19,7 +19,7 @@ $pitNameCaps is clean and ready,
<<else>>
but no slaves are assigned to fight.
<<link "Decommission the pit" "Main">>
- <<set $pit = 0>>
+ <<set $pit = 0, $pitAnimal = 0, $pitAnimalType = 0>>
<<set _pit = $sectors.findIndex(function(s) { return s.type == "Pit"; })>>
<<if _pit != -1>>
<<set $sectors[_pit].type = "Markets">>
@@ -38,16 +38,20 @@ $pitNameCaps is clean and ready,
Admission is charged to the fights here. [[Close them|Pit][$pitAudience = "none"]] | [[Stop charging|Pit][$pitAudience = "free"]]
<</if>>
-<<if $Bodyguard != 0 || $farmyardKennels > 0 || $farmyardStable > 0 || $farmyardCages > 0>>
+<<if $Bodyguard != 0 || _CL > 0 || _HL > 0 || _FL > 0>>
<br>
<<if $pitBG == 0>>
<<if $pitAnimal == 0>>
- Two fighters will be selected from the pool at random. <<if $Bodyguard != 0>>[[Guarantee your Bodyguard a slot|Pit][$pitBG = 1, $pitAnimal = 0]]<</if>><<if $farmyardKennels > 0 || $farmyardStable > 0 || $farmyardCages > 0>> | [[Have a slave fight an animal|Pit][$pitBG = 0, $pitAnimal = 1]]<</if>>
+ Two fighters will be selected from the pool at random.
+ <<if $Bodyguard != 0>>[[Guarantee your Bodyguard a slot|Pit][$pitBG = 1, $pitAnimal = 0]]<</if>>
+ <<if $Bodyguard != 0 && ($activeCanine != 0 || $activeHooved != 0 || $activeFeline != 0)>> | <</if>>
+ <<if $activeCanine != 0 || $activeHooved != 0 || $activeFeline != 0>>[[Have a slave fight an animal|Pit][$pitBG = 0, $pitAnimal = 1]]<</if>>
<<else>>
A random slave will fight an animal. [[Have them fight another slave|Pit][$pitBG = 0, $pitAnimal = 0]]<<if $Bodyguard != 0>> | [[Have them fight your Bodyguard|Pit][$pitBG = 1, $pitAnimal = 0]]<</if>>
<</if>>
<<else>>
- Your Bodyguard will fight a slave selected from the pool at random. [[Make both slots random|Pit][$pitBG = 0, $pitAnimal = 0]]<<if $farmyardKennels > 0 || $farmyardStable > 0 || $farmyardCages > 0>> | [[Have a slave fight an animal|Pit][$pitBG = 0, $pitAnimal = 1]]<</if>>
+ Your Bodyguard will fight a slave selected from the pool at random. [[Make both slots random|Pit][$pitBG = 0, $pitAnimal = 0]]
+ <<if $_CL > 0 || $_HL > 0 || $_FL > 0>> | [[Have a slave fight an animal|Pit][$pitBG = 0, $pitAnimal = 1]]<</if>>
<</if>>
<</if>>
@@ -90,6 +94,8 @@ $pitNameCaps is clean and ready,
<</if>>
<</if>>
+<<if $activeCanine != 0 || $activeHooved != 0 || $activeFeline != 0>>
+
<<switch $activeCanine.breed>>
<<case "French Bulldog" "Beagle" "Poodle" "Yorkshire Terrier">>
<<set _animalEligible = 0>>
@@ -100,14 +106,14 @@ $pitNameCaps is clean and ready,
<<if $pitAnimal == 1>>
<br>
<<if $pitLethal == 1>>
- <<if $pitAnimalType == $activeCanine.species>>
+ <<if $pitAnimalType === $activeCanine>>
<<if $activeCanine.species != "dog">>
Your slave will fight a ''$activeCanine.species''.
$activeCanine.speciesCap
- <<if $farmyardStable > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved.species]]<</if>>
- <<if $farmyardCages > 0>> |
+ <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved]]<</if>>
+ <<if _FL > 0>> |
<<if $activeFeline.species != "cat">>
- [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline.species]]
+ [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline]]
<<else>>
//Housecats are too small for your slave to fight//
<</if>>
@@ -116,65 +122,65 @@ $pitNameCaps is clean and ready,
<<if _animalEligible == 1>>
Your slave will fight a ''$activeCanine.breed''.
$activeCanine.breed
- <<if $farmyardStable > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved.species]]<</if>>
- <<if $farmyardCages > 0>> |
+ <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved]]<</if>>
+ <<if _FL > 0>> |
<<if $activeFeline.species != "cat">>
- [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline.species]]
+ [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline]]
<<else>>
//Housecats are too small for your slave to fight//
<</if>>
<</if>>
<<else>>
//<<print $activeCanine.breed>>s are too small for your slave to fight//
- <<if $farmyardStable > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved.species]]<</if>>
- <<if $farmyardCages > 0>> |
+ <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved]]<</if>>
+ <<if _FL > 0>> |
<<if $activeFeline.species != "cat">>
- [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline.species]]
+ [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline]]
<<else>>
//Housecats are too small for your slave to fight//
<</if>>
<</if>>
<</if>>
<</if>>
- <<elseif $pitAnimalType == $activeHooved.species>>
+ <<elseif $pitAnimalType === $activeHooved>>
Your slave will fight a ''$activeHooved.species''.
- <<if $farmyardKennels > 0>>
+ <<if _CL > 0>>
<<if $activeCanine.species != "dog">>
- [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = $activeCanine.species]] |
+ [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = $activeCanine]] |
<<else>>
<<if _animalEligible == 1>>
- [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = $activeCanine.species]] |
+ [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = $activeCanine]] |
<<else>>
//<<print $activeCanine.breed>>s are too small for your slave to fight// |
<</if>>
<</if>>
<</if>>
$activeHooved.speciesCap
- <<if $farmyardCages > 0>> |
+ <<if _FL > 0>> |
<<if $activeFeline.species != "cat">>
- [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline.species]]
+ [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline]]
<<else>>
//Housecats are too small for your slave to fight//
<</if>>
<</if>>
- <<elseif $pitAnimalType == $activeFeline.species>>
+ <<elseif $pitAnimalType === $activeFeline>>
<<if $activeFeline.species != "cat">>
Your slave will fight a ''$activeFeline.species''.
<<else>>
//Housecats are too small for your slave to fight//
<</if>>
- <<if $farmyardKennels > 0>>
+ <<if _CL > 0>>
<<if $activeCanine.species != "dog">>
- [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = $activeCanine.species]]
+ [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = $activeCanine]]
<<else>>
<<if _animalEligible == 1>>
- [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = $activeCanine.species]]
+ [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = $activeCanine]]
<<else>>
//<<print $activeCanine.breed>>s are too small for your slave to fight//
<</if>>
<</if>>
<</if>>
- <<if $farmyardStable > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved.species]] | <</if>>
+ <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved]] | <</if>>
<<if $activeFeline.species != "cat">>
$activeFeline.speciesCap
<<else>>
@@ -182,28 +188,30 @@ $pitNameCaps is clean and ready,
<</if>>
<<else>>
Select an animal for your slave to fight.
- <<if $farmyardKennels > 0>>
+ <<if _CL > 0>>
<<if $activeCanine.species != "dog">>
- [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = $activeCanine.species]]
+ [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = $activeCanine]]
<<else>>
<<if _animalEligible == 1>>
- [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = $activeCanine.species]]
+ [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = $activeCanine]]
<<else>>
//<<print $activeCanine.breed>>s are too small for your slave to fight//
<</if>>
<</if>>
<</if>>
- <<if ($farmyardCages > 0 && $farmyardStable > 0) || ($farmyardCages > 0 && $farmyardKennels > 0) || ($farmyardStable > 0 && $farmyardKennels > 0)>> | <</if>>
- <<if $farmyardStable > 0>>[["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved.species]]<</if>>
- <<if ($farmyardStable > 0 && $farmyardCages > 0)>> | <</if>>
+ /* yes, this block is a mess. if you figure out a cleaner way to do it, let me know */
+ <<if (_FL > 0 && _HL > 0) || (_FL > 0 && _CL > 0) || (_HL > 0 && _CL > 0)>> | <</if>>
+ <<if _HL > 0>>[["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved]]<</if>>
+ <<if (_HL > 0 && _FL > 0)>> | <</if>>
<<if $activeFeline.species != "cat">>
- [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline.species]]
+ [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline]]
<<else>>
//Housecats are too small for your slave to fight//
<</if>>
+
<</if>>
<<elseif $pitLethal == 0>>
- <<if $pitAnimalType == $activeCanine.species>>
+ <<if $pitAnimalType === $activeCanine>>
<<if $activeCanine.species != "dog">>
Your slave will try to avoid being used by a ''$activeCanine.species''.
$activeCanine.speciesCap
@@ -211,73 +219,73 @@ $pitNameCaps is clean and ready,
<<if _animalEligible == 1>>
Your slave will try to avoid being used by a ''$activeCanine.breed''.
$activeCanine.breed
- <<if $farmyardStable > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved.species]]<</if>>
- <<if $farmyardCages > 0>> |
+ <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved]]<</if>>
+ <<if _FL > 0>> |
<<if $activeFeline.species != "cat">>
- [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline.species]]
+ [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline]]
<<else>>
//Housecats are too small to use your slave//
<</if>>
<</if>>
<<else>>
//<<print $activeCanine.breed>>s are too small to use your slave//
- <<if $farmyardStable > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved.species]]<</if>>
- <<if $farmyardCages > 0>> |
+ <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved]]<</if>>
+ <<if _FL > 0>> |
<<if $activeFeline.species != "cat">>
- [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline.species]]
+ [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline]]
<<else>>
//Housecats are too small to use your slave//
<</if>>
<</if>>
<</if>>
<</if>>
- <<if $farmyardStable > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved.species]]<</if>>
- <<if $farmyardCages > 0>> |
+ <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved]]<</if>>
+ <<if _FL > 0>> |
<<if $activeFeline.species != "cat">>
- [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline.species]]
+ [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline]]
<<else>>
//Housecats are too small to use your slave//
<</if>>
<</if>>
- <<elseif $pitAnimalType == $activeHooved.species>>
+ <<elseif $pitAnimalType === $activeHooved>>
Your slave will try to avoid being used by a ''$activeHooved.species''.
- <<if $farmyardKennels > 0>>
+ <<if _CL > 0>>
<<if $activeCanine.species != "dog">>
- [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = $activeCanine.species]] |
+ [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = $activeCanine]] |
<<else>>
<<if _animalEligible == 1>>
- [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = $activeCanine.species]] |
+ [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = $activeCanine]] |
<<else>>
//<<print $activeCanine.breed>>s are too small for your slave to fight// |
<</if>>
<</if>>
<</if>>
$activeHooved.speciesCap
- <<if $farmyardCages > 0>> |
+ <<if _FL > 0>> |
<<if $activeFeline.species != "cat">>
- [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline.species]]
+ [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline]]
<<else>>
//Housecats are too small to use your slave//
<</if>>
<</if>>
- <<elseif $pitAnimalType == $activeFeline.species>>
+ <<elseif $pitAnimalType === $activeFeline>>
<<if $activeFeline.species != "cat">>
Your slave will try to avoid being used by a ''$activeFeline.species''.
<<else>>
//Housecats are too small to use your slave//
<</if>>
- <<if $farmyardKennels > 0>>
+ <<if _CL > 0>>
<<if $activeCanine.species != "dog">>
- [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = $activeCanine.species]]
+ [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = $activeCanine]]
<<else>>
<<if _animalEligible == 1>>
- [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = $activeCanine.species]]
+ [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = $activeCanine]]
<<else>>
//<<print $activeCanine.breed>>s are too small for your slave to fight//
- <</if>>
+ <</if>>
<</if>>
<</if>>
- <<if $farmyardStable > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved.species]] | <</if>>
+ <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved]] | <</if>>
<<if $activeFeline.species != "cat">>
$activeFeline.speciesCap
<<else>>
@@ -285,23 +293,23 @@ $pitNameCaps is clean and ready,
<</if>>
<<else>>
Select an animal for your slave to try to avoid.
- <<if $farmyardKennels > 0>>
+ <<if _CL > 0>>
<<if $activeCanine.species != "dog">>
- [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = $activeCanine.species]]
+ [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = $activeCanine]]
<<else>>
<<if _animalEligible == 1>>
- [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = $activeCanine.species]]
+ [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = $activeCanine]]
<<else>>
//<<print $activeCanine.breed>>s are too small for your slave to fight//
<</if>>
<</if>>
<</if>>
- <<if ($farmyardCages > 0 && $farmyardStable > 0) || ($farmyardCages > 0 && $farmyardKennels > 0) || ($farmyardStable > 0 && $farmyardKennels > 0)>> | <</if>>
- <<if $farmyardStable > 0>>[["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved.species]]<</if>>
- <<if ($farmyardStable > 0 && $farmyardCages > 0)>> | <</if>>
+ <<if (_FL > 0 && _HL > 0) || (_FL > 0 && _CL > 0) || (_HL > 0 && _CL > 0)>> | <</if>>
+ <<if _HL > 0>>[["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved]]<</if>>
+ <<if (_HL > 0 && _FL > 0)>> | <</if>>
<<if $activeFeline.species != "cat">>
- <<if $farmyardCages > 0>>
- [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline.species]]
+ <<if _FL > 0>>
+ [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline]]
<<else>>
//Housecats are too small to use your slave//
<</if>>
@@ -311,6 +319,7 @@ $pitNameCaps is clean and ready,
<<else>>
<<set $pitAnimalType = 0>>
<</if>>
+<</if>>
<<if _DL > 0>>
<br><br>''Cancel a slave's fight:''
diff --git a/src/uncategorized/seLethalPit.tw b/src/uncategorized/seLethalPit.tw
index b97509045a02a8142dda6901642e186f3de91bc8..fa8b3ad52db9b98107f06ea55befa0f01ba54a95 100644
--- a/src/uncategorized/seLethalPit.tw
+++ b/src/uncategorized/seLethalPit.tw
@@ -15,22 +15,29 @@
<<goto "Nonrandom Event">>
<</if>>
<<else>>
- <<switch $pitAnimalType>>
- <<case "wolf" "fox" "jackal" "dingo">>
+ <<switch $pitAnimalType.type>>
+ <<case "canine">>
<<set _animal = $activeCanine>>
- <<case "horse">>
+ <<case "hooved">>
<<set _animal = $activeHooved>>
- <<case "cougar" "jaguar" "lynx" "leopard" "lion" "tiger">>
+ <<case "feline">>
<<set _animal = $activeFeline>>
<<default>>
<<set _animal = "undefined">>
<</switch>>
<</if>>
-<<if $pitAnimal > 0 && _animal == "undefined">>
+<<if $pitAnimal > 0 && _animal == "undefined">> /* TODO: this doesn't work */
This week, _fighterOne.slaveName was scheduled to fight an animal to the death, but was spared because no animal has been chosen.
<<else>>
- This week's pit fight is between _fighterOne.slaveName and <<if $pitAnimal == 0>>_fighterTwo.slaveName<<else>>a _animal.species<</if>>. <<if $pitAudience == "none">>You are alone above the pit, left to watch them kill and die in private.<<elseif $pitAudience == "free">>Your guests line the rim of the pit, joking and betting, nervous and excited by the close prospect of watching a girl die.<<else>>The attendees line the rim of the pit, betting and arguing, nervous and excited by the close prospect of watching a girl die.<</if>>
+ This week's pit fight is between _fighterOne.slaveName and <<if $pitAnimal == 0>>_fighterTwo.slaveName<<else>>a _animal.species<</if>>.
+ <<if $pitAudience == "none">>
+ You are alone above the pit, left to watch them kill and die in private.
+ <<elseif $pitAudience == "free">>
+ Your guests line the rim of the pit, joking and betting, nervous and excited by the close prospect of watching a girl die.
+ <<else>>
+ The attendees line the rim of the pit, betting and arguing, nervous and excited by the close prospect of watching a girl die.
+ <</if>>
<</if>>
<<if $arcologies[0].FSRomanRevivalist != "unset">>
@@ -351,11 +358,11 @@ You review the rules - the <<if $pitAnimal == 0>>combatants<<else>>slave<</if>>
<<else>> /*if fighting an animal*/
<<set $activeSlave = _fighterOne>>
<<set _fighterTwo = _animal>>
- <<switch $pitAnimalType>>
- <<case "hooved">>
- <<set _fighterTwoDeadliness = (random(1,3))>>
+ <<switch $pitAnimalType.type>>
<<case "canine">>
<<set _fighterTwoDeadliness = (random(2,4))>>
+ <<case "hooved">>
+ <<set _fighterTwoDeadliness = (random(1,3))>>
<<case "feline">>
<<set _fighterTwoDeadliness = (random(2,6))>>
<</switch>>
diff --git a/src/uncategorized/seNonlethalPit.tw b/src/uncategorized/seNonlethalPit.tw
index a1f26a53a651c424c8eace67661f06726e979d8d..b4fa75afd318a8e14680d30102f2241c7b5fe32c 100644
--- a/src/uncategorized/seNonlethalPit.tw
+++ b/src/uncategorized/seNonlethalPit.tw
@@ -15,12 +15,12 @@
<<goto "Nonrandom Event">>
<</if>>
<<else>>
- <<switch $pitAnimalType>>
- <<case "wolf" "fox" "jackal" "dingo">>
+ <<switch $pitAnimalType.type>>
+ <<case "canine">>
<<set _animal = $activeCanine>>
- <<case "horse">>
+ <<case "hooved">>
<<set _animal = $activeHooved>>
- <<case "cougar" "jaguar" "lynx" "leopard" "lion" "tiger">>
+ <<case "feline">>
<<set _animal = $activeFeline>>
<<default>>
<<set _animal = "undefined">>