diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 7070ebcaf7f6b081ffb427cee51ba5d3eb2c3170..6bcb641233280372f31a1efcdaad27503d8a0017 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -1820,7 +1820,7 @@ window.setPregType = function(actor) {
ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 0, 1]); //base chance for twins
}
if(actor.ovaImplant == "fertility") {
- ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 0, 1]);
+ ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 0, 1]);
fertilityStack++;
}
if(actor.hormones == 2) {
@@ -10512,6 +10512,111 @@ window.removeJob = function removeJob(slave, assignment) {
return r;
};
+/*:: birthJS [script]*/
+
+window.BirthDestinationText = function(choice,slave) {
+ const V = State.variables,T = State.temporary,sn = SlaveFullName(slave);
+ var r = ``;
+ if (T.call !== 1) { if (choice !== "Private") r += `sent to one of ${arcologies[0].name}'s `;
+ } else { if (choice !== "Sold") r += ` ${sn} `;
+ }
+ switch(choice) {
+ case "Breeder":
+ if (T.call !== 1) r += `future minded schools, to be administered fertility and virility treatments as well as be brought up to take pride in reproduction. ${sn} `;
+ if (slave.fetish == "mindbroken" || slave.fuckdoll > 0) {
+ r += `has few thoughts about the matter.`;
+ } else if (slave.devotion > 95) {
+ r += `loves you already, but ${V.he}'ll <span class='hotpink'>love you even more</span> for this. ${V.he} can't wait to see ${V.his} child${T.count > 1 ? 'ren':''} proudly furthering your cause.`;
+ slave.devotion += 4;
+ } else if (slave.devotion > 50) {
+ r += `heard about these and will be <span class='hotpink;happy that ${V.his} child${T.count > 1 ? 'ren':''} will have a purpose in your society other than slavery.</span> ${V.he} will miss ${V.his} child${T.count > 1 ? 'ren':''}, but ${V.he} expected that.`;
+ slave.devotion += 4;
+ } else if (slave.devotion > 20) {
+ r += `will naturally miss ${V.his} child${T.count > 1 ? 'ren':''}, but will is broken enough to hope that ${V.his} offspring will have a better life, or at least an enjoyable one.`;
+ } else {
+ r += `will of course <span class='mediumorchid'>hate you for this.</span> The mere thought of ${V.his} ${fertilityAge} year old daughter${T.count > 1 ? 's':''} swollen with life, and proud of it, fills ${V.him} with <span class='gold'>disdain.</span>`;
+ slave.devotion -= 4, slave.trust -= 4;
+ }
+ break;
+ case "Orphanage":
+ if (slave.fetish == "mindbroken" || slave.fuckdoll > 0) {
+ r += `has few thoughts about the matter.`;
+ } else if (slave.devotion > 95) {
+ r += `worships you so completely that ${V.he} will not resent this.`;
+ } else if ( slave.devotion > 50) {
+ r += `is devoted to you, but ${V.he} will <span class='mediumorchid'>struggle to accept this.</span>`;
+ slave.devotion -= 2;
+ } else if ( slave.devotion > 20) {
+ r += `has accepted being a sex slave, but ${V.he} will <span class='mediumorchid'>resent this intensely.</span>`;
+ slave.devotion -= 3;
+ } else {
+ r += `will of course <span class='mediumorchid'>hate you for this.</span>`;
+ slave.devotion -= 4;
+ }
+ break;
+ case "Citizen":
+ if (T.call !== 1) r += `citizen schools, to be brought up coequal with the arcology's other young people. ${sn} `;
+ if (slave.fetish == "mindbroken" || slave.fuckdoll > 0) {
+ r += `has few thoughts about the matter.`;
+ } else if (slave.devotion > 95) {
+ r += `loves you already, but ${V.he}'ll <span class='hotpink'>love you even more</span> for this.`;
+ } else if (slave.devotion > 50) {
+ r += `knows about these and will be <span class='hotpink'>overjoyed,</span> ${V.he} will miss ${V.his} child${T.count > 1 ? 'ren':''}, but ${V.he} expected that.`;
+ } else if (slave.devotion > 20) {
+ r += `will naturally miss ${V.his} child${T.count > 1 ? 'ren':''}, but will <span class='hotpink;take comfort@@ in the hope that ${V.his} offspring will have a better life.`;
+ } else {
+ r += `will naturally retain some resentment over being separated from ${V.his} child${T.count > 1 ? 'ren':''}, but this should be balanced by hope that ${V.his} offspring will have a better life.`;
+ }
+ break;
+ case "Private":
+ if (T.call !== 1) r += `${T.count > 1 ? 'ren are':' is'} sent to be privately raised, to be brought up as a future high class citizen. ${sn} `;
+ if (slave.fetish == "mindbroken" || slave.fuckdoll > 0) {
+ r += `has few thoughts about the matter.`;
+ } else if (slave.devotion > 95) {
+ r += `will <span class='hotpink'>worship you utterly</span> for this.`;
+ } else if (slave.devotion > 50) {
+ r += `understands that this is the best possible outcome for the offspring of a slave, and will be <span class='hotpink'>overjoyed.</span>`;
+ } else if (slave.devotion > 20) {
+ r += `will miss ${V.his} child${T.count > 1 ? 'ren':''}, but will be <span class='hotpink'>very grateful,</span> since ${V.he}'ll understand this is the best possible outcome for a slave mother.`;
+ } else {
+ r += `will resent being separated from ${V.his} child${T.count > 1 ? 'ren':''}, but <span class='hotpink'>should understand and be grateful</span> that this is the best possible outcome here.`;
+ }
+ r += ` The child${T.count > 1 ? 'ren':''} will be raised privately, with expert care and tutoring, an expensive proposition.`;
+ break;
+ case "Sold":
+ r += `${T.call !== 1 ? "${V.his} ${T.count > 1 ? 'babies':'baby'}":"Where they"} `;
+ if (slave.prestige > 1 || slave.pornPrestige > 2) {
+ T.babyCost = jsRandom(-12,100);
+ if (slave.prematureBirth > 0) T.babyCost = jsRandom(-32,40);
+ r += `went for ${T.curBabies > 1 ? ' a total ':'a'} bid of`;
+ } else {
+ T.babyCost = jsRandom(-12,12);
+ if (slave.prematureBirth > 0) T.babyCost = -45;
+ r += `sold for ${T.curBabies > 1 ? ' a total of':''}`;
+ }
+ const cash = cashFormat(T.count*(50+T.babyCost));r += ` <span class='yellowgreen'>${cash}.</span>`;
+ if (slave.prematureBirth > 0) r += ` A low price due to the added costs of caring for ${T.count > 1 ? 'them':'it'}.`;
+ if (slave.devotion > 20) r += ` ${sn} `;
+ if (slave.fetish == "mindbroken" || slave.fuckdoll > 0) {
+ r += `has few thoughts about the matter.`;
+ } else if (slave.devotion > 95) {
+ r += `adheres to your thoughts so strongly that even though you backed out of caring for ${V.his} child${T.count > 1 ? 'ren':''}, ${V.he} still truly believes you are doing ${V.him} an honor.`;
+ } else if (slave.devotion > 50) {
+ r += `is <span class='mediumorchid'>deeply hurt</span> by your sudden decision to sell ${V.his} child${T.count > 1 ? 'ren':''} instead of having ${T.count > 1 ? 'them':'it'} cared for. ${V.his} trust in your words <span class='gold'>wavers</span> as ${V.he} thinks of ${V.his} child${T.count > 1 ? 'ren':''}'s future.`;
+ slave.trust -= 5, slave.devotion -= 5;
+ } else if (slave.devotion > 20) {
+ r += `is <span class='mediumorchid'>devastated</span> by your sudden decision to sell ${V.his} child${T.count > 1 ? 'ren':''}instead of having ${T.count > 1 ? 'them':'it'} cared for. ${V.his} mind struggles to comprehend <span class='gold'>such betrayal.</span>`;
+ slave.trust -= 10, slave.devotion -= 10;
+ } else {
+ r += `For a moment, ${V.he} saw a glimmer of good in you; <span class='mediumorchid'>${V.he} was clearly wrong.</span> ${V.his} mind struggles to comprehend <span class='gold'>why ${V.he} could ever even think of trusting such a person.</span>`;
+ slave.trust -= 30, slave.devotion -= 30;
+ }
+ V.cash += T.curBabies*(50+T.babyCost);
+ break;
+ }
+ return r;
+};
+
/*:: generateGenetics [script]*/
// Generates a child's genetics based off mother and father and returns it as an object to be attached to an ovum
@@ -40295,4 +40400,4 @@ window.slaveCost = (function() {
window.startingSlaveCost = function startingSlaveCost(slave) {
return slaveCost(slave, true);
-};
+};
\ No newline at end of file
diff --git a/src/SecExp/rebellionEvents.tw b/src/SecExp/rebellionEvents.tw
index 2b30ff5f1c26ba36d4501d711031a551f3f81c77..eb77eb6b76d0c2589299b163f6c3227798918e00 100644
--- a/src/SecExp/rebellionEvents.tw
+++ b/src/SecExp/rebellionEvents.tw
@@ -32,7 +32,7 @@
<<elseif _rand == 3>>
This week a citizen was caught giving refuge to an escaped slave. He was not able to pay for the value of the stolen goods, so he was processed as the case required and the slave returned to their rightful master. Many questions however remain without answers.
<<elseif _rand == 4>>
- This week a member of a well known anti-slavery group was caught trying to infiltrate the arcology. During the capture attempt shots were fired and several guards were injured, and in the end the fugitive unfortunately managed to escape. Reports indicate several slaves helped the criminal, some going as far as using themselves as shields against the bullets of the security drones.
+ This week a member of a well known anti-slavery group was caught trying to infiltrate the arcology. During the capture attempt shots were fired and several guards were injured, and in the end the fugitive unfortunately managed to escape. Reports indicate several slaves helped the criminal, some going as far as using themselves as shields against the bullets of the security drones.
<<elseif _rand == 5>>
This week a slave was caught attempting to sabotage a machine in one of the factories. _HeU explained _hisU action as "trying to defend _himselfU from a dangerous machine". Reports confirmed that the apparatus is indeed quite deadly, having killed several slaves since it was installed, but the expert way _heU handled the sabotage leaves open the possibility of a deliberate plan or even external help.
<<else>>
@@ -43,9 +43,9 @@
/* med tension slave rebellion events */
<<set _rand = random(0,5)>>
<<if _rand == 0>>
- This week some strange reports came in: it seems some assemblies of slaves were observed several nights in a row. The slaves were traced and their masters notified, but many suspect there may be something deeper than a few slaves congregating in the night.
+ This week some strange reports came in: it seems some assemblies of slaves were observed several nights in a row. The slaves were traced and their masters notified, but many suspect there may be something deeper than a few slaves congregating in the night.
<<elseif _rand == 1>>
- This week an underground railroad was discovered. The rebels did not go down without a fight, but in the end <<if $mercenaries >= 1>>your mercenaries<<else>>your security drones<</if>> managed to destroy the old tunnels they were using to ship out slaves out of the arcology.
+ This week an underground railroad was discovered. The rebels did not go down without a fight, but in the end <<if $mercenaries >= 1>>your mercenaries<<else>>your security drones<</if>> managed to destroy the old tunnels they were using to ship out slaves out of the arcology.
<<elseif _rand == 2>>
This week a famous citizen was assaulted and brutally murdered by his slaves. The ones responsible were apprehended and dealt with easily enough, but the mere fact something like this could have happened is concerning. Those slaves had to be aware of their certain doom.
<<elseif _rand == 3>>
@@ -82,7 +82,7 @@
<<elseif _rand == 4>>
This week a citizen refused to be evicted from his house. After some negotiations the man was forcibly removed from the property by your security forces. Unfortunately the forced entry caused some damage to the building.
<<elseif _rand == 5>>
- This week a citizen refused to be enslaved as his contract established. With an impressive display of his rhetoric capabilities he managed to gather a small crowd agreeing with his position. The impromptu assembly was promptly disrupted by the drones.
+ This week a citizen refused to be enslaved as his contract established. With an impressive display of his rhetoric capabilities he managed to gather a small crowd agreeing with his position. The impromptu assembly was promptly disrupted by the drones.
<<else>>
This week a security drone was found disabled and stripped of important electronic components. It seems the act was not dictated by greed, as the most precious parts of the drone were left on the machine, but rather to cover up something that the drone saw.
<</if>>
@@ -96,7 +96,7 @@
<<elseif _rand == 2>>
This week the security department registered the formation of several assemblies of citizens, whose purpose seems to be political in nature. For now no further steps were taken, but it's a worrying sign of further political opposition within the arcology.
<<elseif _rand == 3>>
- This week there was a protest against one of the wealthiest citizen of the arcology. Many criticize his near monopoly. Supporters of the citizen met the protesters on the streets and it was just thanks to the intervention of the security drones that violence was avoided.
+ This week there was a protest against one of the wealthiest citizen of the arcology. Many criticize his near monopoly. Supporters of the citizen met the protesters on the streets and it was just thanks to the intervention of the security drones that violence was avoided.
<<elseif _rand == 4>>
This week several cameras were sabotaged and in many cases damaged beyond repair. A group of anonymous citizens claims to be responsible; their motivation is apparently the excessive surveillance in the arcology and their attack a response to the breach of their privacy.
<<else>>
diff --git a/src/art/artJS.tw b/src/art/artJS.tw
index 102da9ccb014acdc7c4b662699b67bfe60cd2eaa..3866e4824a8c8ffc745c98967fe4ef879750d472 100644
--- a/src/art/artJS.tw
+++ b/src/art/artJS.tw
@@ -2278,3 +2278,372 @@ window.ArtVectorButt = function(slave) {
else if (slave.amp == -5)
return jsInclude(`Art_Vector_Butt_ProstheticSwiss_${T.buttSize}`);
};
+
+window.ArtVectorChastityBelt = function(slave) {
+ let r = "";
+
+ if (slave.dickAccessory === "anal chastity" || slave.dickAccessory === "combined chastity" || slave.vaginalAccessory === "anal chastity" || slave.vaginalAccessory === "combined chastity") {
+ if (slave.waist >= 96) {
+ if (slave.weight >= 11) {
+ r += jsInclude("Art_Vector_Chastity_Vagina_Fat");
+ } else if (slave.weight > -31) {
+ r += jsInclude("Art_Vector_Chastity_Anus");
+ r += jsInclude("Art_Vector_Chastity_Base_Chubby");
+ } else {
+ r += jsInclude("Art_Vector_Chastity_Anus");
+ r += jsInclude("Art_Vector_Chastity_Base");
+ }
+ } else if (slave.waist >= 41) {
+ if (slave.weight >= 31) {
+ r += jsInclude("Art_Vector_Chastity_Vagina_Fat");
+ } else if (slave.weight >= 0) {
+ r += jsInclude("Art_Vector_Chastity_Anus");
+ r += jsInclude("Art_Vector_Chastity_Base_Chubby");
+ } else {
+ r += jsInclude("Art_Vector_Chastity_Anus");
+ r += jsInclude("Art_Vector_Chastity_Base");
+ }
+ } else if (slave.waist >= 11) {
+ if (slave.weight >= 96) {
+ r += jsInclude("Art_Vector_Chastity_Vagina_Fat");
+ } else if (slave.weight >= 11) {
+ r += jsInclude("Art_Vector_Chastity_Anus");
+ r += jsInclude("Art_Vector_Chastity_Base_Chubby");
+ } else {
+ r += jsInclude("Art_Vector_Chastity_Anus");
+ r += jsInclude("Art_Vector_Chastity_Base");
+ }
+ } else if (slave.waist > -11) {
+ if (slave.weight >= 131) {
+ r += jsInclude("Art_Vector_Chastity_Vagina_Fat");
+ } else if (slave.weight >= 31) {
+ r += jsInclude("Art_Vector_Chastity_Anus");
+ r += jsInclude("Art_Vector_Chastity_Base_Chubby");
+ } else {
+ r += jsInclude("Art_Vector_Chastity_Anus");
+ r += jsInclude("Art_Vector_Chastity_Base");
+ }
+ } else if (slave.waist > -41) {
+ if (slave.weight >= 161) {
+ r += jsInclude("Art_Vector_Chastity_Vagina_Fat");
+ } else if (slave.weight >= 96) {
+ r += jsInclude("Art_Vector_Chastity_Anus");
+ r += jsInclude("Art_Vector_Chastity_Base_Chubby");
+ } else {
+ r += jsInclude("Art_Vector_Chastity_Anus");
+ r += jsInclude("Art_Vector_Chastity_Base");
+ }
+ } else if (slave.waist > -96) {
+ if (slave.weight >= 191) {
+ r += jsInclude("Art_Vector_Chastity_Vagina_Fat");
+ } else if (slave.weight >= 131) {
+ r += jsInclude("Art_Vector_Chastity_Anus");
+ r += jsInclude("Art_Vector_Chastity_Base_Chubby");
+ } else {
+ r += jsInclude("Art_Vector_Chastity_Anus");
+ r += jsInclude("Art_Vector_Chastity_Base");
+ }
+ } else {
+ if (slave.weight >= 161) {
+ r += jsInclude("Art_Vector_Chastity_Anus");
+ r += jsInclude("Art_Vector_Chastity_Base_Chubby");
+ } else {
+ r += jsInclude("Art_Vector_Chastity_Anus");
+ r += jsInclude("Art_Vector_Chastity_Base");
+ }
+ }
+ }
+ if (slave.vaginalAccessory === "chastity belt" || slave.vaginalAccessory === "combined chastity") {
+ if (slave.waist >= 96) {
+ if (slave.weight >= 11) {
+ r += jsInclude("Art_Vector_Chastity_Vagina_Fat");
+ } else if (slave.weight > -31) {
+ r += jsInclude("Art_Vector_Chastity_Vagina");
+ r += jsInclude("Art_Vector_Chastity_Base_Chubby");
+ } else {
+ r += jsInclude("Art_Vector_Chastity_Vagina");
+ r += jsInclude("Art_Vector_Chastity_Base");
+ }
+ } else if (slave.waist >= 41) {
+ if (slave.weight >= 31) {
+ r += jsInclude("Art_Vector_Chastity_Vagina_Fat");
+ } else if (slave.weight > 0) {
+ r += jsInclude("Art_Vector_Chastity_Vagina");
+ r += jsInclude("Art_Vector_Chastity_Base_Chubby");
+ } else {
+ r += jsInclude("Art_Vector_Chastity_Vagina");
+ r += jsInclude("Art_Vector_Chastity_Base");
+ }
+ } else if (slave.waist >= 11) {
+ if (slave.weight >= 96) {
+ r += jsInclude("Art_Vector_Chastity_Vagina_Fat");
+ } else if (slave.weight > 11) {
+ r += jsInclude("Art_Vector_Chastity_Vagina");
+ r += jsInclude("Art_Vector_Chastity_Base_Chubby");
+ } else {
+ r += jsInclude("Art_Vector_Chastity_Vagina");
+ r += jsInclude("Art_Vector_Chastity_Base");
+ }
+ } else if (slave.waist > -11) {
+ if (slave.weight >= 131) {
+ r += jsInclude("Art_Vector_Chastity_Vagina_Fat");
+ } else if (slave.weight > 31) {
+ r += jsInclude("Art_Vector_Chastity_Vagina");
+ r += jsInclude("Art_Vector_Chastity_Base_Chubby");
+ } else {
+ r += jsInclude("Art_Vector_Chastity_Vagina");
+ r += jsInclude("Art_Vector_Chastity_Base");
+ }
+ } else if (slave.waist > -41) {
+ if (slave.weight >= 161) {
+ r += jsInclude("Art_Vector_Chastity_Vagina_Fat");
+ } else if (slave.weight > 96) {
+ r += jsInclude("Art_Vector_Chastity_Vagina");
+ r += jsInclude("Art_Vector_Chastity_Base_Chubby");
+ } else {
+ r += jsInclude("Art_Vector_Chastity_Vagina");
+ r += jsInclude("Art_Vector_Chastity_Base");
+ }
+ } else if (slave.waist > -96) {
+ if (slave.weight >= 191) {
+ r += jsInclude("Art_Vector_Chastity_Vagina_Fat");
+ } else if (slave.weight > 131) {
+ r += jsInclude("Art_Vector_Chastity_Vagina");
+ r += jsInclude("Art_Vector_Chastity_Base_Chubby");
+ } else {
+ r += jsInclude("Art_Vector_Chastity_Vagina");
+ r += jsInclude("Art_Vector_Chastity_Base");
+ }
+ } else {
+ if (slave.weight > 161) {
+ r += jsInclude("Art_Vector_Chastity_Vagina");
+ r += jsInclude("Art_Vector_Chastity_Base_Chubby");
+ } else {
+ r += jsInclude("Art_Vector_Chastity_Vagina");
+ r += jsInclude("Art_Vector_Chastity_Base");
+ }
+ }
+ }
+
+ if (slave.vaginalAccessory !== "none") {
+ switch (slave.clothes) {/* shows vaginal accessories on the outfits below */
+ case "a bra":
+ case "a button-up shirt":
+ case "a button-up shirt and panties":
+ case "a chattel habit":
+ case "a comfortable bodysuit":
+ case "a fallen nuns habit":
+ case "a Fuckdoll suit":
+ case "a latex catsuit":
+ case "a monokini":
+ case "a nice pony outfit":
+ case "a penitent nuns habit":
+ case "a slutty klan robe":
+ case "a slutty outfit":
+ case "a slutty pony outfit":
+ case "a sports bra":
+ case "a string bikini":
+ case "a striped bra":
+ case "a succubus outfit":
+ case "a sweater":
+ case "a t-shirt":
+ case "a t-shirt and panties":
+ case "a t-shirt and thong":
+ case "a tank-top":
+ case "a thong":
+ case "a tube top":
+ case "a tube top and thong":
+ case "an apron":
+ case "an oversized t-shirt":
+ case "attractive lingerie":
+ case "attractive lingerie for a pregnant woman":
+ case "body oil":
+ case "chains":
+ case "clubslut netting":
+ case "cutoffs":
+ case "harem gauze":
+ case "no clothing":
+ case "panties":
+ case "panties and pasties":
+ case "restrictive latex":
+ case "shibari ropes":
+ case "slutty jewelry":
+ case "striped underwear":
+ case "uncomfortable straps":
+ if (slave.vaginalAccessory === "dildo") {
+ r += jsInclude("Art_Vector_Dildo_Short");
+ } else if (slave.vaginalAccessory === "long dildo") {
+ r += jsInclude("Art_Vector_Dildo_Long");
+ } else if (slave.clothes !== "a comfortable bodysuit" && slave.clothes !== "a string bikini" && slave.clothes !== "attractive lingerie for a pregnant woman" && slave.clothes !== "restrictive latex") {
+ if (slave.vaginalAccessory === "large dildo") /* additional outfits disabled due to the art breaking with the larger accessories */
+ r += jsInclude("Art_Vector_Dildo_Large");
+ else if (slave.vaginalAccessory === "long, large dildo")
+ r += jsInclude("Art_Vector_Dildo_Large_Long");
+ else if (slave.vaginalAccessory === "huge dildo")
+ r += jsInclude("Art_Vector_Dildo_Huge");
+ else if (slave.vaginalAccessory === "long, huge dildo")
+ r += jsInclude("Art_Vector_Dildo_Huge_Long");
+ }
+ }
+ }
+ return r;
+};
+
+window.ArtVectorCollar = function(slave) {
+ /* TODO": find out where "uncomfortable leather" collar art went */
+ switch (slave.collar) {
+ case "leather with cowbell":
+ return jsInclude("Art_Vector_Collar_Cowbell");
+ case "heavy gold":
+ return jsInclude("Art_Vector_Collar_Gold_Heavy");
+ case "neck corset":
+ return jsInclude("Art_Vector_Collar_Neck_Corset");
+ case "pretty jewelry":
+ return jsInclude("Art_Vector_Collar_Pretty_Jewelry");
+ case "cruel retirement counter":
+ return jsInclude("Art_Vector_Collar_Retirement_Cruel");
+ case "nice retirement counter":
+ return jsInclude("Art_Vector_Collar_Retirement_Nice");
+ case "satin choker":
+ return jsInclude("Art_Vector_Collar_Satin_Choker");
+ case "shock punishment":
+ return jsInclude("Art_Vector_Collar_Shock_Punishment");
+ case "stylish leather":
+ return jsInclude("Art_Vector_Collar_Stylish_Leather");
+ case "tight steel":
+ return jsInclude("Art_Vector_Collar_Tight_Steel");
+ case "uncomfortable leather":
+ return jsInclude("Art_Vector_Collar_Leather_Cruel");
+ case "silk ribbon":
+ return jsInclude("Art_Vector_Collar_Silk_Ribbon");
+ case "bowtie":
+ return jsInclude("Art_Vector_Collar_Bowtie");
+ case "ancient Egyptian":
+ return jsInclude("Art_Vector_Collar_Ancientegyptian");
+ }
+};
+
+window.ArtVectorFeet = function(slave) {
+ const T = State.temporary;
+ let legSize = T.legSize;
+ let r = "";
+ let outfit, stockings;
+ if (slave.legAccessory === "short stockings")
+ stockings = "SS";
+ else if (slave.legAccessory === "long stockings")
+ stockings = "LL";
+
+ /* BEWARE: Uses _legSize set by Art_Vector_Leg_ */
+ /* Updated 2018-10-25 by Fr0g */
+ /* - added brackets to make boolean logic run */
+ /* TODO: use additional JS function to combine shoes/legSize? */
+ switch (slave.shoes) {
+ case "heels":
+ r += jsInclude("Art_Vector_Shoes_Heel");
+ break;
+ case "pumps":
+ r += jsInclude("Art_Vector_Shoes_Pump");
+ break;
+ case "extreme heels":
+ r += jsInclude(`Art_Vector_Shoes_Extreme_Heel_${legSize}`);
+ break;
+ case "boots":
+ r += jsInclude(`Art_Vector_Shoes_Boot_${legSize}`);
+ break;
+ case "flats":
+ r += jsInclude("Art_Vector_Shoes_Flat");
+ break;
+ default:
+ if (slave.amp === 0) {
+ r += jsInclude("Art_Vector_Feet_Normal");
+ } else if (slave.PLimb === 1 || slave.PLimb === 2) {
+ if (slave.amp === -1)
+ r += jsInclude("Art_Vector_Feet_ProstheticBasic");
+ else if (slave.amp === -2)
+ r += jsInclude("Art_Vector_Feet_ProstheticSexy");
+ else if (slave.amp === -3)
+ r += jsInclude("Art_Vector_Feet_ProstheticBeauty");
+ else if (slave.amp === -4)
+ r += jsInclude("Art_Vector_Feet_ProstheticCombat");
+ else if (slave.amp === -5)
+ r += jsInclude("Art_Vector_Feet_ProstheticSwiss");
+ }
+ }
+
+ if (stockings && slave.amp !== 1) {
+ if (slave.shoes === "heels") {
+ r += jsInclude(`Art_Vector_Shoes_Heel_${stockings}_${legSize}`);
+ } else if (slave.shoes === "pumps") {
+ r += jsInclude(`Art_Vector_Shoes_Pump_${stockings}_${legSize}`);
+ } else if (slave.shoes === "flats") {
+ r += jsInclude(`Art_Vector_Shoes_Flat_${stockings}_${legSize}`);
+ } else if (slave.shoes === "none") {
+ r += jsInclude(`Art_Vector_Shoes_Stockings_${stockings}_${legSize}`);
+ }
+ }
+
+ switch (slave.clothes) {
+ case "a bra":
+ case "a button-up shirt":
+ case "a button-up shirt and panties":
+ case "a chattel habit":
+ case "a comfortable bodysuit":
+ case "a cybersuit":
+ case "a gothic lolita dress":
+ case "a hanbok":
+ case "a leotard":
+ case "a nice pony outfit":
+ case "a one-piece swimsuit":
+ case "a penitent nuns habit":
+ case "a scalemail bikini":
+ case "a skimpy loincloth":
+ case "a slutty klan robe":
+ case "a slutty outfit":
+ case "a slutty pony outfit":
+ case "a sports bra":
+ case "a string bikini":
+ case "a striped bra":
+ case "a sweater":
+ case "a sweater and panties":
+ case "a t-shirt":
+ case "a t-shirt and panties":
+ case "a t-shirt and thong":
+ case "a tank-top":
+ case "a tank-top and panties":
+ case "a thong":
+ case "a tube top":
+ case "a tube top and thong":
+ case "an oversized t-shirt":
+ case "attractive lingerie for a pregnant woman":
+ case "chains":
+ case "kitty lingerie":
+ case "no clothing":
+ case "panties":
+ case "panties and pasties":
+ case "shibari ropes":
+ case "striped panties":
+ case "striped underwear":
+ case "uncomfortable straps":
+ break; /* do nothing for these cases */
+ case "a Fuckdoll suit":
+ case "a latex catsuit":
+ case "body oil":
+ case "restrictive latex":
+ if (State.variables.seeVectorArtHighlights === 1) /* special case for shiny clothing */
+ outfit = "Shine";
+ break;
+ default:
+ outfit = clothing2artSuffix(slave.clothes);
+ }
+ if (outfit) {
+ if (slave.amp !== 1) {
+ if (slave.clothes !== "a slutty qipao" && slave.clothes !== "harem gauze" && slave.clothes !== "slutty jewelry" && slave.clothes !== "Western clothing") /* these clothes have a stump/leg outfit, but no butt outfit */
+ r += jsInclude(`Art_Vector_Butt_Outfit_${outfit}_${T.buttSize}`);
+ if (slave.clothes !== "a schoolgirl outfit") /* file is there, but contains no artwork */
+ r += jsInclude(`Art_Vector_Leg_Outfit_${outfit}_${legSize}`);
+ } else {
+ r += jsInclude(`Art_Vector_Leg_Outfit_${outfit}_Stump`);
+ }
+ }
+ return r;
+};
diff --git a/src/art/vector/Chastity_Belt.tw b/src/art/vector/Chastity_Belt.tw
index e900a5ccb758277fb81b810bd58ff4354e59bd80..005e8e133427190de3a9d3e152b8eaab1cc8c07a 100644
--- a/src/art/vector/Chastity_Belt.tw
+++ b/src/art/vector/Chastity_Belt.tw
@@ -2,247 +2,4 @@
/* note: penile chastity is handled by penis display */
-<<set _chastityAnal = _artSlave.dickAccessory == "anal chastity" || _artSlave.dickAccessory == "combined chastity" || _artSlave.vaginalAccessory == "anal chastity" || _artSlave.vaginalAccessory == "combined chastity">>
-
-<<set _chastityVaginal = _artSlave.vaginalAccessory == "chastity belt" || _artSlave.vaginalAccessory == "combined chastity">>
-
-<<if _chastityAnal>>
- <<if _artSlave.waist >= 96 && _artSlave.waist > -96>>
- <<if _artSlave.weight >= 96>>
- <<include Art_Vector_Chastity_Vagina_Fat>>
- <<elseif _artSlave.weight < 96 && _artSlave.weight >= 11>>
- <<include Art_Vector_Chastity_Vagina_Fat>>
- <<elseif _artSlave.weight < 11 && _artSlave.weight > -31>>
- <<include Art_Vector_Chastity_Anus>>
- <<include Art_Vector_Chastity_Base_Chubby>>
- <<elseif _artSlave.weight <= -31>>
- <<include Art_Vector_Chastity_Anus>>
- <<include Art_Vector_Chastity_Base>>
- <</if>>
- <<elseif _artSlave.waist < 96 && _artSlave.waist >= 41>>
- <<if _artSlave.weight >= 131>>
- <<include Art_Vector_Chastity_Vagina_Fat>>
- <<elseif _artSlave.weight < 131 && _artSlave.weight >= 31>>
- <<include Art_Vector_Chastity_Vagina_Fat>>
- <<elseif _artSlave.weight < 31 && _artSlave.weight >= 0>>
- <<include Art_Vector_Chastity_Anus>>
- <<include Art_Vector_Chastity_Base_Chubby>>
- <<elseif _artSlave.weight < 0 && _artSlave.weight > -96>>
- <<include Art_Vector_Chastity_Anus>>
- <<include Art_Vector_Chastity_Base>>
- <<elseif _artSlave.weight <= -96>>
- <<include Art_Vector_Chastity_Anus>>
- <<include Art_Vector_Chastity_Base>>
- <</if>>
- <<elseif _artSlave.waist < 41 && _artSlave.waist >= 11>>
- <<if _artSlave.weight >= 161>>
- <<include Art_Vector_Chastity_Vagina_Fat>>
- <<elseif _artSlave.weight < 161 && _artSlave.weight >= 96>>
- <<include Art_Vector_Chastity_Vagina_Fat>>
- <<elseif _artSlave.weight < 96 && _artSlave.weight >= 11>>
- <<include Art_Vector_Chastity_Anus>>
- <<include Art_Vector_Chastity_Base_Chubby>>
- <<elseif _artSlave.weight < 11 && _artSlave.weight > -31>>
- <<include Art_Vector_Chastity_Anus>>
- <<include Art_Vector_Chastity_Base>>
- <<elseif _artSlave.weight <= -31>>
- <<include Art_Vector_Chastity_Anus>>
- <<include Art_Vector_Chastity_Base>>
- <</if>>
- <<elseif _artSlave.waist < 11 && _artSlave.waist > -11>>
- <<if _artSlave.weight >= 191>>
- <<include Art_Vector_Chastity_Vagina_Fat>>
- <<elseif _artSlave.weight < 191 && _artSlave.weight >= 131>>
- <<include Art_Vector_Chastity_Vagina_Fat>>
- <<elseif _artSlave.weight < 131 && _artSlave.weight >= 31>>
- <<include Art_Vector_Chastity_Anus>>
- <<include Art_Vector_Chastity_Base_Chubby>>
- <<elseif _artSlave.weight < 31 && _artSlave.weight >= 0>>
- <<include Art_Vector_Chastity_Anus>>
- <<include Art_Vector_Chastity_Base>>
- <<elseif _artSlave.weight < 0 && _artSlave.weight > -96>>
- <<include Art_Vector_Chastity_Anus>>
- <<include Art_Vector_Chastity_Base>>
- <<elseif _artSlave.weight <= -96>>
- <<include Art_Vector_Chastity_Anus>>
- <<include Art_Vector_Chastity_Base>>
- <</if>>
- <<elseif _artSlave.waist <= -11 && _artSlave.waist > -41>>
- <<if _artSlave.weight >= 161>>
- <<include Art_Vector_Chastity_Vagina_Fat>>
- <<elseif _artSlave.weight < 161 && _artSlave.weight >= 96>>
- <<include Art_Vector_Chastity_Anus>>
- <<include Art_Vector_Chastity_Base_Chubby>>
- <<elseif _artSlave.weight < 96 && _artSlave.weight >= 11>>
- <<include Art_Vector_Chastity_Anus>>
- <<include Art_Vector_Chastity_Base>>
- <<elseif _artSlave.weight < 11 && _artSlave.weight > -31>>
- <<include Art_Vector_Chastity_Anus>>
- <<include Art_Vector_Chastity_Base>>
- <<elseif _artSlave.weight <= -31>>
- <<include Art_Vector_Chastity_Anus>>
- <<include Art_Vector_Chastity_Base>>
- <</if>>
- <<elseif _artSlave.waist <= -41 && _artSlave.waist > -96>>
- <<if _artSlave.weight >= 191>>
- <<include Art_Vector_Chastity_Vagina_Fat>>
- <<elseif _artSlave.weight < 191 && _artSlave.weight >= 131>>
- <<include Art_Vector_Chastity_Anus>>
- <<include Art_Vector_Chastity_Base_Chubby>>
- <<elseif _artSlave.weight < 131 && _artSlave.weight >= 31>>
- <<include Art_Vector_Chastity_Anus>>
- <<include Art_Vector_Chastity_Base>>
- <<elseif _artSlave.weight < 31 && _artSlave.weight > -11>>
- <<include Art_Vector_Chastity_Anus>>
- <<include Art_Vector_Chastity_Base>>
- <<elseif _artSlave.weight <= -11>>
- <<include Art_Vector_Chastity_Anus>>
- <<include Art_Vector_Chastity_Base>>
- <</if>>
- <<elseif _artSlave.waist <= -96>>
- <<if _artSlave.weight >= 161>>
- <<include Art_Vector_Chastity_Anus>>
- <<include Art_Vector_Chastity_Base_Chubby>>
- <<elseif _artSlave.weight < 161 && _artSlave.weight >= 96>>
- <<include Art_Vector_Chastity_Anus>>
- <<include Art_Vector_Chastity_Base>>
- <<elseif _artSlave.weight < 96 && _artSlave.weight > 0>>
- <<include Art_Vector_Chastity_Anus>>
- <<include Art_Vector_Chastity_Base>>
- <<elseif _artSlave.weight <= 0>>
- <<include Art_Vector_Chastity_Anus>>
- <<include Art_Vector_Chastity_Base>>
- <</if>>
- <</if>>
-<</if>>
-<<if _chastityVaginal>>
- <<if _artSlave.waist >= 96 && _artSlave.waist > -96>>
- <<if _artSlave.weight >= 96>>
- <<include Art_Vector_Chastity_Vagina_Fat>>
- <<elseif _artSlave.weight < 96 && _artSlave.weight >= 11>>
- <<include Art_Vector_Chastity_Vagina_Fat>>
- <<elseif _artSlave.weight < 11 && _artSlave.weight > -31>>
- <<include Art_Vector_Chastity_Vagina>>
- <<include Art_Vector_Chastity_Base_Chubby>>
- <<elseif _artSlave.weight <= -31>>
- <<include Art_Vector_Chastity_Vagina>>
- <<include Art_Vector_Chastity_Base>>
- <</if>>
- <<elseif _artSlave.waist < 96 && _artSlave.waist >= 41>>
- <<if _artSlave.weight >= 131>>
- <<include Art_Vector_Chastity_Vagina_Fat>>
- <<elseif _artSlave.weight < 131 && _artSlave.weight >= 31>>
- <<include Art_Vector_Chastity_Vagina_Fat>>
- <<elseif _artSlave.weight < 31 && _artSlave.weight >= 0>>
- <<include Art_Vector_Chastity_Vagina>>
- <<include Art_Vector_Chastity_Base_Chubby>>
- <<elseif _artSlave.weight < 0 && _artSlave.weight > -96>>
- <<include Art_Vector_Chastity_Vagina>>
- <<include Art_Vector_Chastity_Base>>
- <<elseif _artSlave.weight <= -96>>
- <<include Art_Vector_Chastity_Vagina>>
- <<include Art_Vector_Chastity_Base>>
- <</if>>
- <<elseif _artSlave.waist < 41 && _artSlave.waist >= 11>>
- <<if _artSlave.weight >= 161>>
- <<include Art_Vector_Chastity_Vagina_Fat>>
- <<elseif _artSlave.weight < 161 && _artSlave.weight >= 96>>
- <<include Art_Vector_Chastity_Vagina_Fat>>
- <<elseif _artSlave.weight < 96 && _artSlave.weight >= 11>>
- <<include Art_Vector_Chastity_Vagina>>
- <<include Art_Vector_Chastity_Base_Chubby>>
- <<elseif _artSlave.weight < 11 && _artSlave.weight > -31>>
- <<include Art_Vector_Chastity_Vagina>>
- <<include Art_Vector_Chastity_Base>>
- <<elseif _artSlave.weight <= -31>>
- <<include Art_Vector_Chastity_Vagina>>
- <<include Art_Vector_Chastity_Base>>
- <</if>>
- <<elseif _artSlave.waist < 11 && _artSlave.waist > -11>>
- <<if _artSlave.weight >= 191>>
- <<include Art_Vector_Chastity_Vagina_Fat>>
- <<elseif _artSlave.weight < 191 && _artSlave.weight >= 131>>
- <<include Art_Vector_Chastity_Vagina_Fat>>
- <<elseif _artSlave.weight < 131 && _artSlave.weight >= 31>>
- <<include Art_Vector_Chastity_Vagina>>
- <<include Art_Vector_Chastity_Base_Chubby>>
- <<elseif _artSlave.weight < 31 && _artSlave.weight >= 0>>
- <<include Art_Vector_Chastity_Vagina>>
- <<include Art_Vector_Chastity_Base>>
- <<elseif _artSlave.weight < 0 && _artSlave.weight > -96>>
- <<include Art_Vector_Chastity_Vagina>>
- <<include Art_Vector_Chastity_Base>>
- <<elseif _artSlave.weight <= -96>>
- <<include Art_Vector_Chastity_Vagina>>
- <<include Art_Vector_Chastity_Base>>
- <</if>>
- <<elseif _artSlave.waist <= -11 && _artSlave.waist > -41>>
- <<if _artSlave.weight >= 161>>
- <<include Art_Vector_Chastity_Vagina_Fat>>
- <<elseif _artSlave.weight < 161 && _artSlave.weight >= 96>>
- <<include Art_Vector_Chastity_Vagina>>
- <<include Art_Vector_Chastity_Base_Chubby>>
- <<elseif _artSlave.weight < 96 && _artSlave.weight >= 11>>
- <<include Art_Vector_Chastity_Vagina>>
- <<include Art_Vector_Chastity_Base>>
- <<elseif _artSlave.weight < 11 && _artSlave.weight > -31>>
- <<include Art_Vector_Chastity_Vagina>>
- <<include Art_Vector_Chastity_Base>>
- <<elseif _artSlave.weight <= -31>>
- <<include Art_Vector_Chastity_Vagina>>
- <<include Art_Vector_Chastity_Base>>
- <</if>>
- <<elseif _artSlave.waist <= -41 && _artSlave.waist > -96>>
- <<if _artSlave.weight >= 191>>
- <<include Art_Vector_Chastity_Vagina_Fat>>
- <<elseif _artSlave.weight < 191 && _artSlave.weight >= 131>>
- <<include Art_Vector_Chastity_Vagina>>
- <<include Art_Vector_Chastity_Base_Chubby>>
- <<elseif _artSlave.weight < 131 && _artSlave.weight >= 31>>
- <<include Art_Vector_Chastity_Vagina>>
- <<include Art_Vector_Chastity_Base>>
- <<elseif _artSlave.weight < 31 && _artSlave.weight > -11>>
- <<include Art_Vector_Chastity_Vagina>>
- <<include Art_Vector_Chastity_Base>>
- <<elseif _artSlave.weight <= -11>>
- <<include Art_Vector_Chastity_Vagina>>
- <<include Art_Vector_Chastity_Base>>
- <</if>>
- <<elseif _artSlave.waist <= -96>>
- <<if _artSlave.weight >= 161>>
- <<include Art_Vector_Chastity_Vagina>>
- <<include Art_Vector_Chastity_Base_Chubby>>
- <<elseif _artSlave.weight < 161 && _artSlave.weight >= 96>>
- <<include Art_Vector_Chastity_Vagina>>
- <<include Art_Vector_Chastity_Base>>
- <<elseif _artSlave.weight < 96 && _artSlave.weight > 0>>
- <<include Art_Vector_Chastity_Vagina>>
- <<include Art_Vector_Chastity_Base>>
- <<elseif _artSlave.weight <= 0>>
- <<include Art_Vector_Chastity_Vagina>>
- <<include Art_Vector_Chastity_Base>>
- <</if>>
- <</if>>
-<</if>>
-
-<<if _artSlave.vaginalAccessory != "none">>
-<<if _artSlave.clothes != "a cheerleader outfit" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "cutoffs and a t-shirt" && _artSlave.clothes != "a halter top dress" && _artSlave.clothes != "a mini dress" && _artSlave.clothes != "a leotard" && _artSlave.clothes != "a nice maid outfit" && _artSlave.clothes != "a slutty maid outfit" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a nice nurse outfit" && _artSlave.clothes != "a schoolgirl outfit" && _artSlave.clothes != "a scalemail bikini" && _artSlave.clothes != "striped panties" && _artSlave.clothes != "a slutty nurse outfit" && _artSlave.clothes != "a ball gown" && _artSlave.clothes != "battledress" && _artSlave.clothes != "spats and a tank top" && _artSlave.clothes != "nice business attire" && _artSlave.clothes != "slutty business attire" && _artSlave.clothes != "a bunny outfit" && _artSlave.clothes != "conservative clothing" && _artSlave.clothes != "a huipil" && _artSlave.clothes != "a kimono" && _artSlave.clothes != "a slave gown" && _artSlave.clothes != "stretch pants and a crop-top" && _artSlave.clothes != "a maternity dress" && _artSlave.clothes != "a slutty qipao" && _artSlave.clothes != "a toga" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "a cybersuit" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "a long qipao" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a mounty outfit" && _artSlave.clothes != "lederhosen" && _artSlave.clothes != "a dirndl" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a niqab and abaya" && _artSlave.clothes != "a burqa" && _artSlave.clothes != "a klan robe" && _artSlave.clothes != "a hijab and blouse" && _artSlave.clothes != "a burkini" && _artSlave.clothes != "sport shorts" && _artSlave.clothes != "sport shorts and a sports bra" && _artSlave.clothes != "sport shorts and a t-shirt" && _artSlave.clothes != "jeans" && _artSlave.clothes != "leather pants" && _artSlave.clothes != "leather pants and pasties" && _artSlave.clothes != "leather pants and a tube top" && _artSlave.clothes != "boyshorts" && _artSlave.clothes != "a t-shirt and jeans" && _artSlave.clothes != "a tank-top and panties" && _artSlave.clothes != "a skimpy loincloth" && _artSlave.clothes != "an oversized t-shirt and boyshorts" && _artSlave.clothes != "a sweater and cutoffs" && _artSlave.clothes != "a sweater and panties" && _artSlave.clothes != "a police uniform" && _artSlave.clothes != "a one-piece swimsuit" && _artSlave.clothes != "a hanbok" && _artSlave.clothes != "a gothic lolita dress" && _artSlave.clothes != "kitty lingerie">>
- /* shows vaginal accessories in-game when selected; vaginal accessory art disabled on the outfits below */
- <<if _artSlave.vaginalAccessory == "dildo">>
- <<include Art_Vector_Dildo_Short>>
- <<elseif _artSlave.vaginalAccessory == "long dildo">>
- <<include Art_Vector_Dildo_Long>>
-
- /* additional outfits disabled due to the art breaking with the larger accessories */
- <<elseif _artSlave.vaginalAccessory == "large dildo" && _artSlave.clothes != "a comfortable bodysuit" && _artSlave.clothes != "a string bikini" && _artSlave.clothes != "attractive lingerie for a pregnant woman" && _artSlave.clothes != "restrictive latex">>
- <<include Art_Vector_Dildo_Large>>
- <<elseif _artSlave.vaginalAccessory == "long, large dildo" && _artSlave.clothes != "a comfortable bodysuit" && _artSlave.clothes != "a string bikini" && _artSlave.clothes != "attractive lingerie for a pregnant woman" && _artSlave.clothes != "restrictive latex">>
- <<include Art_Vector_Dildo_Large_Long>>
- <<elseif _artSlave.vaginalAccessory == "huge dildo" && _artSlave.clothes != "a comfortable bodysuit" && _artSlave.clothes != "a string bikini" && _artSlave.clothes != "attractive lingerie for a pregnant woman" && _artSlave.clothes != "restrictive latex">>
- <<include Art_Vector_Dildo_Huge>>
- <<elseif _artSlave.vaginalAccessory == "long, huge dildo" && _artSlave.clothes != "a comfortable bodysuit" && _artSlave.clothes != "a string bikini" && _artSlave.clothes != "attractive lingerie for a pregnant woman" && _artSlave.clothes != "restrictive latex">>
- <<include Art_Vector_Dildo_Huge_Long>>
- <</if>>
-
-<</if>>
-<</if>>
+<<= ArtVectorChastityBelt(_artSlave)>>
diff --git a/src/art/vector/Collar.tw b/src/art/vector/Collar.tw
index c204f81734ee706770a76ad945172e6e40d5c730..0914d2acfd4bc21b3f3b5d07c9dfa0b38bc5bb8b 100644
--- a/src/art/vector/Collar.tw
+++ b/src/art/vector/Collar.tw
@@ -1,36 +1,3 @@
:: Art_Vector_Collar_ [nobr]
-/* TODO: find out where "uncomfortable leather" collar art went */
-
-<<switch _artSlave.collar>>
-<<case "leather with cowbell">>
-<<include Art_Vector_Collar_Cowbell >>
-<<case "heavy gold">>
-<<include Art_Vector_Collar_Gold_Heavy >>
-<<case "neck corset">>
-<<include Art_Vector_Collar_Neck_Corset >>
-<<case "pretty jewelry">>
-<<include Art_Vector_Collar_Pretty_Jewelry >>
-<<case "cruel retirement counter">>
-<<include Art_Vector_Collar_Retirement_Cruel >>
-<<case "nice retirement counter">>
-<<include Art_Vector_Collar_Retirement_Nice >>
-<<case "satin choker">>
-<<include Art_Vector_Collar_Satin_Choker >>
-<<case "shock punishment">>
-<<include Art_Vector_Collar_Shock_Punishment >>
-<<case "stylish leather">>
-<<include Art_Vector_Collar_Stylish_Leather >>
-<<case "tight steel">>
-<<include Art_Vector_Collar_Tight_Steel >>
-<<case "uncomfortable leather">>
-<<include Art_Vector_Collar_Leather_Cruel >>
-<<case "silk ribbon">>
-<<include Art_Vector_Collar_Silk_Ribbon >>
-<<case "bowtie">>
-<<include Art_Vector_Collar_Bowtie >>
-<<case "ancient Egyptian">>
-<<include Art_Vector_Collar_Ancientegyptian >>
-<<default>>
-/* collar not supported - don't display anything */
-<</switch>>
+<<= ArtVectorCollar(_artSlave)>>
diff --git a/src/art/vector/Feet.tw b/src/art/vector/Feet.tw
index 0212fcce7669535b74322bcff0fc3b5b2860ddc4..ccd85b0a7023dfc55f71a1b0425e03017941072e 100644
--- a/src/art/vector/Feet.tw
+++ b/src/art/vector/Feet.tw
@@ -1,309 +1,3 @@
:: Art_Vector_Feet_ [nobr]
-/* BEWARE: Uses _legSize set by Art_Vector_Leg_ */
-/* Updated 2018-10-25 by Fr0g */
-/* - added brackets to make boolean logic run */
-
-<<if _artSlave.amp == 0>>
- <<switch _artSlave.shoes>>
- <<case "heels">>
- <<include Art_Vector_Shoes_Heel>>
- <<case "pumps">>
- <<include Art_Vector_Shoes_Pump>>
- <<case "extreme heels">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Extreme_Heel_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Extreme_Heel_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Extreme_Heel_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Extreme_Heel_Thick>>
- <</if>>
- <<case "boots">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Boot_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Boot_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Boot_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Boot_Thick>>
- <</if>>
- <<case "flats">>
- <<include Art_Vector_Shoes_Flat>>
- <<default>>
- <<include Art_Vector_Feet_Normal>>
- <</switch>>
-<<elseif _artSlave.amp == -1 && (_artSlave.PLimb == 1 || _artSlave.PLimb == 2)>>
- <<switch _artSlave.shoes>>
- <<case "heels">>
- <<include Art_Vector_Shoes_Heel>>
- <<case "pumps">>
- <<include Art_Vector_Shoes_Pump>>
- <<case "extreme heels">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Extreme_Heel_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Extreme_Heel_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Extreme_Heel_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Extreme_Heel_Thick>>
- <</if>>
- <<case "boots">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Boot_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Boot_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Boot_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Boot_Thick>>
- <</if>>
- <<case "flats">>
- <<include Art_Vector_Shoes_Flat>>
- <<default>>
- <<include Art_Vector_Feet_ProstheticBasic>>
- <</switch>>
-<<elseif _artSlave.amp == -2 && (_artSlave.PLimb == 1 || _artSlave.PLimb == 2)>>
- <<switch _artSlave.shoes>>
- <<case "heels">>
- <<include Art_Vector_Shoes_Heel>>
- <<case "pumps">>
- <<include Art_Vector_Shoes_Pump>>
- <<case "extreme heels">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Extreme_Heel_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Extreme_Heel_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Extreme_Heel_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Extreme_Heel_Thick>>
- <</if>>
- <<case "boots">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Boot_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Boot_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Boot_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Boot_Thick>>
- <</if>>
- <<case "flats">>
- <<include Art_Vector_Shoes_Flat>>
- <<default>>
- <<include Art_Vector_Feet_ProstheticSexy>>
- <</switch>>
-<<elseif _artSlave.amp == -3 && (_artSlave.PLimb == 1 || _artSlave.PLimb == 2)>>
- <<switch _artSlave.shoes>>
- <<case "heels">>
- <<include Art_Vector_Shoes_Heel>>
- <<case "pumps">>
- <<include Art_Vector_Shoes_Pump>>
- <<case "extreme heels">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Extreme_Heel_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Extreme_Heel_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Extreme_Heel_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Extreme_Heel_Thick>>
- <</if>>
- <<case "boots">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Boot_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Boot_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Boot_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Boot_Thick>>
- <</if>>
- <<case "flats">>
- <<include Art_Vector_Shoes_Flat>>
- <<default>>
- <<include Art_Vector_Feet_ProstheticBeauty>>
- <</switch>>
-<<elseif _artSlave.amp == -4 && (_artSlave.PLimb == 1 || _artSlave.PLimb == 2)>>
- <<switch _artSlave.shoes>>
- <<case "heels">>
- <<include Art_Vector_Shoes_Heel>>
- <<case "pumps">>
- <<include Art_Vector_Shoes_Pump>>
- <<case "extreme heels">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Extreme_Heel_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Extreme_Heel_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Extreme_Heel_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Extreme_Heel_Thick>>
- <</if>>
- <<case "boots">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Boot_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Boot_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Boot_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Boot_Thick>>
- <</if>>
- <<case "flats">>
- <<include Art_Vector_Shoes_Flat>>
- <<default>>
- <<include Art_Vector_Feet_ProstheticCombat>>
- <</switch>>
-<<elseif _artSlave.amp == -5 && (_artSlave.PLimb == 1 || _artSlave.PLimb == 2)>>
- <<switch _artSlave.shoes>>
- <<case "heels">>
- <<include Art_Vector_Shoes_Heel>>
- <<case "pumps">>
- <<include Art_Vector_Shoes_Pump>>
- <<case "extreme heels">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Extreme_Heel_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Extreme_Heel_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Extreme_Heel_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Extreme_Heel_Thick>>
- <</if>>
- <<case "boots">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Boot_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Boot_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Boot_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Boot_Thick>>
- <</if>>
- <<case "flats">>
- <<include Art_Vector_Shoes_Flat>>
- <<default>>
- <<include Art_Vector_Feet_ProstheticSwiss>>
- <</switch>>
-<</if>>
-
-<<if _artSlave.legAccessory == "short stockings" && _artSlave.amp != 1>>
- <<if _artSlave.shoes == "heels">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Heel_SS_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Heel_SS_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Heel_SS_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Heel_SS_Thick>>
- <</if>>
- <<elseif _artSlave.shoes == "pumps">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Pump_SS_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Pump_SS_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Pump_SS_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Pump_SS_Thick>>
- <</if>>
- <<elseif _artSlave.shoes == "flats">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Flat_SS_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Flat_SS_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Flat_SS_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Flat_SS_Thick>>
- <</if>>
- <<elseif _artSlave.shoes == "none">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Stockings_SS_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Stockings_SS_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Stockings_SS_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Stockings_SS_Thick>>
- <</if>>
- <</if>>
-<<elseif _artSlave.legAccessory == "long stockings" && _artSlave.amp != 1>>
- <<if _artSlave.shoes == "heels">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Heel_LL_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Heel_LL_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Heel_LL_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Heel_LL_Thick>>
- <</if>>
- <<elseif _artSlave.shoes == "pumps">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Pump_LL_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Pump_LL_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Pump_LL_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Pump_LL_Thick>>
- <</if>>
- <<elseif _artSlave.shoes == "flats">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Flat_LL_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Flat_LL_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Flat_LL_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Flat_LL_Thick>>
- <</if>>
- <<elseif _artSlave.shoes == "none">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Stockings_LL_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Stockings_LL_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Stockings_LL_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Stockings_LL_Thick>>
- <</if>>
- <</if>>
-<</if>>
-
-<<unset _art_outfit >> /* clean up variable possibly already set by prior widget run */
-
-<<switch _artSlave.clothes>> /* select available clothes */
- <<case "a ball gown" "a biyelgee costume" "a bunny outfit" "a cheerleader outfit" "a dirndl" "a fallen nuns habit" "a halter top dress" "a hijab and abaya" "a huipil" "a kimono" "a latex catsuit" "a long qipao" "a maternity dress" "a military uniform" "a mini dress" "a monokini" "a mounty outfit" "a nice maid outfit" "a nice nurse outfit" "a red army uniform" "a schoolgirl outfit" "a schutzstaffel uniform" "a slave gown" "a slutty maid outfit" "a slutty nurse outfit" "a slutty qipao" "a slutty schutzstaffel uniform" "a succubus outfit" "a toga" "an apron" "attractive lingerie" "battlearmor" "battledress" "clubslut netting" "conservative clothing" "cutoffs and a t-shirt" "lederhosen" "nice business attire" "restrictive latex" "slutty business attire" "spats and a tank top" "stretch pants and a crop-top" "Western clothing" "a niqab and abaya" "a burqa" "a klan robe" "a hijab and blouse" "a burkini" "cutoffs" "sport shorts" "sport shorts and a sports bra" "sport shorts and a t-shirt" "jeans" "leather pants" "leather pants and pasties" "leather pants and a tube top" "boyshorts" "a t-shirt and jeans" "an oversized t-shirt and boyshorts" "a sweater and cutoffs" "a police uniform">>
- <<set _art_outfit = clothing2artSuffix(_artSlave.clothes) >>
-<</switch>>
-
-/* special case for shiny clothing */
-<<if $seeVectorArtHighlights == 1>>
- /* this one is leg and partly butt-related, but needs to be here as shoes are drawn over legs and butt */
- <<if _artSlave.fuckdoll != 0 || _artSlave.clothes == "restrictive latex" || _artSlave.clothes == "a latex catsuit" || _artSlave.clothes == "body oil">>
- <<set _art_outfit = "Shine" >>
- <</if>>
-<</if>>
-
-<<if def _art_outfit >>
- <<if _artSlave.amp != 1>>
- <<if ["an apron", "a ball gown", "a bunny outfit", "attractive lingerie", "a chattel habit", "a cheerleader outfit", "a fallen nuns habit", "a halter top dress", "a hijab and abaya", "a huipil", "a kimono", "a latex catsuit", "a maternity dress", "a military uniform", "a mini dress", "a monokini", "a nice maid outfit", "a nice nurse outfit", "a red army uniform", "a schoolgirl outfit", "a schutzstaffel uniform", "a slutty schutzstaffel uniform", "slutty business attire", "a slutty maid outfit", "a slutty nurse outfit", "spats and a tank top", "a slave gown", "a succubus outfit", "a toga", "battledress", "body oil", "clubslut netting", "conservative clothing", "cutoffs and a t-shirt", "nice business attire", "restrictive latex", "stretch pants and a crop-top", "a long qipao", "battlearmor", "a biyelgee costume", "lederhosen", "a dirndl", "a niqab and abaya", "a burqa", "a mounty outfit", "a klan robe", "a niqab and abaya", "a hijab and blouse", "a burkini", "cutoffs", "sport shorts", "sport shorts and a t-shirt", "jeans", "sport shorts and a sports bra", "leather pants", "leather pants and pasties", "leather pants and a tube top", "boyshorts", "a t-shirt and jeans", "an oversized t-shirt and boyshorts", "a sweater and cutoffs", "a police uniform"].includes(_artSlave.clothes)>>
- <<set _art = "Art_Vector_Butt_Outfit_"+_art_outfit+"_"+_buttSize >><<include _art >>
- <</if>>
- <<if _artSlave.clothes != "a schoolgirl outfit">>
- <<set _art = "Art_Vector_Leg_Outfit_"+_art_outfit+"_"+_legSize >><<include _art >>
- <</if>>
- <<else>>
- <<if _artSlave.clothes != "a schoolgirl outfit">>
- <<set _art = "Art_Vector_Leg_Outfit_"+_art_outfit+"_Stump" >><<include _art >>
- <</if>>
- <</if>>
-<</if>>
+<<= ArtVectorFeet(_artSlave)>>
diff --git a/src/cheats/mod_EditChildCheatNew.tw b/src/cheats/mod_EditChildCheatNew.tw
index 039184795eea84af4f063f65a577ca4d0c05fcc7..0cf445c450cbe4848da0258342a75d6d3d5759af 100644
--- a/src/cheats/mod_EditChildCheatNew.tw
+++ b/src/cheats/mod_EditChildCheatNew.tw
@@ -2530,7 +2530,7 @@
''__Lips Tattoo__ (
<<if $tempSlave.lipsTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.lipsTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.lipsTat" 0>>None
<<radiobutton "$tempSlave.lipsTat" "tribal patterns">>Tribal Patterns
@@ -2545,7 +2545,7 @@
''__Shoulders Tattoo__ (
<<if $tempSlave.shouldersTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.shouldersTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.shouldersTat" 0>>None
<<radiobutton "$tempSlave.shouldersTat" "tribal patterns">>Tribal Patterns
@@ -2561,7 +2561,7 @@
''__Back Tattoo__ (
<<if $tempSlave.backTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.backTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.backTat" 0>>None
<<radiobutton "$tempSlave.backTat" "tribal patterns">>Tribal Patterns
@@ -2577,7 +2577,7 @@
''__Belly Tattoo__ (
<<if $tempSlave.bellyTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.bellyTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.bellyTat" 0>>None
<<radiobutton "$tempSlave.bellyTat" "a heart">>Heart
@@ -2588,7 +2588,7 @@
''__Arms Tattoo__ (
<<if $tempSlave.armsTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.armsTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.armsTat" 0>>None
<<radiobutton "$tempSlave.armsTat" "tribal patterns">>Tribal Patterns
@@ -2604,7 +2604,7 @@
''__Legs Tattoo__ (
<<if $tempSlave.legsTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.legsTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.legsTat" 0>>None
<<radiobutton "$tempSlave.legsTat" "tribal patterns">>Tribal Patterns
@@ -2620,7 +2620,7 @@
''__Boobs Tattoo__ (
<<if $tempSlave.boobsTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.boobsTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.boobsTat" 0>>None
<<radiobutton "$tempSlave.boobsTat" "tribal patterns">>Tribal Patterns
@@ -2636,7 +2636,7 @@
''__Butt Tattoo__ (
<<if $tempSlave.buttTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.buttTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.buttTat" 0>>None
<<radiobutton "$tempSlave.buttTat" "tribal patterns">>Tribal Patterns
@@ -2652,7 +2652,7 @@
''__Vagina Tattoo__ (
<<if $tempSlave.vaginaTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.vaginaTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.vaginaTat" 0>>None
<<radiobutton "$tempSlave.vaginaTat" "tribal patterns">>Tribal Patterns
@@ -2668,7 +2668,7 @@
''__Anus Tattoo__ (
<<if $tempSlave.anusTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.anusTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.anusTat" 0>>None
<<radiobutton "$tempSlave.anusTat" "bleached">>Bleached
@@ -2683,7 +2683,7 @@
''__Dick Tattoo__ (
<<if $tempSlave.dickTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.dickTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.dickTat" 0>>None
<<radiobutton "$tempSlave.dickTat" "tribal patterns">>Tribal Patterns
@@ -2697,7 +2697,7 @@
''__Tramp Stamp Tattoo__ (
<<if $tempSlave.stampTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.stampTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.stampTat" 0>>None
<<radiobutton "$tempSlave.stampTat" "tribal patterns">>Tribal Patterns
diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw
index 3fd18ba7a496cfb19318540c7735f8b28d236b74..a4692a3fd827b99e915b717bd56fc282a9cbcfbf 100644
--- a/src/cheats/mod_editSlaveCheatNew.tw
+++ b/src/cheats/mod_editSlaveCheatNew.tw
@@ -3279,7 +3279,7 @@
''__Lips Tattoo__ (
<<if $tempSlave.lipsTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.lipsTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.lipsTat" 0>>None
<<radiobutton "$tempSlave.lipsTat" "tribal patterns">>Tribal Patterns
@@ -3294,7 +3294,7 @@
''__Shoulders Tattoo__ (
<<if $tempSlave.shouldersTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.shouldersTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.shouldersTat" 0>>None
<<radiobutton "$tempSlave.shouldersTat" "tribal patterns">>Tribal Patterns
@@ -3310,7 +3310,7 @@
''__Back Tattoo__ (
<<if $tempSlave.backTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.backTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.backTat" 0>>None
<<radiobutton "$tempSlave.backTat" "tribal patterns">>Tribal Patterns
@@ -3326,7 +3326,7 @@
''__Belly Tattoo__ (
<<if $tempSlave.bellyTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.bellyTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.bellyTat" 0>>None
<<radiobutton "$tempSlave.bellyTat" "a heart">>Heart
@@ -3337,7 +3337,7 @@
''__Arms Tattoo__ (
<<if $tempSlave.armsTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.armsTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.armsTat" 0>>None
<<radiobutton "$tempSlave.armsTat" "tribal patterns">>Tribal Patterns
@@ -3353,7 +3353,7 @@
''__Legs Tattoo__ (
<<if $tempSlave.legsTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.legsTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.legsTat" 0>>None
<<radiobutton "$tempSlave.legsTat" "tribal patterns">>Tribal Patterns
@@ -3369,7 +3369,7 @@
''__Boobs Tattoo__ (
<<if $tempSlave.boobsTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.boobsTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.boobsTat" 0>>None
<<radiobutton "$tempSlave.boobsTat" "tribal patterns">>Tribal Patterns
@@ -3385,7 +3385,7 @@
''__Butt Tattoo__ (
<<if $tempSlave.buttTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.buttTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.buttTat" 0>>None
<<radiobutton "$tempSlave.buttTat" "tribal patterns">>Tribal Patterns
@@ -3401,7 +3401,7 @@
''__Vagina Tattoo__ (
<<if $tempSlave.vaginaTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.vaginaTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.vaginaTat" 0>>None
<<radiobutton "$tempSlave.vaginaTat" "tribal patterns">>Tribal Patterns
@@ -3417,7 +3417,7 @@
''__Anus Tattoo__ (
<<if $tempSlave.anusTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.anusTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.anusTat" 0>>None
<<radiobutton "$tempSlave.anusTat" "bleached">>Bleached
@@ -3432,7 +3432,7 @@
''__Dick Tattoo__ (
<<if $tempSlave.dickTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.dickTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.dickTat" 0>>None
<<radiobutton "$tempSlave.dickTat" "tribal patterns">>Tribal Patterns
@@ -3446,7 +3446,7 @@
''__Tramp Stamp Tattoo__ (
<<if $tempSlave.stampTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.stampTat@@<</if>>
- )''
+ )''
<br>
<<radiobutton "$tempSlave.stampTat" 0>>None
<<radiobutton "$tempSlave.stampTat" "tribal patterns">>Tribal Patterns
diff --git a/src/debugging/debugJS.tw b/src/debugging/debugJS.tw
index 8649e9fb5220fba7afe36df458345ba4f26122a8..a9c993ef2ea91326cde23640dd1464a64ad32f8e 100644
--- a/src/debugging/debugJS.tw
+++ b/src/debugging/debugJS.tw
@@ -11,7 +11,7 @@ window.generateDiffArray = function generateDiffArray(obj) {
return diffArray;
};
-/*
+/*
Shamelessly copied from https://codereview.stackexchange.com/a/11580
Finds and returns the difference between two objects. Potentially will have arbitrary nestings of objects.
*/
@@ -40,9 +40,9 @@ window.difference = function difference(o1, o2) {
return false;
};
-/*
+/*
Shamelessly copied from https://stackoverflow.com/a/19101235
-Flattens an object while concatenating property names.
+Flattens an object while concatenating property names.
For example {id: {number: 4, name: "A"}} --> {id.number: 4, id.name: "A"}
*/
window.diffFlatten = function diffFlatten(data) {
diff --git a/src/debugging/debugWidgets.tw b/src/debugging/debugWidgets.tw
index e8abc812f9913a32ee4eeb924a778d0e37b1e9cc..b4d13efc7b22536bd3b063747a4c3eaadd47dab3 100644
--- a/src/debugging/debugWidgets.tw
+++ b/src/debugging/debugWidgets.tw
@@ -31,7 +31,7 @@ Differences:
<<link "Show more">>
<<replace "#extraInfo">>
Alternate display:
- <<for _i = 0; _i < _diffArrayFromOld.length; _i++>> /* Print variable names, and changed values. Will output the old values correctly, may not output new values correctly */
+ <<for _i = 0; _i < _diffArrayFromOld.length; _i++>> /* Print variable names, and changed values. Will output the old values correctly, may not output new values correctly */
<<if _diffArrayFromOld[_i].variable != "nextButton" && _diffArrayFromOld[_i].variable != "nextLink" && _diffArrayFromOld[_i].variable != "args">>
<br> Variable: <<print _diffArrayFromOld[_i].variable>>, Original Value: <<print _diffArrayFromOld[_i].oldVal>>, New Value: <<print _diffArrayFromOld[_i].newVal>>
<</if>>
diff --git a/src/events/intro/economyIntro.tw b/src/events/intro/economyIntro.tw
index 4b72811290c40a436fc445022216374ddfdbe868..6bce3ce2d2f011b84fd8f93931955d4473259614 100644
--- a/src/events/intro/economyIntro.tw
+++ b/src/events/intro/economyIntro.tw
@@ -23,7 +23,7 @@
<</if>>
/*Economy settings*/
- <br><br>@@.orange;How fast is it crumbling?@@
+ <br><br>@@.orange;How fast is it crumbling?@@ //Some economic content requires this to be set to harder than vanilla//
<<if $difficultySwitch == 0>>
<br>''Barely noticeable, for now.'' //Vanilla//
<br>[[Harder|Economy Intro][$econRate = 1, $difficultySwitch = 1]]
diff --git a/src/facilities/nursery/childInteract.tw b/src/facilities/nursery/childInteract.tw
index 47f74cedf8a90b4c158178dfd9dddf4fca82ddf4..82bd339a4fc1093f081aa8102c1468d40a49adb4 100644
--- a/src/facilities/nursery/childInteract.tw
+++ b/src/facilities/nursery/childInteract.tw
@@ -297,90 +297,90 @@
<br> //Nice://
<<link "Apron">><<set $activeChild.clothes = "an apron",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Ballgown">><<set $activeChild.clothes = "a ball gown",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Bangles">><<set $activeChild.clothes = "slutty jewelry",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Battlearmor">><<set $activeChild.clothes = "battlearmor",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Battledress">><<set $activeChild.clothes = "battledress",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Biyelgee costume">><<set $activeChild.clothes = "a biyelgee costume",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Bodysuit">><<set $activeChild.clothes = "a comfortable bodysuit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Boyshorts">><<set $activeChild.clothes = "boyshorts",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Bra">><<set $activeChild.clothes = "a bra",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Burkini">><<set $activeChild.clothes = "a burkini",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Burqa">><<set $activeChild.clothes = "a burqa",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Button-up shirt and panties">><<set $activeChild.clothes = "a button-up shirt and panties",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Button-up shirt">><<set $activeChild.clothes = "a button-up shirt",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Cheerleader">><<set $activeChild.clothes = "a cheerleader outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">><<print $activeChild.clothes>><</replace>><</link>>
-| <<link "Clubslut netting">><<set $activeChild.clothes = "clubslut netting",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Cutoffs and a t-shirt">><<set $activeChild.clothes = "cutoffs and a t-shirt",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Cutoffs">><<set $activeChild.clothes = "cutoffs",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Cybersuit">><<set $activeChild.clothes = "a cybersuit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Dirndl">><<set $activeChild.clothes = "a dirndl",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Fallen nun">><<set $activeChild.clothes = "a fallen nuns habit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Gothic lolita dress">><<set $activeChild.clothes = "a gothic lolita dress",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Haltertop dress">><<set $activeChild.clothes = "a halter top dress",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Hanbok">><<set $activeChild.clothes = "a hanbok",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Hijab and abaya">><<set $activeChild.clothes = "a hijab and abaya",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Hijab and blouse">><<set $activeChild.clothes = "a hijab and blouse",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Jeans">><<set $activeChild.clothes = "jeans",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Kitty lingerie">><<set $activeChild.clothes = "kitty lingerie",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Ku Klux Klan Robe (nice)">><<set $activeChild.clothes = "a klan robe",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Ku Klux Klan Robe (slutty)">><<set $activeChild.clothes = "a slutty klan robe",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Latex catsuit">><<set $activeChild.clothes = "a latex catsuit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Leather pants and a tube top">><<set $activeChild.clothes = "leather pants and a tube top",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Leather pants and pasties">><<set $activeChild.clothes = "leather pants and pasties",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Leather pants">><<set $activeChild.clothes = "leather pants",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Lederhosen">><<set $activeChild.clothes = "lederhosen",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Leotard">><<set $activeChild.clothes = "a leotard",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Maid (nice)">><<set $activeChild.clothes = "a nice maid outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Maid (slutty)">><<set $activeChild.clothes = "a slutty maid outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Military uniform">><<set $activeChild.clothes = "a military uniform",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Mini dress">><<set $activeChild.clothes = "a mini dress",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Monokini">><<set $activeChild.clothes = "a monokini",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Mounty outfit">><<set $activeChild.clothes = "a mounty outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Nice lingerie">><<set $activeChild.clothes = "attractive lingerie",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Niqab and abaya">><<set $activeChild.clothes = "a niqab and abaya",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Nurse (nice)">><<set $activeChild.clothes = "a nice nurse outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Nurse (slutty)">><<set $activeChild.clothes = "a slutty nurse outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "One-piece swimsuit">><<set $activeChild.clothes = "a one-piece swimsuit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Oversized t-shirt and boyshorts">><<set $activeChild.clothes = "an oversized t-shirt and boyshorts",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Oversized t-shirt">><<set $activeChild.clothes = "an oversized t-shirt",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Panties and pasties">><<set $activeChild.clothes = "panties and pasties",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Panties">><<set $activeChild.clothes = "panties",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Police uniform">><<set $activeChild.clothes = "a police uniform",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Pony outfit (nice)">><<set $activeChild.clothes = "a nice pony outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Pony outfit (slutty)">><<set $activeChild.clothes = "a slutty pony outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Red Army uniform">><<set $activeChild.clothes = "a red army uniform",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Scalemail bikini">><<set $activeChild.clothes = "a scalemail bikini",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Schoolgirl">><<set $activeChild.clothes = "a schoolgirl outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Schutzstaffel uniform (nice)">><<set $activeChild.clothes = "a schutzstaffel uniform",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Schutzstaffel uniform (slutty)">><<set $activeChild.clothes = "a slutty schutzstaffel uniform",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Skimpy loincloth">><<set $activeChild.clothes = "a skimpy loincloth",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Slave gown">><<set $activeChild.clothes = "a slave gown",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Slutty outfit">><<set $activeChild.clothes = "a slutty outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Spats and a tank top">><<set $activeChild.clothes = "spats and a tank top",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Sport shorts and a sports bra">><<set $activeChild.clothes = "sport shorts and a sports bra",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Sport shorts and t-shirt">><<set $activeChild.clothes = "sport shorts and a t-shirt",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Sport shorts">><<set $activeChild.clothes = "sport shorts",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Sports bra">><<set $activeChild.clothes = "a sports bra",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "String bikini">><<set $activeChild.clothes = "a string bikini",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Striped bra">><<set $activeChild.clothes = "a striped bra",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Striped panties">><<set $activeChild.clothes = "striped panties",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Striped underwear">><<set $activeChild.clothes = "striped underwear",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Succubus costume">><<set $activeChild.clothes = "a succubus outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Suit (nice)">><<set $activeChild.clothes = "nice business attire",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Suit (slutty)">><<set $activeChild.clothes = "slutty business attire",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Sweater and cutoffs">><<set $activeChild.clothes = "a sweater and cutoffs",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Sweater and panties">><<set $activeChild.clothes = "a sweater and panties",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Sweater">><<set $activeChild.clothes = "a sweater",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "T-shirt and jeans">><<set $activeChild.clothes = "a t-shirt and jeans",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "T-shirt and panties">><<set $activeChild.clothes = "a t-shirt and panties",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "T-shirt and thong">><<set $activeChild.clothes = "a t-shirt and thong",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "T-shirt">><<set $activeChild.clothes = "a t-shirt",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Tank-top and panties">><<set $activeChild.clothes = "a tank-top and panties",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Tank-top">><<set $activeChild.clothes = "a tank-top",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Thong">><<set $activeChild.clothes = "a thong",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Tube top and thong">><<set $activeChild.clothes = "a tube top and thong",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
-| <<link "Tube top">><<set $activeChild.clothes = "a tube top",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Ballgown">><<set $activeChild.clothes = "a ball gown",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Bangles">><<set $activeChild.clothes = "slutty jewelry",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Battlearmor">><<set $activeChild.clothes = "battlearmor",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Battledress">><<set $activeChild.clothes = "battledress",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Biyelgee costume">><<set $activeChild.clothes = "a biyelgee costume",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Bodysuit">><<set $activeChild.clothes = "a comfortable bodysuit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Boyshorts">><<set $activeChild.clothes = "boyshorts",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Bra">><<set $activeChild.clothes = "a bra",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Burkini">><<set $activeChild.clothes = "a burkini",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Burqa">><<set $activeChild.clothes = "a burqa",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Button-up shirt and panties">><<set $activeChild.clothes = "a button-up shirt and panties",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Button-up shirt">><<set $activeChild.clothes = "a button-up shirt",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Cheerleader">><<set $activeChild.clothes = "a cheerleader outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">><<print $activeChild.clothes>><</replace>><</link>>
+| <<link "Clubslut netting">><<set $activeChild.clothes = "clubslut netting",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Cutoffs and a t-shirt">><<set $activeChild.clothes = "cutoffs and a t-shirt",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Cutoffs">><<set $activeChild.clothes = "cutoffs",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Cybersuit">><<set $activeChild.clothes = "a cybersuit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Dirndl">><<set $activeChild.clothes = "a dirndl",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Fallen nun">><<set $activeChild.clothes = "a fallen nuns habit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Gothic lolita dress">><<set $activeChild.clothes = "a gothic lolita dress",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Haltertop dress">><<set $activeChild.clothes = "a halter top dress",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Hanbok">><<set $activeChild.clothes = "a hanbok",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Hijab and abaya">><<set $activeChild.clothes = "a hijab and abaya",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Hijab and blouse">><<set $activeChild.clothes = "a hijab and blouse",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Jeans">><<set $activeChild.clothes = "jeans",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Kitty lingerie">><<set $activeChild.clothes = "kitty lingerie",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Ku Klux Klan Robe (nice)">><<set $activeChild.clothes = "a klan robe",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Ku Klux Klan Robe (slutty)">><<set $activeChild.clothes = "a slutty klan robe",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Latex catsuit">><<set $activeChild.clothes = "a latex catsuit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Leather pants and a tube top">><<set $activeChild.clothes = "leather pants and a tube top",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Leather pants and pasties">><<set $activeChild.clothes = "leather pants and pasties",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Leather pants">><<set $activeChild.clothes = "leather pants",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Lederhosen">><<set $activeChild.clothes = "lederhosen",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Leotard">><<set $activeChild.clothes = "a leotard",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Maid (nice)">><<set $activeChild.clothes = "a nice maid outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Maid (slutty)">><<set $activeChild.clothes = "a slutty maid outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Military uniform">><<set $activeChild.clothes = "a military uniform",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Mini dress">><<set $activeChild.clothes = "a mini dress",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Monokini">><<set $activeChild.clothes = "a monokini",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Mounty outfit">><<set $activeChild.clothes = "a mounty outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Nice lingerie">><<set $activeChild.clothes = "attractive lingerie",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Niqab and abaya">><<set $activeChild.clothes = "a niqab and abaya",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Nurse (nice)">><<set $activeChild.clothes = "a nice nurse outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Nurse (slutty)">><<set $activeChild.clothes = "a slutty nurse outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "One-piece swimsuit">><<set $activeChild.clothes = "a one-piece swimsuit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Oversized t-shirt and boyshorts">><<set $activeChild.clothes = "an oversized t-shirt and boyshorts",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Oversized t-shirt">><<set $activeChild.clothes = "an oversized t-shirt",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Panties and pasties">><<set $activeChild.clothes = "panties and pasties",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Panties">><<set $activeChild.clothes = "panties",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Police uniform">><<set $activeChild.clothes = "a police uniform",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Pony outfit (nice)">><<set $activeChild.clothes = "a nice pony outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Pony outfit (slutty)">><<set $activeChild.clothes = "a slutty pony outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Red Army uniform">><<set $activeChild.clothes = "a red army uniform",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Scalemail bikini">><<set $activeChild.clothes = "a scalemail bikini",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Schoolgirl">><<set $activeChild.clothes = "a schoolgirl outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Schutzstaffel uniform (nice)">><<set $activeChild.clothes = "a schutzstaffel uniform",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Schutzstaffel uniform (slutty)">><<set $activeChild.clothes = "a slutty schutzstaffel uniform",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Skimpy loincloth">><<set $activeChild.clothes = "a skimpy loincloth",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Slave gown">><<set $activeChild.clothes = "a slave gown",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Slutty outfit">><<set $activeChild.clothes = "a slutty outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Spats and a tank top">><<set $activeChild.clothes = "spats and a tank top",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Sport shorts and a sports bra">><<set $activeChild.clothes = "sport shorts and a sports bra",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Sport shorts and t-shirt">><<set $activeChild.clothes = "sport shorts and a t-shirt",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Sport shorts">><<set $activeChild.clothes = "sport shorts",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Sports bra">><<set $activeChild.clothes = "a sports bra",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "String bikini">><<set $activeChild.clothes = "a string bikini",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Striped bra">><<set $activeChild.clothes = "a striped bra",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Striped panties">><<set $activeChild.clothes = "striped panties",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Striped underwear">><<set $activeChild.clothes = "striped underwear",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Succubus costume">><<set $activeChild.clothes = "a succubus outfit",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Suit (nice)">><<set $activeChild.clothes = "nice business attire",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Suit (slutty)">><<set $activeChild.clothes = "slutty business attire",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Sweater and cutoffs">><<set $activeChild.clothes = "a sweater and cutoffs",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Sweater and panties">><<set $activeChild.clothes = "a sweater and panties",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Sweater">><<set $activeChild.clothes = "a sweater",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "T-shirt and jeans">><<set $activeChild.clothes = "a t-shirt and jeans",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "T-shirt and panties">><<set $activeChild.clothes = "a t-shirt and panties",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "T-shirt and thong">><<set $activeChild.clothes = "a t-shirt and thong",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "T-shirt">><<set $activeChild.clothes = "a t-shirt",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Tank-top and panties">><<set $activeChild.clothes = "a tank-top and panties",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Tank-top">><<set $activeChild.clothes = "a tank-top",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Thong">><<set $activeChild.clothes = "a thong",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Tube top and thong">><<set $activeChild.clothes = "a tube top and thong",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
+| <<link "Tube top">><<set $activeChild.clothes = "a tube top",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
<<if isItemAccessible("attractive lingerie for a pregnant woman")>>
| //FS// <<link "Attractive lingerie for a pregnant woman">><<set $activeChild.clothes = "attractive lingerie for a pregnant woman",$activeChild.choosesOwnClothes = 0>><<replace "#clothes">>$activeChild.clothes<</replace>><</link>>
diff --git a/src/facilities/nursery/childSummary.tw b/src/facilities/nursery/childSummary.tw
index b1e40a02f7e0105a4526dd154cb12bf006f0f819..8879bd285643b9b39f5533ca3954d20ff9c56fa6 100644
--- a/src/facilities/nursery/childSummary.tw
+++ b/src/facilities/nursery/childSummary.tw
@@ -24,24 +24,24 @@
<<if $useSlaveListInPageJSNavigation == 1>>
<<set _Count = _indexSlavesIdxs.length>>
/* Useful for finding weird combinations -- usages of this passage that don't yet generate the quick index.
- * <<print 'pass/count/indexed/flag::[' + _Pass + '/' + _Count + '/' + _indexed + '/' + $Flag + ']'>>
+ * <<print 'pass/count/indexed/flag::[' + _Pass + '/' + _Count + '/' + _indexed + '/' + $Flag + ']'>>
*/
<<if ((_Count > 1) && (_indexed == 0) && (((_Pass == 'Main') && (ndef $Flag) && (($useSlaveSummaryTabs == 0) || ($childAssignmentTab == "all"))) || ($Flag == 1)))>>
<<set _indexed = 1, _counter = 0, _buttons = [], _offset = -50>>
<<if (/Select/i.test(_Pass))>>
- <<set _offset = -25>>
+ <<set _offset = -25>>
<</if>>
<br />
<<set _tableCount = _tableCount || 0>>
<<set _tableCount++>>
/*
- * we want <button data-quick-index="<<= _tableCount>>"> ...
- */
+ * we want <button data-quick-index="<<= _tableCount>>"> ...
+ */
<<set _buttonAttributes = { 'data-quick-index': _tableCount }>>
<<htag _buttonAttributes 'button'>>Quick Index<</htag>>
/*
- * we want <div id="list_index3" class=" hidden">...
- */
+ * we want <div id="list_index3" class=" hidden">...
+ */
<<set _divAttributes = { id: 'list_index' + _tableCount, class: 'hidden'}>>
<<htag _divAttributes>>
<<for !_.isUndefined(_csii = _indexSlavesIdxs.shift())>>
diff --git a/src/facilities/nursery/nursery.tw b/src/facilities/nursery/nursery.tw
index b3212684ccdd27de2c44eb87c0f9c4aa67272cd7..8e29818e3c1618a3da1efb3fa9da97c736b55225 100644
--- a/src/facilities/nursery/nursery.tw
+++ b/src/facilities/nursery/nursery.tw
@@ -376,7 +376,7 @@ Reserve an eligible mother-to-be's child to be placed in a room upon birth. Of $
<br><br>
Target age for release: <<textbox "$targetAgeNursery" $targetAgeNursery "Nursery">>
- [[Minimum Legal Age|Nursery][$targetAgeNursery = $minimumSlaveAge]]
+ [[Minimum Legal Age|Nursery][$targetAgeNursery = $minimumSlaveAge]]
| [[Average Age of Fertility|Nursery][$targetAgeNursery = $fertilityAge]]
| [[Average Age of Potency|Nursery][$targetAgeNursery = $potencyAge]]
| [[Legal Adulthood|Nursery][$targetAgeNursery = 18]]
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index c05a40ff15a442b1ab94040a7cb25bc0b2fc52a6..39fff677d9c34ebc5cfe4d702ba37f5c01f30755 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -812,7 +812,7 @@ Choose a more particular entry below:
<<case "Farmer">>
- <br><br>A ''Farmer'' can be selected once the [[Farmyard|Encyclopedia][$encyclopedia = "Farmyard"]] facility is built. Having applicable [[career experience|Encyclopedia][$encyclopedia = "Career Experience"]] and strong [[muscles|Encyclopedia][$encyclopedia = "Musculature"]] allow a Farmer to maintain the different crops and animals.
+ <br><br>A ''Farmer'' can be selected once the [[Farmyard|Encyclopedia][$encyclopedia = "Farmyard"]] facility is built. Having applicable [[career experience|Encyclopedia][$encyclopedia = "Career Experience"]] and strong [[muscles|Encyclopedia][$encyclopedia = "Musculature"]] allow a Farmer to maintain the different crops and animals.
<br>
//This description needs to be expanded.//
diff --git a/src/gui/css/familyTree.tw b/src/gui/css/familyTree.tw
index 6406e53ef00007497d92c23d18606d84b55950e1..fdddb4d0ea42cfe9c0593dbd619026b143974907 100644
--- a/src/gui/css/familyTree.tw
+++ b/src/gui/css/familyTree.tw
@@ -60,7 +60,7 @@
font-weight: bold;
margin: 0;
background: #ffffff88;
- border: 2px solid Gold;
+ border: 2px solid Gold;
white-space: nowrap;
}
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 317dd630dbbead9a4016ab24ea6117ab659489b7..5508ff1f8d765ac88bc5cdb4c3ac8d70d3168531 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1450,7 +1450,7 @@ erectileImplant: 0
<<set $postSexCleanUp = 1>>
-<<set $DefaultBirthDestination = "anywhere">>
+<<set $DefaultBirthDestination = "individually decided fates">>
<<set $abbreviateHormoneBalance = 2>>
<<goto "Alpha disclaimer">>
diff --git a/src/js/SetBellySize.tw b/src/js/SetBellySize.tw
index 15a0399dcacaae6da27f39e11ad1c34a8cf10929..48bb9d520706ce0e23de11fae705ec66dba994e8 100644
--- a/src/js/SetBellySize.tw
+++ b/src/js/SetBellySize.tw
@@ -2,7 +2,7 @@
window.SetBellySize = function SetBellySize(slave) {
let _implantSize;
- WombNormalizePreg(slave); /*now with support for legacy code that advance pregnancy by setting .preg++ */
+ WombNormalizePreg(slave); /*now with support for legacy code that advance pregnancy by setting .preg++ */
if (slave.bellyImplant > 0)
_implantSize = slave.bellyImplant;
diff --git a/src/js/accordianJS.tw b/src/js/accordianJS.tw
index 836311ecda63ed257613a4904e955466fcc2a5b0..67555db48225164444e9bc22487ce6b434b0b4d5 100644
--- a/src/js/accordianJS.tw
+++ b/src/js/accordianJS.tw
@@ -8,13 +8,13 @@
* with other scripts, since anything poking the DOM here will be done last
*
* Dev Note: The accordion mod should be able to turn *anything* into an accordion. This iteration
- * is configured tightly for the end of week report runs, but it shouldn't be that hard to adapt for
+ * is configured tightly for the end of week report runs, but it shouldn't be that hard to adapt for
* other uses, like character bios. For now, I'll see what other extra-long passages of cosmetic text
* might benefit.
*
* 000-250-006 03092017
*/
-
+
postdisplay["doAccordionSet"] = function (content) {
if (variables().useAccordion == 1) {
Array.prototype.slice.call(document.querySelectorAll('.macro-include'))
diff --git a/src/js/assignJS.tw b/src/js/assignJS.tw
index 9d35a4ce091f557942873a8cadb6ae0de5fe1bd2..342e01aa19aa8d064d65604d6f91112112a41697 100644
--- a/src/js/assignJS.tw
+++ b/src/js/assignJS.tw
@@ -517,4 +517,4 @@ window.removeJob = function removeJob(slave, assignment) {
V.slaves[idx] = slave;
return r;
-};
+};
\ No newline at end of file
diff --git a/src/js/birthJS.tw b/src/js/birthJS.tw
new file mode 100644
index 0000000000000000000000000000000000000000..cf62acf86868a3865d140fa09973bf63951fe06d
--- /dev/null
+++ b/src/js/birthJS.tw
@@ -0,0 +1,104 @@
+:: birthJS [script]
+
+window.BirthDestinationText = function(choice,slave) {
+ const V = State.variables,T = State.temporary,sn = SlaveFullName(slave);
+ var r = ``;
+ if (T.call !== 1) { if (choice !== "Private") r += `sent to one of ${arcologies[0].name}'s `;
+ } else { if (choice !== "Sold") r += ` ${sn} `;
+ }
+ switch(choice) {
+ case "Breeder":
+ if (T.call !== 1) r += `future minded schools, to be administered fertility and virility treatments as well as be brought up to take pride in reproduction. ${sn} `;
+ if (slave.fetish == "mindbroken" || slave.fuckdoll > 0) {
+ r += `has few thoughts about the matter.`;
+ } else if (slave.devotion > 95) {
+ r += `loves you already, but ${V.he}'ll <span class='hotpink'>love you even more</span> for this. ${V.he} can't wait to see ${V.his} child${T.count > 1 ? 'ren':''} proudly furthering your cause.`;
+ slave.devotion += 4;
+ } else if (slave.devotion > 50) {
+ r += `heard about these and will be <span class='hotpink;happy that ${V.his} child${T.count > 1 ? 'ren':''} will have a purpose in your society other than slavery.</span> ${V.he} will miss ${V.his} child${T.count > 1 ? 'ren':''}, but ${V.he} expected that.`;
+ slave.devotion += 4;
+ } else if (slave.devotion > 20) {
+ r += `will naturally miss ${V.his} child${T.count > 1 ? 'ren':''}, but will is broken enough to hope that ${V.his} offspring will have a better life, or at least an enjoyable one.`;
+ } else {
+ r += `will of course <span class='mediumorchid'>hate you for this.</span> The mere thought of ${V.his} ${fertilityAge} year old daughter${T.count > 1 ? 's':''} swollen with life, and proud of it, fills ${V.him} with <span class='gold'>disdain.</span>`;
+ slave.devotion -= 4, slave.trust -= 4;
+ }
+ break;
+ case "Orphanage":
+ if (slave.fetish == "mindbroken" || slave.fuckdoll > 0) {
+ r += `has few thoughts about the matter.`;
+ } else if (slave.devotion > 95) {
+ r += `worships you so completely that ${V.he} will not resent this.`;
+ } else if ( slave.devotion > 50) {
+ r += `is devoted to you, but ${V.he} will <span class='mediumorchid'>struggle to accept this.</span>`;
+ slave.devotion -= 2;
+ } else if ( slave.devotion > 20) {
+ r += `has accepted being a sex slave, but ${V.he} will <span class='mediumorchid'>resent this intensely.</span>`;
+ slave.devotion -= 3;
+ } else {
+ r += `will of course <span class='mediumorchid'>hate you for this.</span>`;
+ slave.devotion -= 4;
+ }
+ break;
+ case "Citizen":
+ if (T.call !== 1) r += `citizen schools, to be brought up coequal with the arcology's other young people. ${sn} `;
+ if (slave.fetish == "mindbroken" || slave.fuckdoll > 0) {
+ r += `has few thoughts about the matter.`;
+ } else if (slave.devotion > 95) {
+ r += `loves you already, but ${V.he}'ll <span class='hotpink'>love you even more</span> for this.`;
+ } else if (slave.devotion > 50) {
+ r += `knows about these and will be <span class='hotpink'>overjoyed,</span> ${V.he} will miss ${V.his} child${T.count > 1 ? 'ren':''}, but ${V.he} expected that.`;
+ } else if (slave.devotion > 20) {
+ r += `will naturally miss ${V.his} child${T.count > 1 ? 'ren':''}, but will <span class='hotpink;take comfort@@ in the hope that ${V.his} offspring will have a better life.`;
+ } else {
+ r += `will naturally retain some resentment over being separated from ${V.his} child${T.count > 1 ? 'ren':''}, but this should be balanced by hope that ${V.his} offspring will have a better life.`;
+ }
+ break;
+ case "Private":
+ if (T.call !== 1) r += `${T.count > 1 ? 'ren are':' is'} sent to be privately raised, to be brought up as a future high class citizen. ${sn} `;
+ if (slave.fetish == "mindbroken" || slave.fuckdoll > 0) {
+ r += `has few thoughts about the matter.`;
+ } else if (slave.devotion > 95) {
+ r += `will <span class='hotpink'>worship you utterly</span> for this.`;
+ } else if (slave.devotion > 50) {
+ r += `understands that this is the best possible outcome for the offspring of a slave, and will be <span class='hotpink'>overjoyed.</span>`;
+ } else if (slave.devotion > 20) {
+ r += `will miss ${V.his} child${T.count > 1 ? 'ren':''}, but will be <span class='hotpink'>very grateful,</span> since ${V.he}'ll understand this is the best possible outcome for a slave mother.`;
+ } else {
+ r += `will resent being separated from ${V.his} child${T.count > 1 ? 'ren':''}, but <span class='hotpink'>should understand and be grateful</span> that this is the best possible outcome here.`;
+ }
+ r += ` The child${T.count > 1 ? 'ren':''} will be raised privately, with expert care and tutoring, an expensive proposition.`;
+ break;
+ case "Sold":
+ r += `${T.call !== 1 ? "${V.his} ${T.count > 1 ? 'babies':'baby'}":"Where they"} `;
+ if (slave.prestige > 1 || slave.pornPrestige > 2) {
+ T.babyCost = jsRandom(-12,100);
+ if (slave.prematureBirth > 0) T.babyCost = jsRandom(-32,40);
+ r += `went for ${T.curBabies > 1 ? ' a total ':'a'} bid of`;
+ } else {
+ T.babyCost = jsRandom(-12,12);
+ if (slave.prematureBirth > 0) T.babyCost = -45;
+ r += `sold for ${T.curBabies > 1 ? ' a total of':''}`;
+ }
+ const cash = cashFormat(T.count*(50+T.babyCost));r += ` <span class='yellowgreen'>${cash}.</span>`;
+ if (slave.prematureBirth > 0) r += ` A low price due to the added costs of caring for ${T.count > 1 ? 'them':'it'}.`;
+ if (slave.devotion > 20) r += ` ${sn} `;
+ if (slave.fetish == "mindbroken" || slave.fuckdoll > 0) {
+ r += `has few thoughts about the matter.`;
+ } else if (slave.devotion > 95) {
+ r += `adheres to your thoughts so strongly that even though you backed out of caring for ${V.his} child${T.count > 1 ? 'ren':''}, ${V.he} still truly believes you are doing ${V.him} an honor.`;
+ } else if (slave.devotion > 50) {
+ r += `is <span class='mediumorchid'>deeply hurt</span> by your sudden decision to sell ${V.his} child${T.count > 1 ? 'ren':''} instead of having ${T.count > 1 ? 'them':'it'} cared for. ${V.his} trust in your words <span class='gold'>wavers</span> as ${V.he} thinks of ${V.his} child${T.count > 1 ? 'ren':''}'s future.`;
+ slave.trust -= 5, slave.devotion -= 5;
+ } else if (slave.devotion > 20) {
+ r += `is <span class='mediumorchid'>devastated</span> by your sudden decision to sell ${V.his} child${T.count > 1 ? 'ren':''}instead of having ${T.count > 1 ? 'them':'it'} cared for. ${V.his} mind struggles to comprehend <span class='gold'>such betrayal.</span>`;
+ slave.trust -= 10, slave.devotion -= 10;
+ } else {
+ r += `For a moment, ${V.he} saw a glimmer of good in you; <span class='mediumorchid'>${V.he} was clearly wrong.</span> ${V.his} mind struggles to comprehend <span class='gold'>why ${V.he} could ever even think of trusting such a person.</span>`;
+ slave.trust -= 30, slave.devotion -= 30;
+ }
+ V.cash += T.curBabies*(50+T.babyCost);
+ break;
+ }
+ return r;
+};
\ No newline at end of file
diff --git a/src/js/extendedFamilyModeJS.tw b/src/js/extendedFamilyModeJS.tw
index fc1579a6d1a61a4e7ea1331f2e60968480ae8c1d..442370b0363b89c79d3efffa1aca433ece258029 100644
--- a/src/js/extendedFamilyModeJS.tw
+++ b/src/js/extendedFamilyModeJS.tw
@@ -100,7 +100,7 @@ window.areSisters = function(c1, c2) {
var sib = 4;
if(sameMom(c1, c2)) {
sib -= 1;
- }
+ }
if(sameDad(c1, c2)) {
sib -=1;
}
@@ -136,8 +136,8 @@ window.totalRelatives = function(slave) {
return relatives
};
-window.mutualChildren = function(slave1, slave2, slaves) {
- return slaves.filter(function(s) { return s.ID != slave1.ID && s.ID != slave2.ID && s.mother > 0 && s.father > 0 && ((s.mother == slave1.ID && s.father == slave2.ID) || (s.mother == slave2.ID && s.father == slave1.ID)); }).length;
+window.mutualChildren = function(slave1, slave2, slaves) {
+ return slaves.filter(function(s) { return s.ID != slave1.ID && s.ID != slave2.ID && s.mother > 0 && s.father > 0 && ((s.mother == slave1.ID && s.father == slave2.ID) || (s.mother == slave2.ID && s.father == slave1.ID)); }).length;
}
window.isSlaveAvailable = function(slave) {
diff --git a/src/js/familyTree.tw b/src/js/familyTree.tw
index b0e366fc86bbe2af405ffacfc4d1877e78e8fba0..6cf960120fba00c4f96f0ced269cc202c6f26aa9 100644
--- a/src/js/familyTree.tw
+++ b/src/js/familyTree.tw
@@ -464,7 +464,7 @@ window.buildFamilyTree = function(slaves = State.variables.slaves, filterID) {
return family_graph;
};
-/*Old version. To use, do something like:
+/*Old version. To use, do something like:
<div id="editFamily">
<div id="graph"></div>
</div>
diff --git a/src/js/hTagMacroJS.tw b/src/js/hTagMacroJS.tw
index d33e0f20e8ee26ed9d4e72a8df50050af3fccc8b..25a3d459fef6ba3a6b1ae957d84331baa34301e0 100644
--- a/src/js/hTagMacroJS.tw
+++ b/src/js/hTagMacroJS.tw
@@ -3,9 +3,9 @@
/*
* <<htag>> macro
* A simple macro which allows to create wrapping html elements with dynamic IDs.
- * idea blatantly robbed from the spanMacroJS.tw but expanded to a more generic
+ * idea blatantly robbed from the spanMacroJS.tw but expanded to a more generic
* case, allowing <div>, <button> or whatever you want. elements, default is for
- * the div though. In addition, you can pass an object in as the first argument
+ * the div though. In addition, you can pass an object in as the first argument
* instead of an id, and each of the object's attributes will become attributes
* of the generate tag.
*
diff --git a/src/js/pregJS.tw b/src/js/pregJS.tw
index 24e623c7bd4b3200e916192c34641d9c3cea7edb..df33cb05f7a269084df82b7e859b96d273ce3162 100644
--- a/src/js/pregJS.tw
+++ b/src/js/pregJS.tw
@@ -254,7 +254,7 @@ window.setPregType = function(actor) {
ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 0, 1]); //base chance for twins
}
if(actor.ovaImplant == "fertility") {
- ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 0, 1]);
+ ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 0, 1]);
fertilityStack++;
}
if(actor.hormones == 2) {
diff --git a/src/js/rbuttonJS.tw b/src/js/rbuttonJS.tw
index 960db5bdd345e89c87bb9c1a034f68499b5be914..1c842ff6b94513bd663953000c14123b9a54a39a 100644
--- a/src/js/rbuttonJS.tw
+++ b/src/js/rbuttonJS.tw
@@ -1,10 +1,10 @@
:: rbuttonJS [script]
/* This is modified radiobutton macro, for automatic checked state setup*/
-/* Usage (be sure to use quotes around parameters):
+/* Usage (be sure to use quotes around parameters):
<<rbutton "$variable" "value">>
Or:
- <<rbutton "$variable" "value" "HTML_element_ID" "Text to replace with, inside html element with ID from previous parameter. <br> HTML tags allowed.">>
+ <<rbutton "$variable" "value" "HTML_element_ID" "Text to replace with, inside html element with ID from previous parameter. <br> HTML tags allowed.">>
Group of radiobutton will be created based on variable name. Checked state will be set up if variable contain value matched with second parameter. Full form of macro call can be used to display extended description of selected value.
*/
diff --git a/src/npc/descriptions/fLips.tw b/src/npc/descriptions/fLips.tw
index 8be83eb44bfd4801b67929c4ee30a649c0355647..34efd56c3898562d5e5d1ed5ddc34fe10623de83 100644
--- a/src/npc/descriptions/fLips.tw
+++ b/src/npc/descriptions/fLips.tw
@@ -27,7 +27,7 @@ You tell $activeSlave.slaveName to
$He's delighted at the prospect of $his favorite activity.
<</if>>
-<<switch $activeSlave.collar>>
+<<switch $activeSlave.collar>>
<<case "dildo gag">>
<<if ($activeSlave.amp != 1)>>
$He removes the dildo from $his throat, leaving the ring gag in place.
diff --git a/src/npc/descriptions/fVagina.tw b/src/npc/descriptions/fVagina.tw
index 5f33a220175d14aaf8ec60befee59aa6e4bc881e..7a584b3395ed91145ab322880e2cf21996b798e0 100644
--- a/src/npc/descriptions/fVagina.tw
+++ b/src/npc/descriptions/fVagina.tw
@@ -191,7 +191,7 @@ You call $him over so you can
<<if $activeSlave.dickAccessory == "chastity" || $activeSlave.dickAccessory == "combined chastity">>
$His dick chastity keeps $his useless bitchclit out of the way.
<<elseif !canAchieveErection($activeSlave)>>
- As you use $him as a helpless cock jacket, $his
+ As you use $him as a helpless cock jacket, $his
<<if $activeSlave.dick < 7>>
flaccid dick flops around, ignored.
<<else>>
diff --git a/src/npc/fKiss.tw b/src/npc/fKiss.tw
index cea7d6943e7b53d00da4c743024e9f097ebe760a..5b99a6668b18695da6e36d64ff9ce41c1fe1371f 100644
--- a/src/npc/fKiss.tw
+++ b/src/npc/fKiss.tw
@@ -1,7 +1,7 @@
:: FKiss [nobr]
You tell $activeSlave.slaveName to
-<<switch $activeSlave.collar>>
+<<switch $activeSlave.collar>>
<<case "dildo gag">>
<<if ($activeSlave.amp != 1)>>
remove $his dildo gag and approach you.
@@ -38,9 +38,9 @@ You tell $activeSlave.slaveName to
<<elseif ($activeSlave.relationship == -2)>>
$He hurriedly complies, happy to be near the object of $his longing. Once $he's close, you take a moment to gaze deeply
<<if canSee($activeSlave)>>
- into $his $activeSlave.eyeColor eyes. $He finds the intense look from the _womanP $he loves overwhelming, and $his eyes flick downward after a moment.
+ into $his $activeSlave.eyeColor eyes. $He finds the intense look from the _womanP $he loves overwhelming, and $his eyes flick downward after a moment.
<<else>>
- upon $his face. $He senses the intense look from the _womanP $he loves and finds it overwhelming, and after a moment glances away.
+ upon $his face. $He senses the intense look from the _womanP $he loves and finds it overwhelming, and after a moment glances away.
<</if>>
$He blushes furiously.
<<elseif ($activeSlave.relationship == -3)>>
@@ -80,7 +80,7 @@ You tell $activeSlave.slaveName to
<<if canSee($activeSlave)>>
into $his $activeSlave.eyeColor eyes. $He finds the intense look from $his beloved <<= WrittenMaster($activeSlave)>> disconcerting, and $his eyes flick downward after a moment.
<<else>>
- upon $his face. $He senses the intense look from $his beloved <<= WrittenMaster()>> and finds it disconcerting, and after a moment glances away.
+ upon $his face. $He senses the intense look from $his beloved <<= WrittenMaster()>> and finds it disconcerting, and after a moment glances away.
<</if>>
$He blushes furiously.
<<elseif ($activeSlave.devotion > 50)>>
diff --git a/src/npc/newSlaveIncestSex.tw b/src/npc/newSlaveIncestSex.tw
index e5ece5b0432aab21b9c115c1dfe630ca198548bf..13f2283c2edb80666c08bcd446a9ac1bbf6ef1ad 100644
--- a/src/npc/newSlaveIncestSex.tw
+++ b/src/npc/newSlaveIncestSex.tw
@@ -130,7 +130,7 @@ You indicate them to present themselves to you. Still shaking from the aftershoc
<</link>>
/*
-<<link "Show them how cruel life in your arcology can be">>
+<<link "Show them how cruel life in your arcology can be">>
TODO: this needs to be written
<<replace "#result">>
<</replace>>
diff --git a/src/npc/takeoverTarget.tw b/src/npc/takeoverTarget.tw
index fcff0c6b51e629deedd57468aeb29ceeef1faeb1..0a3e42fe8c4c73e7bf3e02c811049672f9c133a4 100644
--- a/src/npc/takeoverTarget.tw
+++ b/src/npc/takeoverTarget.tw
@@ -2,7 +2,7 @@
<<set $ui = "start", $showBodyMods = 1>>
-Before you deploy the
+Before you deploy the
<<if $PC.rumor == "wealth">>
financial reserves that
<<elseif $PC.rumor == "diligence">>
diff --git a/src/npc/uploadSlave.tw b/src/npc/uploadSlave.tw
index 3033bda1981ec4f41f34d0970302db7046cd4d86..d5372f3c0f6440e2b90f381f28f55204c4b8b125 100644
--- a/src/npc/uploadSlave.tw
+++ b/src/npc/uploadSlave.tw
@@ -111,7 +111,7 @@ preg: $activeSlave.preg,
pregSource: 0,
pregType: $activeSlave.pregType,
broodmother: $activeSlave.broodmother,
-broodmotherFetuses: $activeSlave.broodmotherFetuses,
+broodmotherFetuses: $activeSlave.broodmotherFetuses,
broodmotherOnHold: $activeSlave.broodmotherOnHold,
broodmotherCountDown: $activeSlave.broodmotherCountDown,
labor: $activeSlave.labor,
diff --git a/src/player/actions/fCaress.tw b/src/player/actions/fCaress.tw
index ca68fd6b0b69b72f1fb4b1eed1c667b643d04a3e..31f69b776a742c275686a0432c5fdaf0cfb44f0d 100644
--- a/src/player/actions/fCaress.tw
+++ b/src/player/actions/fCaress.tw
@@ -59,7 +59,7 @@ You delicately lift $his head and touch your fingertips to $his chin, tenderly b
<<if ($activeSlave.lipsPiercing+$activeSlave.tonguePiercing > 2)>>
You touch each of $his facial piercings, one by one, feeling the hard metal contrast with $his pliant flesh.
<</if>>
-Then, you gently tilt $his <<if $activeSlave.face > 95>>overwhelmingly stunning<<elseif $activeSlave.face > 10>>alluring<<elseif $activeSlave.face >= -10>>appealing<<elseif $activeSlave.face >= -40>>plain<<else>>rough<</if>> head back and lightly touch $his
+Then, you gently tilt $his <<if $activeSlave.face > 95>>overwhelmingly stunning<<elseif $activeSlave.face > 10>>alluring<<elseif $activeSlave.face >= -10>>appealing<<elseif $activeSlave.face >= -40>>plain<<else>>rough<</if>> head back and lightly touch $his
<<if $activeSlave.lips > 95>>facepussy
<<else>>
<<if $activeSlave.lips > 70>>pillowlike
diff --git a/src/player/actions/fEmbrace.tw b/src/player/actions/fEmbrace.tw
index ea2c6c277c6a154ede5bcb44fb4bda1887c8d89e..e73470cf8221e62525c4d7d1d0225bc77cbd0006 100644
--- a/src/player/actions/fEmbrace.tw
+++ b/src/player/actions/fEmbrace.tw
@@ -66,7 +66,7 @@ You walk around $him and put your hands around $his abdomen,<<if ($activeSlave.a
<<elseif ($activeSlave.relationship == -2)>>
In the warmth of your embrace, $he turns towards you, $his passionate $activeSlave.eyeColor eyes staring intently at your face. $He leans closer to you and kisses you as you hold $him. $His heart beats faster and then gradually slows as $he grows accustomed to your body against $hers. Eventually, $he relaxes totally and $his eyes gradually close, melting in your arms. When you finally stop and relax your embrace, $his eyes remain closed and $his mouth still in a rapturous shape for a moment before $he slowly opens $his eyes and smiles at you with a blissful look on $his face. <<if ($activeSlave.amp != 1)>> $His hand reaches to your arms and $he strokes them longingly.<</if>> <<if ($activeSlave.amp == 1) && !canTalk($activeSlave)>>$He slowly opens them and does $his best to communicate love with $his $activeSlave.eyeColor eyes.<<elseif !canTalk($activeSlave)>>$He signs that $he loves you.<<else>>"I love you, <<Master>>," $he <<say>>s dreamily.<</if>> $He looks at you, almost begging you with $his eyes that $he wants much more than a mere embrace.
<<elseif ($activeSlave.devotion > 50) && ($activeSlave.fetish == "dom") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
- In your soft, warm embrace, $he tries hard to stop $himself from losing $himself in your arms.
+ In your soft, warm embrace, $he tries hard to stop $himself from losing $himself in your arms.
<<if ($activeSlave.amp != 1)>> $He starts to embrace you in $his arms as well. When you gently squeeze $him in your arms, $he breathes more heavily and starts to lovingly squeeze you as well, $his tendency towards sexual dominance encouraging $him to compete with you in embraces against each other.
<<else>> When you gently squeeze $him in your arms, $he breathes more heavily before relaxing against you.
<</if>>
diff --git a/src/pregmod/basenationalitiesControls.tw b/src/pregmod/basenationalitiesControls.tw
index 88ce174724c52911c02da2a8aa65845b201267eb..c2bc54130fed19119db266f9ae0180c4e457bcf7 100644
--- a/src/pregmod/basenationalitiesControls.tw
+++ b/src/pregmod/basenationalitiesControls.tw
@@ -34,7 +34,7 @@ Adjust slave populations:
<br style="clear:both" /><hr style="margin:0">
/* Filter controls */
-Filter by Race:
+Filter by Race:
<<for _i = 0; _i < setup.filterRaces.length; _i++>>
<<set _race = setup.filterRaces[_i]>>
<<if $baseControlsFilter == _race.toLowerCase().replace(/[ -]/g, '')>>
@@ -113,7 +113,7 @@ Filter by Region:
return races[_race.toLowerCase()] * 2 > hashSum(races); })>>
<<if _racialNationalities.length > 0>>
<<= "<div style='float: left; width: 13em; padding: 0 5px;' title='"
- + (_racialNationalities.length > 0 ? _racialNationalities.join(", ") : "(none)")
+ + (_racialNationalities.length > 0 ? _racialNationalities.join(", ") : "(none)")
+"'>_race @@.plusButton; <<link '+'>>
<<run setup.baseNationalities.filter(function(n) {
var races = setup.raceSelector[n] || setup.raceSelector[''];
@@ -135,7 +135,7 @@ Filter by Region:
<div style="float: left;">
<<set _nation = _keys[_i]>>
<<print "
- _nation
+ _nation
@@.plusButton;<<link '+'>>
<<set hashPush($nationalities, _keys[" + _i + "])>>
<<replace '#PopControl'>><<include 'Basenationalities Controls'>><</replace>>
diff --git a/src/pregmod/beastFuck.tw b/src/pregmod/beastFuck.tw
index acc29050280266b13e29db14c9eef2b59a241fb4..60d9157a74631b64bdb12452efe4d0a50aa5c311 100644
--- a/src/pregmod/beastFuck.tw
+++ b/src/pregmod/beastFuck.tw
@@ -167,7 +167,7 @@ before calling in the _animal.species. The _animal.species slowly saunters up to
The hound wastes no time in beginning to hammer away at $his <<if canDoVaginal($activeSlave)>>cunt<<else>>asshole<</if>>, causing $activeSlave.slaveName to moan uncontrollably as its thick, veiny member probes the depths of $his <<if (canDoVaginal($activeSlave))>>pussy<<else>>asshole<</if>>.
A few short minutes later, $he gives a loud groan <<if ($activeSlave.fetish == "masochist") || ($activeSlave.fetish == "humiliation") || $activeSlave.sexualQuirk == "perverted" || $activeSlave.behavioralQuirk == "sinful">>and shakes in orgasm <</if>>as the dog's knot begins to swell and its penis begins to erupt a thick stream of jizz into $him.
- After almost a minute, the dog has finally finished cumming and its knot is sufficiently small enough that the dog is able to pull its cock out, causing a stream of cum to slide out of $his <<if ($activeSlave.vagina <= 2)>>@@.lime;now-gaping <<if (canDoVaginal($activeSlave))>>pussy<<else>>asshole<</if>>@@<<else>>
+ After almost a minute, the dog has finally finished cumming and its knot is sufficiently small enough that the dog is able to pull its cock out, causing a stream of cum to slide out of $his <<if ($activeSlave.vagina <= 2)>>@@.lime;now-gaping <<if (canDoVaginal($activeSlave))>>pussy<<else>>asshole<</if>>@@<<else>>
<<if canDoVaginal($activeSlave)>>
<<if $activeSlave.vagina == 3>>
loose
@@ -199,7 +199,7 @@ before calling in the _animal.species. The _animal.species slowly saunters up to
<<elseif (_animal.species == "horse")>>
The horse stands over $him as another slave lines its massive phallus up with $activeSlave.slaveName's <<if canDoVaginal($activeSlave)>><<if ($activeSlave.fetish == "masochistic") || ($activeSlave.fetish == "humiliation") || ($activeSlave.sexualQuirk == "perverted") || ($activeSlave.behavioralQuirk == "sinful")>>wet <</if>>pussy<<else>>ass<</if>>.
- With a slight thrust, it enters $him and begins to fuck $him. $activeSlave.slaveName can't help but give a loud groan as the huge cock <<if ($activeSlave.vagina <= 2)>>@@.lime;stretches@@<<else>>@@.lime;enters@@<</if>> @@.lime;$his@@
+ With a slight thrust, it enters $him and begins to fuck $him. $activeSlave.slaveName can't help but give a loud groan as the huge cock <<if ($activeSlave.vagina <= 2)>>@@.lime;stretches@@<<else>>@@.lime;enters@@<</if>> @@.lime;$his@@
<<if canDoVaginal($activeSlave)>>
<<if $activeSlave.vagina == 0>>
@@.lime;virgin@@
@@ -296,7 +296,7 @@ before calling in the _animal.species. The _animal.species slowly saunters up to
<</if>>
The stallion begins to thrust faster and faster, causing $activeSlave.slaveName to moan and groan in pain as the <<if canDoVaginal($activeSlave)>> tip rams $his cervix<<else>> huge horsecock fills $him completely<</if>>. Before too long, the horse's movements begin to slow, and you can see its large testicles contract slightly as it begins to fill $activeSlave.slaveName's <<if (canDoVaginal($activeSlave))>>pussy<<else>>asshole<</if>> to the brim with thick horse semen.
- After what seems like an impossibly long time, the horse's dick finally begins to soften and it finally pulls out. You have a servant lead the horse away, with a fresh apple as a treat for its good performance.
+ After what seems like an impossibly long time, the horse's dick finally begins to soften and it finally pulls out. You have a servant lead the horse away, with a fresh apple as a treat for its good performance.
<<if (canDoVaginal($activeSlave)) && ($activeSlave.vagina < 4)>>
<<set $activeSlave.vagina = 4>>
diff --git a/src/pregmod/birthStorm.tw b/src/pregmod/birthStorm.tw
index 051cb7cbc3ec58664a95ddb049183cf9bcae261c..d9d1fec6175adcb3bc4d0ae3de463da5b76e2fec 100644
--- a/src/pregmod/birthStorm.tw
+++ b/src/pregmod/birthStorm.tw
@@ -9,9 +9,9 @@ The remote surgery allows the removal of the pregnancy generator through convent
<<if $activeSlave.broodmother == 2>>
$activeSlave.slaveName's obscenely swollen belly begins to shudder and writhe moments after being injected with the drug as all $his waters break. $He spreads $his <<if $activeSlave.amp != 1>>legs to either side of $his spasming bulk as wide as $he can<<else>>stumps as wide as $he can<</if>> with a loud moan. $His vaginal lips part as the first of $his brood is born, followed by another, and another. After hours of constant
<<elseif $activeSlave.broodmother == 1>>
- $activeSlave.slaveName's massive belly shudders and shrinks as all $his waters simultaneously break. $He spreads $his <<if $activeSlave.amp != 1>>legs<<else>>stumps<</if>> wide with a loud moan. $His vaginal lips part as the first of $his brood is born, followed not long after by another. After an hour of constant
+ $activeSlave.slaveName's massive belly shudders and shrinks as all $his waters simultaneously break. $He spreads $his <<if $activeSlave.amp != 1>>legs<<else>>stumps<</if>> wide with a loud moan. $His vaginal lips part as the first of $his brood is born, followed not long after by another. After an hour of constant
<<else>>
- $activeSlave.slaveName's massive belly shudders and shrinks as all $his waters simultaneously break. $He spreads $his <<if $activeSlave.amp != 1>>legs<<else>>stumps<</if>> wide with a loud moan. $His vaginal lips part as $his birthing begins. After an hour of intensive
+ $activeSlave.slaveName's massive belly shudders and shrinks as all $his waters simultaneously break. $He spreads $his <<if $activeSlave.amp != 1>>legs<<else>>stumps<</if>> wide with a loud moan. $His vaginal lips part as $his birthing begins. After an hour of intensive
<</if>>
<<if $activeSlave.fetish == "mindbroken">>
birthing, $he shows little interest in the changes to $his body. @@.red;The ordeal of intensive birthing has had a massive effect on $his health as well as completely destroying $his vagina.@@
diff --git a/src/pregmod/criminalMarkets.tw b/src/pregmod/criminalMarkets.tw
index f08448ff9811c47879eb78265406fe1a0695a9a8..ab81e868f44b7a288fb360c1813d65db05a1003d 100644
--- a/src/pregmod/criminalMarkets.tw
+++ b/src/pregmod/criminalMarkets.tw
@@ -7,7 +7,7 @@
<<set $nextButton = "Continue", $nextLink = "Bulk Slave Intro", $returnTo = "Main", $newSlaveIndex = 0>>
<</if>>
-You board the transport to
+You board the transport to
<<switch $weeklyMarket>>
<<case "low tier criminals">> /* mixed prisoners */
@@ -25,7 +25,7 @@ You board the transport to
<<case "white collar">> /* mixed prisoners */
- what looks more like an oversized vacation home rather than something one goes to for committing crimes. You enter the premises into a small chamber with a booth to the side and are immediately met with, "Ah! We've been waiting for you. Please go in. We'll call someone to guide you immediately."
+ what looks more like an oversized vacation home rather than something one goes to for committing crimes. You enter the premises into a small chamber with a booth to the side and are immediately met with, "Ah! We've been waiting for you. Please go in. We'll call someone to guide you immediately."
<br><br>
You nod at the prompt and enter further into the luxurious building to find a formally dressed guide and what appears to be the holding area of the prison. The cells, if you can call them that, are large and cozy, each with their own computer and television. The air is also conditioned for their comfort and Old World classical music is playing to provide further ambiance. Walking through, you see the prisoners themselves, lazing about in their beds, sitting at their computers or just talking to each other. If there was ever a prison you'd rather end up in, this would be it.
<br><br>
diff --git a/src/pregmod/csec.tw b/src/pregmod/csec.tw
index 540da863686d14697821e0cf57fc80f613c0ec3c..1bb2a94d7ec18ad063173dc28f43279c5bb0becc 100644
--- a/src/pregmod/csec.tw
+++ b/src/pregmod/csec.tw
@@ -213,66 +213,24 @@ Performing a cesarean section is trivial for the remote surgery to carry out. $a
<<set _lostBabies = 1, _babyCost = random(-12,12)>>
sold for a total of @@.yellowgreen;<<print cashFormat(_curBabies*(50+_babyCost))>>.@@
<<set $cash += _curBabies*(50+_babyCost)>>
- <<elseif $universalRulesChildrenBecomeBreeders > 0 && $arcologies[0].FSRepopulationFocus > 40 && $DefaultBirthDestination === "anywhere">>
+ <<elseif $universalRulesChildrenBecomeBreeders > 0 && $arcologies[0].FSRepopulationFocus > 40 && $DefaultBirthDestination === "individually decided fates">>
<<set _lostBabies = 1>>
- sent to one of $arcologies[0].name's future minded schools, to be administered fertility and virility treatments as well as be brought up to take pride in reproduction. $activeSlave.slaveName
- <<if $activeSlave.fetish == "mindbroken" || $activeSlave.fuckdoll > 0>>
- has few thoughts about the matter.
- <<elseif $activeSlave.devotion > 95>>
- loves you already, but $he'll @@.hotpink;love you even more@@ for this. $He can't wait to see $his child<<if _curBabies > 1>>ren<</if>> proudly furthering your cause.
- <<set $activeSlave.devotion += 4>>
- <<elseif $activeSlave.devotion > 50>>
- heard about these and will be @@.hotpink;happy that $his child<<if $activeSlave.pregType > 1>>ren<</if>> will have a purpose in your society other than slavery.@@ $He will miss $his child<<if $activeSlave.pregType > 1>>ren<</if>>, but $he expected that.
- <<set $activeSlave.devotion += 4>>
- <<elseif $activeSlave.devotion > 20>>
- will naturally miss $his child<<if _curBabies > 1>>ren<</if>>, but will is broken enough to hope that $his offspring will have a better life, or at least an enjoyable one.
- <<else>>
- will of course @@.mediumorchid;hate you for this.@@ The mere thought of $his $fertilityAge year old daughter<<if _curBabies > 1>>s<</if>> swollen with life, and proud of it, fills $him with @@.gold;disdain.@@
- <<set $activeSlave.devotion -= 4, $activeSlave.trust -= 4>>
- <</if>>
+ <<= BirthDestinationText("Orphanage",$activeSlave)>>
<<set $breederOrphanageTotal += _curBabies>>
<</if>>
- <<if _lostBabies != 1 && $DefaultBirthDestination === "anywhere">>
+ <<if _lostBabies != 1 && $DefaultBirthDestination === "individually decided fates">>
<br><br>
<<link '...sent to a slave orphanage.'>>
<<replace #_disposition>>
<<set $slaveOrphanageTotal += _curBabies>>
- sent to one of $arcologies[0].name's slave orphanages. $activeSlave.slaveName
- <<if $activeSlave.fetish == "mindbroken" || $activeSlave.fuckdoll > 0>>
- has few thoughts about the matter.
- <<elseif $activeSlave.devotion > 95>>
- worships you so completely that $he will not resent this.
- <<elseif $activeSlave.devotion > 50>>
- is devoted to you, but $he will @@.mediumorchid;struggle to accept this.@@
- <<set $activeSlave.devotion -= 2>>
- <<elseif $activeSlave.devotion > 20>>
- has accepted being a sex slave, but $he will @@.mediumorchid;resent this intensely.@@
- <<set $activeSlave.devotion -= 3>>
- <<else>>
- will of course @@.mediumorchid;hate you for this.@@
- <<set $activeSlave.devotion -= 4>>
- <</if>>
+ <<= BirthDestinationText("Orphanage",$activeSlave)>>
<</replace>>
<<set $nextButton = "Back">><<UpdateNextButton>> /* unlock Continue button */
<</link>>
<<if $arcologies[0].FSRepopulationFocus > 40>>
<br><<link '...sent to a breeder school.'>>
<<replace #_disposition>>
- sent to one of $arcologies[0].name's future minded schools, to be administered fertility and virility treatments as well as be brought up to take pride in reproduction. $activeSlave.slaveName
- <<if $activeSlave.fetish == "mindbroken" || $activeSlave.fuckdoll > 0>>
- has few thoughts about the matter.
- <<elseif $activeSlave.devotion > 95>>
- loves you already, but $he'll @@.hotpink;love you even more@@ for this. $He can't wait to see $his child<<if _curBabies > 1>>ren<</if>> proudly furthering your cause.
- <<set $activeSlave.devotion += 4>>
- <<elseif $activeSlave.devotion > 50>>
- heard about these and will be @@.hotpink;happy that $his child<<if $activeSlave.pregType > 1>>ren<</if>> will have a purpose in your society other than slavery.@@ $He will miss $his child<<if $activeSlave.pregType > 1>>ren<</if>>, but $he expected that.
- <<set $activeSlave.devotion += 4>>
- <<elseif $activeSlave.devotion > 20>>
- will naturally miss $his child<<if _curBabies > 1>>ren<</if>>, but will is broken enough to hope that $his offspring will have a better life, or at least an enjoyable one.
- <<else>>
- will of course @@.mediumorchid;hate you for this.@@ The mere thought of $his $fertilityAge year old daughter<<if _curBabies > 1>>s<</if>> swollen with life, and proud of it, fills $him with @@.gold;disdain.@@
- <<set $activeSlave.devotion -= 4, $activeSlave.trust -= 4>>
- <</if>>
+ <<= BirthDestinationText("Breeder",$activeSlave)>>
<<set $breederOrphanageTotal += _curBabies>>
<</replace>>
<<set $nextButton = "Back">><<UpdateNextButton>> /* unlock Continue button */
@@ -281,18 +239,7 @@ Performing a cesarean section is trivial for the remote surgery to carry out. $a
<</if>>
<br><<link '...sent to a citizen school.'>>
<<replace #_disposition>>
- sent to one of $arcologies[0].name's citizen schools, to be brought up coequal with the arcology's other young people. $activeSlave.slaveName
- <<if $activeSlave.fetish == "mindbroken" || $activeSlave.fuckdoll > 0>>
- has few thoughts about the matter.
- <<elseif $activeSlave.devotion > 95>>
- loves you already, but $he'll @@.hotpink;love you even more@@ for this.
- <<elseif $activeSlave.devotion > 50>>
- knows about these and will be @@.hotpink;overjoyed.@@ $He will miss $his child<<if _curBabies > 1>>ren<</if>>, but $he expected that.
- <<elseif $activeSlave.devotion > 20>>
- will naturally miss $his child<<if _curBabies > 1>>ren<</if>>, but will @@.hotpink;take comfort@@ in the hope that $his offspring will have a better life.
- <<else>>
- will naturally retain some resentment over being separated from $his child<<if _curBabies > 1>>ren<</if>>, but this should be balanced by hope that $his offspring will have a better life.
- <</if>>
+ <<= BirthDestinationText("Citizen",$activeSlave)>>
<<set $activeSlave.devotion += 4, $citizenOrphanageTotal += _curBabies>>
<</replace>>
<<set $nextButton = "Back">><<UpdateNextButton>> /* unlock Continue button */
@@ -300,86 +247,26 @@ Performing a cesarean section is trivial for the remote surgery to carry out. $a
//Will cost <<print cashFormat(100)>> weekly//
<br><<link '...sent to be raised privately.'>>
<<replace #_disposition>>
- The child<<if _curBabies > 1>>ren are<<else>> is<</if>> sent to be privately raised, to be brought up as a future high class citizen. $activeSlave.slaveName
- <<if $activeSlave.fetish == "mindbroken" || $activeSlave.fuckdoll > 0>>
- has few thoughts about the matter.
- <<elseif $activeSlave.devotion > 95>>
- will @@.hotpink;worship you utterly@@ for this.
- <<elseif $activeSlave.devotion > 50>>
- understands that this is the best possible outcome for the offspring of slave, and will be @@.hotpink;overjoyed.@@
- <<elseif $activeSlave.devotion > 20>>
- will miss $his child<<if _curBabies > 1>>ren<</if>>, but will be @@.hotpink;very grateful,@@ since $he'll understand this is the best possible outcome for a slave mother.
- <<else>>
- will resent being separated from $his child<<if _curBabies > 1>>ren<</if>>, but @@.hotpink;should understand and be grateful@@ that this is the best possible outcome here.
- <</if>>
- The child<<if _curBabies > 1>>ren<</if>> will be raised privately, with expert care and tutoring, an expensive proposition.
+ The <<= BirthDestinationText("Private",$activeSlave)>>
<<set $activeSlave.devotion += 6, $privateOrphanageTotal += _curBabies>>
<</replace>>
<<set $nextButton = "Back">><<UpdateNextButton>> /* unlock Continue button */
<</link>>
//Will cost <<print cashFormat(500)>> weekly//
- <<elseif _lostBabies != 1 && $DefaultBirthDestination != "anywhere">>
- $His <<if _curBabies > 1>>babies<<else>>baby<</if>> were sent to $DefaultBirthDestination. $activeSlave.slaveName
+ <<elseif _lostBabies != 1 && $DefaultBirthDestination != "individually decided fates">>
+ <<set _call = 1>> $His <<if _curBabies > 1>>babies<<else>>baby<</if>> were sent to $DefaultBirthDestination.
<<switch $DefaultBirthDestination>>
<<case "an orphanage">>
- <<if $activeSlave.devotion > 95>>
- worships you so completely that $he will not resent this.
- <<elseif $activeSlave.devotion > 50>>
- is devoted to you, but $he will @@.mediumorchid;struggle to accept this.@@
- <<set $activeSlave.devotion -= 2>>
- <<elseif $activeSlave.devotion > 20>>
- has accepted being a sex slave, but $he will @@.mediumorchid;resent this intensely.@@
- <<set $activeSlave.devotion -= 3>>
- <<else>>
- will of course @@.mediumorchid;hate you for this.@@
- <<set $activeSlave.devotion -= 4>>
- <</if>>
+ <<= BirthDestinationText("Orphanage",$activeSlave)>>
<<set $slaveOrphanageTotal += _curBabies>>
<<case "a citizen school">>
- <<if $activeSlave.devotion > 95>>
- loves you already, but <<print $he>>'ll @@.hotpink;love you even more@@ for this.
- <<elseif $activeSlave.devotion > 50>>
- knows about these and will be @@.hotpink;overjoyed.@@ $He will miss $his child<<if _curBabies > 1>>ren<</if>>, but $he expected that.
- <<elseif $activeSlave.devotion > 20>>
- will naturally miss $his child<<if _curBabies > 1>>ren<</if>>, but will @@.hotpink;take comfort@@ in the hope that $his offspring will have a better life.
- <<else>>
- will naturally retain some resentment over being separated from $his child<<if _curBabies > 1>>ren<</if>>, but this should be balanced by hope that $his offspring will have a better life.
- <</if>>
+ <<= BirthDestinationText("Citizen",$activeSlave)>>
<<set $activeSlave.devotion += 4, $citizenOrphanageTotal += _curBabies>>
<<case "a private school">>
- <<if $activeSlave.devotion > 95>>
- will @@.hotpink;worship you utterly@@ for this.
- <<elseif $activeSlave.devotion > 50>>
- understands that this is the best possible outcome for the offspring of slave, and will be @@.hotpink;overjoyed.@@
- <<elseif $activeSlave.devotion > 20>>
- will miss $his child<<if _curBabies > 1>>ren<</if>>, but will be @@.hotpink;very grateful,@@ since <<print $he>>'ll understand this is the best possible outcome for a slave mother.
- <<else>>
- will resent being separated from $his child<<if _curBabies > 1>>ren<</if>>, but @@.hotpink;should understand and be grateful@@ that this is the best possible outcome here.
- <</if>>
- The child<<if _curBabies > 1>>ren<</if>> will be raised privately, with expert care and tutoring, an expensive proposition.
+ <<= BirthDestinationText("Private",$activeSlave)>>
<<set $activeSlave.devotion += 6, $privateOrphanageTotal += _curBabies>>
<<case "the market">>
- <<if $activeSlave.prestige > 1 || $activeSlave.pornPrestige > 2>>
- <<set _babyCost = random(-12,100)>>
- <<if $activeSlave.prematureBirth > 0>><<set _babyCost = random(-32,40)>><</if>>
- <<else>>
- <<set _babyCost = random(-12,12)>>
- <<if $activeSlave.prematureBirth > 0>><<set _babyCost = -45>><</if>>
- <</if>>
- $His <<if _curBabies > 1>>babies<<else>>baby<</if>> were sold for <<if _curBabies > 1>>a total of <</if>>@@.yellowgreen;<<print cashFormat(_curBabies*(50+_babyCost))>>.@@<<if $activeSlave.prematureBirth == 1>> A low price due to the added costs of caring for them.<</if>>
- <<if $activeSlave.devotion > 95>>
- $He adheres to your thoughts so strongly that even though you backed out of caring for $his child<<if _curBabies > 1>>ren<</if>>, $he still truly believes you are doing $him an honor.
- <<elseif $activeSlave.devotion > 50>>
- $He is @@.mediumorchid;deeply hurt@@ by your sudden decision to sell $his child<<if _curBabies > 1>>ren<</if>> instead of having <<if _curBabies > 1>>them<<else>>it<</if>> cared for. $His trust in your words @@.gold;wavers@@ as $he thinks of $his child<<if _curBabies > 1>>ren<</if>>'s future.
- <<set $activeSlave.trust -= 5, $activeSlave.devotion -= 5>>
- <<elseif $activeSlave.devotion > 20>>
- $He is @@.mediumorchid;devastated@@ by your sudden decision to sell $his child<<if _curBabies > 1>>ren<</if>> instead of having <<if _curBabies > 1>>them<<else>>it<</if>> cared for. $His mind struggles to comprehend @@.gold;such betrayal.@@
- <<set $activeSlave.trust -= 10, $activeSlave.devotion -= 10>>
- <<else>>
- For a moment, $he saw a glimmer of good in you; @@.mediumorchid;$he was clearly wrong.@@ $His mind struggles to comprehend @@.gold;why $he could ever even thing of trusting such a person.@@
- <<set $activeSlave.trust -= 30, $activeSlave.devotion -= 30>>
- <</if>>
- <<set $cash += _curBabies*(50+_babyCost)>>
+ <<= BirthDestinationText("Sold",$activeSlave)>>
<</switch>>
<<else>>
<<set $nextButton = "Back">><<UpdateNextButton>> /* unlock Continue button */
diff --git a/src/pregmod/electiveSurgery.tw b/src/pregmod/electiveSurgery.tw
index 760ef06711a74fb0e92672296ab394373a6d750f..a232f7d2d42d96b8b6ba762c794fb6a32eedaf8a 100644
--- a/src/pregmod/electiveSurgery.tw
+++ b/src/pregmod/electiveSurgery.tw
@@ -371,8 +371,8 @@ You have @@.orange;$PC.skin skin.@@<<if $PC.skin != $PC.origSkin>> Your original
[[Have your male organs replaced with female ones|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.dick = 0, $PC.vagina = 1, $PC.newVag = 1, $cash -= 50000, $surgeryType = "male2female"]] |
[[Add a female reproductive tract|PC Surgery Degradation][$PC.vagina = 1, $PC.newVag = 1, $PC.preg = 0, WombFlush($PC), $cash -= 150000, $surgeryType = "male2herm"]]
<<if $PC.title > 0>>
- | [[Become a woman|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.dick = 0, $PC.storedCum += 10, $PC.vagina = 1, $PC.newVag = 1, $PC.preg = 0, $PC.title = 0, generatePlayerPronouns($PC), $cash -= 50000, $surgeryType = "male2truefemale"]]
- | [[Become a hermaphrodite girl|PC Surgery Degradation][$PC.vagina = 1, $PC.newVag = 1, $PC.preg = 0, WombFlush($PC), $PC.title = 0, generatePlayerPronouns($PC), $cash -= 150000, $surgeryType = "male2hermfemale"]]
+ | [[Become a woman|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.dick = 0, $PC.storedCum += 10, $PC.vagina = 1, $PC.newVag = 1, $PC.preg = 0, $PC.title = 0, generatePlayerPronouns($PC), $cash -= 50000, $surgeryType = "male2truefemale"]]
+ | [[Become a hermaphrodite girl|PC Surgery Degradation][$PC.vagina = 1, $PC.newVag = 1, $PC.preg = 0, WombFlush($PC), $PC.title = 0, generatePlayerPronouns($PC), $cash -= 150000, $surgeryType = "male2hermfemale"]]
<</if>>
<<else>>
You have @@.orange;female genitalia@@ and a @@.orange;<<if $PC.title > 0>>masculine<<else>>feminine<</if>> appearance.@@
diff --git a/src/pregmod/eliteTakeOver.tw b/src/pregmod/eliteTakeOver.tw
index 85ac245802478ed6a40bd0aa57aab0e71d77fc33..5ce16f0d014e405dba8a625651ea65e4d849ef76 100644
--- a/src/pregmod/eliteTakeOver.tw
+++ b/src/pregmod/eliteTakeOver.tw
@@ -41,7 +41,7 @@ You look up from your desk as the locked door to your office unseals, and a doze
''GAME OVER''
<</if>>
<<elseif $PC.pregSource != -6>>
- The leader reaches into his jacket and extracts a syringe, you recognize it as a powerful drug used in lobotomies, and places it to your left. From his hip he pulls a revolver, six-chambered, and loads five bullets, spins the chamber, and places it to your right.
+ The leader reaches into his jacket and extracts a syringe, you recognize it as a powerful drug used in lobotomies, and places it to your left. From his hip he pulls a revolver, six-chambered, and loads five bullets, spins the chamber, and places it to your right.
<br>
"You are no longer worthy of being a part of our society. You know you can't be allowed to spread any information. But we are not merciless; one of our members has taken an interest in having you as her pet. You may choose to lose your mind, and service her until she tires of you, or gamble for your life and serve her anyway. Now decide."
<</if>>
@@ -49,7 +49,7 @@ You look up from your desk as the locked door to your office unseals, and a doze
<br>
<<if _pregSurrender == 0>>
<<set $finalChoice = "final stand">>
- The choice is simple - you will not be a slave.
+ The choice is simple - you will not be a slave.
<br>
You decide to <span id="fate">make a final stand.</span>
<br>
diff --git a/src/pregmod/fSlaveSlaveVag.tw b/src/pregmod/fSlaveSlaveVag.tw
index ed8824ba05c3b3c44acea358e041839a73c1ecaa..ae584a4152d20a1b701983e198ef004dea3bf0ee 100644
--- a/src/pregmod/fSlaveSlaveVag.tw
+++ b/src/pregmod/fSlaveSlaveVag.tw
@@ -1,5 +1,5 @@
:: FSlaveSlaveVag [nobr]
-
+
<<set $nextButton = "Back", $nextLink = "Slave Interact">>
diff --git a/src/pregmod/huskSlave.tw b/src/pregmod/huskSlave.tw
index f7b69e8c667d7e4f2e3447af31f63f21c1097fa6..2e3d5be59a9d41c9d023b74f4723b4fec696c080 100644
--- a/src/pregmod/huskSlave.tw
+++ b/src/pregmod/huskSlave.tw
@@ -1,4 +1,4 @@
-:: Husk Slave [nobr]
+:: Husk Slave [nobr]
<<set $nextButton = "Back", $nextLink = "Buy Slaves", $returnTo = "Buy Slaves", $showEncyclopedia = 1, $encyclopedia = "Kidnapped Slaves">>
<<if ($huskSlave.dick == 0) && ($huskSlave.vagina == -1)>><<set $huskSlave.vagina = 0>><</if>>
diff --git a/src/pregmod/huskSlaveSwapWorkaround.tw b/src/pregmod/huskSlaveSwapWorkaround.tw
index 477f154efecf8c0be9e8f9f415c6277db0fde83b..2bb0b94411c9c3b9d7feee7a2007b36349e992b5 100644
--- a/src/pregmod/huskSlaveSwapWorkaround.tw
+++ b/src/pregmod/huskSlaveSwapWorkaround.tw
@@ -1,5 +1,5 @@
:: husk Slave Swap Workaround [nobr]
-
+
<<set $nextButton = "Abort Operation", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event">>
"This operation is neither simple nor is it perfected. There are extreme health risks involved and no guarantee of success. Strap a slave into your remote surgery to consent to the operation. Indentured servants<<if ($incubator > 0) || ($nurseryBabies)>> and slaves with reserved children<</if>> not eligible."
diff --git a/src/pregmod/pAssociatesPublicSlut.tw b/src/pregmod/pAssociatesPublicSlut.tw
index 4fa5ed644b42865ce803f0cf07e9be3394425e6f..e3efac167e892357c8cccf205114042305dba0bd 100644
--- a/src/pregmod/pAssociatesPublicSlut.tw
+++ b/src/pregmod/pAssociatesPublicSlut.tw
@@ -32,11 +32,11 @@ You take a detour down one of the minor byways that feed into the Promenade prop
<<link "Give <<if _num < $seeDicks>>him his<<else>>her the<</if>> first taste of slave life">>
<<replace "#result">>
<<if _num < $seeDicks>>
- Taking a slave's anal virginity is hardly novel for you, yet somehow it never stops being fun. You grab the bottle of lubricant your associate has left out for use and begin to generously lubricate his asshole <<if $PC.dick == 0>>. You also reach for one of the brand new strap-ons she has left out for ladies who wish to avail of her slut, tearing it eagerly from its box.<<else>>.<</if>> He begins to moan as you gently probe his anus with the tip of <<if $PC.dick == 0>>the strap on<<else>>your cock<</if>>. Slowly, you get a little deeper with every third or fourth thrust of your hips. You grab on to his petite, feminine waist as you work, occasionally using one hand to hold him roughly by the hair, neck or shoulder, or to smack his butt. Your business associate makes no attempt to hide her obvious arousal at the sight of <<if $PC.dick == 0>>the formidable dildo<<else>>your formidable cock<</if>> pounding some obedience into her slave, and flirts shamelessly with you as you work. <<if $PC.dick == 0>>The slave climaxes, and while you don't quite join him, watching him squirm helplessly underneath you as you used his ass has left you intensely aroused.<<else>>The slaves tight anal muscles massage your cock as he orgasms, bringing you to climax as well.<</if>> Your associate's face is flushed after the spectacle, though considering the disappointing size of her new slaves penis its hardly surprising that she's so thirsty for male attention. She offers to "serve you some refreshments" back at her apartment, an offer you happily take her up on. As you depart with her, a mass of curious socialites converge on the helpless sissy, eager to try his asshole out, since being fucked by the owner of the arcology has instantly, albeit temporarily, made him very fashionable.
+ Taking a slave's anal virginity is hardly novel for you, yet somehow it never stops being fun. You grab the bottle of lubricant your associate has left out for use and begin to generously lubricate his asshole <<if $PC.dick == 0>>. You also reach for one of the brand new strap-ons she has left out for ladies who wish to avail of her slut, tearing it eagerly from its box.<<else>>.<</if>> He begins to moan as you gently probe his anus with the tip of <<if $PC.dick == 0>>the strap on<<else>>your cock<</if>>. Slowly, you get a little deeper with every third or fourth thrust of your hips. You grab on to his petite, feminine waist as you work, occasionally using one hand to hold him roughly by the hair, neck or shoulder, or to smack his butt. Your business associate makes no attempt to hide her obvious arousal at the sight of <<if $PC.dick == 0>>the formidable dildo<<else>>your formidable cock<</if>> pounding some obedience into her slave, and flirts shamelessly with you as you work. <<if $PC.dick == 0>>The slave climaxes, and while you don't quite join him, watching him squirm helplessly underneath you as you used his ass has left you intensely aroused.<<else>>The slaves tight anal muscles massage your cock as he orgasms, bringing you to climax as well.<</if>> Your associate's face is flushed after the spectacle, though considering the disappointing size of her new slaves penis its hardly surprising that she's so thirsty for male attention. She offers to "serve you some refreshments" back at her apartment, an offer you happily take her up on. As you depart with her, a mass of curious socialites converge on the helpless sissy, eager to try his asshole out, since being fucked by the owner of the arcology has instantly, albeit temporarily, made him very fashionable.
<<else>>
- Taking a slave's virginity is hardly novel for you, yet somehow it never stops being fun. You consider the bottle of lubricant your associate has left out for use and then decide it's unnecessary, since the slutty bitch is already quite wet. <<if $PC.dick == 0>>You do however reach for one of the brand new strap-ons he has left out for ladies who wish to avail of his slut, tearing it eagerly from its box.<</if>> She begins to moan as you gently probe her pussy with the tip of <<if $PC.dick == 0>>the strap on<<else>>your cock<</if>>. Slowly, you get a little deeper with every third or fourth thrust of your hips. You grab on to her petite, feminine waist as you work, occasionally using one hand to hold her roughly by the hair, neck or shoulder, or to smack her butt. Your business associate can't keep the smug smile off his face as he watches you pound some obedience into his slave. You know nothing puts a bitch in her place harder than discovering the secret rapture of being fucked just the way she didn't even know she likes it, and focus on exploiting her apparent humiliation fetish.<<if $PC.dick == 0>> She climaxes indecently hard from your expert, hard, but just tender enough loving.<<else>> Her tight pussy brings you to climax after a hard fucking and the sensation of being filled with your semen is enough to bring about her orgasm as well.<</if>> Your associate is extremely impressed with your performance and eager to ask for some slave-breaking tips. You're more than happy to offer a little advice, considering he's new to the game, and the two of you walk off together to find somewhere where you can get refreshments as you discuss. As you depart, a mass of curious socialites converge on the helpless slut, eager to try her holes out, since being fucked by the owner of the arcology has instantly, albeit temporarily, made her very fashionable.
+ Taking a slave's virginity is hardly novel for you, yet somehow it never stops being fun. You consider the bottle of lubricant your associate has left out for use and then decide it's unnecessary, since the slutty bitch is already quite wet. <<if $PC.dick == 0>>You do however reach for one of the brand new strap-ons he has left out for ladies who wish to avail of his slut, tearing it eagerly from its box.<</if>> She begins to moan as you gently probe her pussy with the tip of <<if $PC.dick == 0>>the strap on<<else>>your cock<</if>>. Slowly, you get a little deeper with every third or fourth thrust of your hips. You grab on to her petite, feminine waist as you work, occasionally using one hand to hold her roughly by the hair, neck or shoulder, or to smack her butt. Your business associate can't keep the smug smile off his face as he watches you pound some obedience into his slave. You know nothing puts a bitch in her place harder than discovering the secret rapture of being fucked just the way she didn't even know she likes it, and focus on exploiting her apparent humiliation fetish.<<if $PC.dick == 0>> She climaxes indecently hard from your expert, hard, but just tender enough loving.<<else>> Her tight pussy brings you to climax after a hard fucking and the sensation of being filled with your semen is enough to bring about her orgasm as well.<</if>> Your associate is extremely impressed with your performance and eager to ask for some slave-breaking tips. You're more than happy to offer a little advice, considering he's new to the game, and the two of you walk off together to find somewhere where you can get refreshments as you discuss. As you depart, a mass of curious socialites converge on the helpless slut, eager to try her holes out, since being fucked by the owner of the arcology has instantly, albeit temporarily, made her very fashionable.
<</if>>
- Your citizens @@.green;appreciated@@ the vigorous show you put on, and the fact that you are @@.green;not too snobby@@ to enjoy the simple pleasure of availing of a public whore once in a while.
+ Your citizens @@.green;appreciated@@ the vigorous show you put on, and the fact that you are @@.green;not too snobby@@ to enjoy the simple pleasure of availing of a public whore once in a while.
<<set $rep += 100>>
<</replace>>
<</link>>
diff --git a/src/pregmod/pInsemination.tw b/src/pregmod/pInsemination.tw
index bf6ea7c1ebccf6176de68e5677ce89dd659b6456..95bf0f2f28a317cf2f2d9df107dd2cfefe49889f 100644
--- a/src/pregmod/pInsemination.tw
+++ b/src/pregmod/pInsemination.tw
@@ -1,5 +1,5 @@
-:: P insemination [nobr]
-
+:: P insemination [nobr]
+
<<set $nextButton = "Continue", $returnTo = "Scheduled Event">>
<<if ndef $movesCount>>
diff --git a/src/pregmod/pRaped.tw b/src/pregmod/pRaped.tw
index 66451bfd98c17c41845adf4379744c82cf2d20bd..c7f6b639c386f13d4add1868b3c6ff6b2ef10cda 100644
--- a/src/pregmod/pRaped.tw
+++ b/src/pregmod/pRaped.tw
@@ -1,5 +1,5 @@
-:: P raped [nobr]
-
+:: P raped [nobr]
+
<<set $raped = 1, $nextLink = "Nonrandom Event", $returnTo = "Nonrandom Event">>
While returning from a meeting with a prospective investor, an unfortunate wrong turn has led you into a rather seedy area of your arcology. You feel distinctly uncomfortable for some reason.
diff --git a/src/pregmod/pcAppearanceIntro.tw b/src/pregmod/pcAppearanceIntro.tw
index 190f52ec366f3ce1fe374805568a2650e9f493f5..d4c1b459bc67dbee0950b0da333684496680d81e 100644
--- a/src/pregmod/pcAppearanceIntro.tw
+++ b/src/pregmod/pcAppearanceIntro.tw
@@ -1,5 +1,5 @@
-:: PC Appearance Intro [nobr]
-
+:: PC Appearance Intro [nobr]
+
Race and appearance are largely irrelevant in the free cities; there are only the free and the enslaved.
<br>//Appearance only, no effect on gameplay (unless you make a big deal out of it).//
diff --git a/src/pregmod/pcPregIntro.tw b/src/pregmod/pcPregIntro.tw
index f94e020ddfd7258f967088b5b18f1d64feee6e35..be653e9605f79ac86889947da081a646d2477736 100644
--- a/src/pregmod/pcPregIntro.tw
+++ b/src/pregmod/pcPregIntro.tw
@@ -1,5 +1,5 @@
-:: PC Preg Intro [nobr]
-
+:: PC Preg Intro [nobr]
+
You have a working female reproductive system, and thus, a menstrual cycle. Women already face hardships as slaveowners and arcology owners, and being pregnant, coupled with a strong societal aversion to the dominant being penetrated, leads most pregnant owners to find themselves in dire situations. As an added precaution, since nothing stops an owner from hooking up with another owner, contraceptives are common amongst free women.
<br><br>
@@.orange;What's your stance on taking contraceptives?@@
diff --git a/src/pregmod/physicalDevelopment.tw b/src/pregmod/physicalDevelopment.tw
index cb94c3c44a9dc9fcbd18b677fb17176c8fc3c938..65c3d7e85e8f39e5e2f27a6d2edaa07a921dd1aa 100644
--- a/src/pregmod/physicalDevelopment.tw
+++ b/src/pregmod/physicalDevelopment.tw
@@ -1,4 +1,4 @@
-:: Physical Development [nobr widget]
+:: Physical Development [nobr widget]
<<widget "PhysicalDevelopment">>
@@ -1364,7 +1364,7 @@
<</if>>
<</switch>>
-<<elseif $args[0].genes == "XY">>
+<<elseif $args[0].genes == "XY">>
<<switch $args[0].physicalAge>>
<<case 3>>
diff --git a/src/pregmod/reLegendaryWomb.tw b/src/pregmod/reLegendaryWomb.tw
index 66dd28c5a28f7075d92f881367d698fee1ac245c..fbec834c156e5a0655c22c5011b65da21c8c8131 100644
--- a/src/pregmod/reLegendaryWomb.tw
+++ b/src/pregmod/reLegendaryWomb.tw
@@ -1,5 +1,5 @@
:: RE legendary womb [nobr]
-
+
<<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "RIE Eligibility Check", $activeSlave = ($legendaryFacility == 1) ? getSlave($legendaryWombID) : $eventSlave>>
<<if (ndef $activeSlave)>> /* not found - reset variable and stop event */
diff --git a/src/pregmod/seBurst.tw b/src/pregmod/seBurst.tw
index 10bc7be768af99b22f797c9fdd8fb1c47f61ffc4..73a84bb8f98ccf9283595e2d186c9d09eaa38a9c 100644
--- a/src/pregmod/seBurst.tw
+++ b/src/pregmod/seBurst.tw
@@ -1,5 +1,5 @@
-:: SE Burst [nobr]
-
+:: SE Burst [nobr]
+
<<set $nextButton = "Continue", $returnTo = "Scheduled Event">>
<<for _b = 0; _b < $slaves.length; _b++>>
diff --git a/src/pregmod/seDeath.tw b/src/pregmod/seDeath.tw
index 1d4d3e82cb37cd64444017d8c6b7799f5b51c67c..830a36069adb44b6445185337509d5edf6b15602 100644
--- a/src/pregmod/seDeath.tw
+++ b/src/pregmod/seDeath.tw
@@ -1,5 +1,5 @@
:: SE Death [nobr]
-
+
<<set $nextButton = "Continue", $nextLink = "Scheduled Event">>
<<set _killedSlaves = []>>
diff --git a/src/pregmod/seFCTVinstall.tw b/src/pregmod/seFCTVinstall.tw
index 48446339d7a0542268e260be253cfcf9f09cecd5..ebad2ad9e951b1022e1902a14d4fd0fba28d8e40 100644
--- a/src/pregmod/seFCTVinstall.tw
+++ b/src/pregmod/seFCTVinstall.tw
@@ -1,4 +1,4 @@
-:: SE FCTV Install [nobr]
+:: SE FCTV Install [nobr]
<<set $nextButton = "Continue", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $showEncyclopedia = 1, $encyclopedia = "FCTV", $receiverAvailable = 1>>
<<set $showOne = 0, $showTwo = 0, $showThree = 0, $showFour = 0, $showFive = 0, $showSix = 0, $showSeven = 0, $showEight = 0, $showNine = 0, $showTen = 0, $showEleven = 0, $showTwelve = 0, $showThirteen = 0, $showFourteen = 0, $randShow = 0, $lastShow = -1>>
diff --git a/src/pregmod/slaveAgeIntro.tw b/src/pregmod/slaveAgeIntro.tw
index f59658006aad7c35d3fe055f94adc8e48e09ac0b..14263347057ad2b08b2da66df20a77c94808bb8b 100644
--- a/src/pregmod/slaveAgeIntro.tw
+++ b/src/pregmod/slaveAgeIntro.tw
@@ -1,5 +1,5 @@
:: Slave Age Intro [nobr]
-
+
Do you want to see content involving girls younger than 18 in this game?
<br><br>
diff --git a/src/pregmod/slaveSlaveSwapWorkaround.tw b/src/pregmod/slaveSlaveSwapWorkaround.tw
index 2454a85b7cb9b0c5f8dd141d48754b8d3d1dd91b..788020a3bd05ebbd37fc7414891d93c185a43d13 100644
--- a/src/pregmod/slaveSlaveSwapWorkaround.tw
+++ b/src/pregmod/slaveSlaveSwapWorkaround.tw
@@ -1,5 +1,5 @@
:: Slave Slave Swap Workaround [nobr]
-
+
<<set $nextButton = "Abort Operation", $nextLink = "Main">>
<<set $slaves[$slaveIndices[$activeSlave.ID]] = $activeSlave>>
diff --git a/src/pregmod/widgets/assignmentFilterWidget.tw b/src/pregmod/widgets/assignmentFilterWidget.tw
index 8312536d3002360d82adf56561882b217a3f9577..498d6654f0e6ce7b30e6913809e0ddb6fe8dbae8 100644
--- a/src/pregmod/widgets/assignmentFilterWidget.tw
+++ b/src/pregmod/widgets/assignmentFilterWidget.tw
@@ -1,6 +1,6 @@
:: assignment-filter widget [widget nobr]
-/*
+/*
* filters the list according to the selected Facility
* function(y) is a loop through $slaves to set assignmentVisible to 1 and returns a new array
* function(x) filters the slaves with the given condition ( here its the assignment )
diff --git a/src/pregmod/widgets/bodyswapWidgets.tw b/src/pregmod/widgets/bodyswapWidgets.tw
index 2c8e14077eb5c9f77c8b9c5d216bc4a744627795..a1182cde32030d573912f8ea5ff93759470b9e16 100644
--- a/src/pregmod/widgets/bodyswapWidgets.tw
+++ b/src/pregmod/widgets/bodyswapWidgets.tw
@@ -283,7 +283,7 @@
<<else>>
<<set $args[0].origBodyOwner = $args[1].slaveName>>
<</if>>
-<<else>>
+<<else>>
<<set $args[0].origBodyOwner = $args[1].origBodyOwner>>
<</if>>
diff --git a/src/pregmod/widgets/economyWidgets.tw b/src/pregmod/widgets/economyWidgets.tw
index d87830603b3ef793995e34e9f8c005f6f5465fb1..4c1895117ac06fd3cc86446a37d752bb89445dbb 100644
--- a/src/pregmod/widgets/economyWidgets.tw
+++ b/src/pregmod/widgets/economyWidgets.tw
@@ -461,14 +461,14 @@
/* Call with <<CorpDevBuySell "asset" "Numasset">> TODO: replace eval parse with appropriate functions */
<<widget "CorpDevBuySell">>
<<set _textboxMLArg = '_'+$args[1]>>
-| Trade Qty
-<<textbox `'_Num' + $args[0]` `eval(parse('_Num' + $args[0]))`>><<script>>setTextboxMaxLength(State.temporary["textboxMLArg"], 10);<</script>>:
+| Trade Qty
+<<textbox `'_Num' + $args[0]` `eval(parse('_Num' + $args[0]))`>><<script>>setTextboxMaxLength(State.temporary["textboxMLArg"], 10);<</script>>:
<<link "Buy">>
<<if !Number.isInteger(Number.parseFloat(eval(parse('_Num' + $args[0]))))>> /* Checks if _Numasset is string */
/* Buy all */
- <<if ["all", "max"].includes(State.temporary[$args[1]].toLowerCase())>>
+ <<if ["all", "max"].includes(State.temporary[$args[1]].toLowerCase())>>
<<set State.temporary[$args[1]] = Math.floor($corpCash/(State.variables[$args[0]+"AssetPrice"] * 500))>>
- <<replace `'#'+$args[0]+'AssetsPurchasing'`>>
+ <<replace `'#'+$args[0]+'AssetsPurchasing'`>>
Bought <<print commaNum(Math.floor($corpCash/(State.variables[$args[0]+"AssetPrice"] * 500)))>> units for <<print cashFormat(Math.floor($corpCash/(State.variables[$args[0]+"AssetPrice"] * 500))*500*State.variables[$args[0]+"AssetPrice"])>>
<</replace>>
<<set State.variables[$args[0]+"Assets"] += (eval(parse('_Num' + $args[0]))) * 500>>
@@ -488,7 +488,7 @@
<<elseif Number.parseFloat(eval(parse('_Num' + $args[0]))) < 0>>
<<replace `'#'+$args[0]+'AssetsPurchasing'`>>Please input a positive number.<</replace>>
/* Buy % */
- <<elseif State.temporary[$args[1]].toString().includes("%")>>
+ <<elseif State.temporary[$args[1]].toString().includes("%")>>
<<set _DesPerc = State.temporary[$args[1]]>>
<<set State.temporary[$args[1]] = Math.floor((Math.clamp((Number.parseFloat(State.temporary[$args[1]])/100),0,1)*$corpCash)/(State.variables[$args[0]+"AssetPrice"] * 500))>>
<<replace `'#'+$args[0]+'AssetsPurchasing'`>>
@@ -515,19 +515,19 @@
<</replace>>
<<replace `'#'+$args[0]+'AssetsPurchasing'`>><</replace>>
/* Unsuccessful buy but have enough cash for more than 1 unit */
- <<elseif $corpCash > 500 * State.variables[$args[0]+"AssetPrice"]>>
+ <<elseif $corpCash > 500 * State.variables[$args[0]+"AssetPrice"]>>
<<replace `'#'+$args[0]+'AssetsPurchasing'`>>
- The corp can only buy <<print commaNum(Math.floor($corpCash/(State.variables[$args[0]+"AssetPrice"] * 500)))>> more unit<<if Math.floor($corpCash/(State.variables[$args[0]+"AssetPrice"] * 500)) > 1 >>s<</if>> of $args[0] assets.
+ The corp can only buy <<print commaNum(Math.floor($corpCash/(State.variables[$args[0]+"AssetPrice"] * 500)))>> more unit<<if Math.floor($corpCash/(State.variables[$args[0]+"AssetPrice"] * 500)) > 1 >>s<</if>> of $args[0] assets.
<</replace>>
<<set State.temporary[$args[1]] = Math.floor($corpCash/(State.variables[$args[0]+"AssetPrice"] * 500))>>
<<replace `'#'+'controls'+$args[0]`>><<CorpDevBuySell $args[0] $args[1]>><</replace>><<script>>setReplaceTextboxMaxLength(State.temporary["textboxMLArg"], 10);<</script>>
/* Unsuccessful buy */
- <<else>>
- <<replace `'#'+$args[0]+'AssetsPurchasing'`>>There are insufficient funds for additional purchases.<</replace>>
+ <<else>>
+ <<replace `'#'+$args[0]+'AssetsPurchasing'`>>There are insufficient funds for additional purchases.<</replace>>
<</if>>
<</link>>
| <<link "Sell">>
- <<if !Number.isInteger(Number.parseFloat(eval(parse('_Num' + $args[0]))))>>
+ <<if !Number.isInteger(Number.parseFloat(eval(parse('_Num' + $args[0]))))>>
/* Sell all */
<<if ["all", "max"].includes(State.temporary[$args[1]].toLowerCase())>>
<<replace `'#'+$args[0]+'AssetsPurchasing'`>>
@@ -580,7 +580,7 @@
/* Unsuccessful sell but have enough assets for more than 1 unit */
<<elseif State.variables[$args[0]+"Assets"] > 500>>
<<replace `'#'+$args[0]+'AssetsPurchasing'`>>
- The corp can only sell <<print commaNum(Math.ceil((State.variables[$args[0]+"Assets"]-500)/500))>> more unit<<if Math.ceil((State.variables[$args[0]+"Assets"]-500)/500) > 1 >>s<</if>> of $args[0] assets.
+ The corp can only sell <<print commaNum(Math.ceil((State.variables[$args[0]+"Assets"]-500)/500))>> more unit<<if Math.ceil((State.variables[$args[0]+"Assets"]-500)/500) > 1 >>s<</if>> of $args[0] assets.
<</replace>>
<<set State.temporary[$args[1]] = Math.ceil((State.variables[$args[0]+"Assets"]-500)/500)>>
<<replace `'#'+'controls'+$args[0]`>><<CorpDevBuySell $args[0] $args[1]>><</replace>><<script>>setReplaceTextboxMaxLength(State.temporary["textboxMLArg"], 10);<</script>>
diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw
index 1a8b0ad53e866692096c0c794cd4f35ad3ab26ea..cc7110f3a2d2c98bb46204a7a6095abeb4f20619 100644
--- a/src/pregmod/widgets/seBirthWidgets.tw
+++ b/src/pregmod/widgets/seBirthWidgets.tw
@@ -899,7 +899,7 @@ All in all,
<<if $arcologies[0].FSRestart != "unset" && $slaves[$i].breedingMark == 1 && $propOutcome == 1 && $slaves[$i].pregSource == -1>>
<<set _lostBabies = 1>>
$His child<<if _curBabies > 1>>ren<</if>> are collected by the Societal Elite to be raised into upstanding members of the new society.
- <<elseif $Cash4Babies == 1>>
+ <<elseif $Cash4Babies == 1 && $DefaultBirthDestination !== "the market">>
<<set _lostBabies = 1>>
<<set _babyCost = random(-12,12)>>
<<if $slaves[$i].prematureBirth == 1>><<set _babyCost = -45>><</if>>
@@ -916,55 +916,20 @@ All in all,
<<set $cash += _curBabies*(50+_babyCost)>>
<</if>>
<</if>>
- <<if _lostBabies != 1 && $universalRulesChildrenBecomeBreeders > 0 && $arcologies[0].FSRepopulationFocus > 40 && $DefaultBirthDestination === "anywhere">>
+ <<if _lostBabies != 1 && $universalRulesChildrenBecomeBreeders > 0 && $arcologies[0].FSRepopulationFocus > 40 && $DefaultBirthDestination === "individually decided fates">>
<<set _lostBabies = 1>>
- $His child<<if _count > 1>>ren are<<else>> is<</if>> sent to one of $arcologies[0].name's future minded schools, to be administered fertility and virility treatments as well as be brought up to take pride in reproduction. $slaves[$i].slaveName
- <<if $slaves[$i].devotion > 95>>
- loves you already, but <<print $he>>'ll @@.hotpink;love you even more@@ for this. $He can't wait to see $his child<<if _count > 1>>ren<</if>> proudly furthering your cause.
- <<set $slaves[$i].devotion += 4>>
- <<elseif $slaves[$i].devotion > 50>>
- heard about these and will be @@.hotpink;happy that $his child<<if _count > 1>>ren<</if>> will have a purpose in your society other than slavery.@@ $He will miss $his child<<if _count > 1>>ren<</if>>, but $he expected that.
- <<set $slaves[$i].devotion += 4>>
- <<elseif $slaves[$i].devotion > 20>>
- will naturally miss $his child<<if _count > 1>>ren<</if>>, but will is broken enough to hope that $his offspring will have a better life, or at least an enjoyable one.
- <<else>>
- will of course @@.mediumorchid;hate you for this.@@ The mere thought of $his $fertilityAge year old daughter<<if _count > 1>>s<</if>> swollen with life, and proud of it, fills $him with @@.gold;disdain.@@
- <<set $slaves[$i].devotion -= 4, $slaves[$i].trust -= 4>>
- <</if>>
+ $His <<= BirthDestinationText("Orphanage",$slaves[$i])>>
<<set $breederOrphanageTotal += _count, $slaveOrphanageTotal -= _count>>
- <<elseif _lostBabies != 1 && $DefaultBirthDestination === "anywhere" && $universalRulesChildrenBecomeBreeders < 1>>
+ <<elseif _lostBabies != 1 && $DefaultBirthDestination === "individually decided fates" && $universalRulesChildrenBecomeBreeders < 1>>
<<set $slaveOrphanageTotal += _curBabies>>
- Unless you provide otherwise, the child<<if _curBabies > 1>>ren<</if>> will be remanded to one of $arcologies[0].name's slave orphanages. $slaves[$i].slaveName
- <<if $slaves[$i].devotion > 95>>
- worships you so completely that $he will not resent this.
- <<elseif $slaves[$i].devotion > 50>>
- is devoted to you, but $he will @@.mediumorchid;struggle to accept this.@@
- <<set $slaves[$i].devotion -= 2>>
- <<elseif $slaves[$i].devotion > 20>>
- has accepted being a sex slave, but $he will @@.mediumorchid;resent this intensely.@@
- <<set $slaves[$i].devotion -= 3>>
- <<else>>
- will of course @@.mediumorchid;hate you for this.@@
- <<set $slaves[$i].devotion -= 4>>
- <</if>>
+ Unless you provide otherwise, the child<<if _curBabies > 1>>ren<</if>> will be remanded to one of $arcologies[0].name's slave orphanages.
+ <<= BirthDestinationText("Orphanage",$slaves[$i])>>
<<capture $i, $dispositionId, _count>>
<br>
<<if $arcologies[0].FSRepopulationFocus > 40>>
<<link 'Send them to a breeder school'>>
<<replace `"#" + $dispositionId`>>
- The child<<if _count > 1>>ren are<<else>> is<</if>> sent to one of $arcologies[0].name's future minded schools, to be administered fertility and virility treatments as well as be brought up to take pride in reproduction. $slaves[$i].slaveName
- <<if $slaves[$i].devotion > 95>>
- loves you already, but <<print $he>>'ll @@.hotpink;love you even more@@ for this. $He can't wait to see $his child<<if _count > 1>>ren<</if>> proudly furthering your cause.
- <<set $slaves[$i].devotion += 4>>
- <<elseif $slaves[$i].devotion > 50>>
- heard about these and will be @@.hotpink;happy that $his child<<if _count > 1>>ren<</if>> will have a purpose in your society other than slavery.@@ $He will miss $his child<<if _count > 1>>ren<</if>>, but $he expected that.
- <<set $slaves[$i].devotion += 4>>
- <<elseif $slaves[$i].devotion > 20>>
- will naturally miss $his child<<if _count > 1>>ren<</if>>, but will is broken enough to hope that $his offspring will have a better life, or at least an enjoyable one.
- <<else>>
- will of course @@.mediumorchid;hate you for this.@@ The mere thought of $his $fertilityAge year old daughter<<if _count > 1>>s<</if>> swollen with life, and proud of it, fills $him with @@.gold;disdain.@@
- <<set $slaves[$i].devotion -= 4, $slaves[$i].trust -= 4>>
- <</if>>
+ The child<<if _count > 1>>ren are<<else>> is<</if>> <<= BirthDestinationText("Breeder",$slaves[$i])>>
<<set $breederOrphanageTotal += _count, $slaveOrphanageTotal -= _count>>
<</replace>>
<</link>>
@@ -972,33 +937,14 @@ All in all,
<</if>>
<<link 'Send them to a citizen school'>>
<<replace `"#" + $dispositionId`>>
- The child<<if _count > 1>>ren are<<else>> is<</if>> sent to one of $arcologies[0].name's citizen schools, to be brought up coequal with the arcology's other young people. $slaves[$i].slaveName
- <<if $slaves[$i].devotion > 95>>
- loves you already, but <<print $he>>'ll @@.hotpink;love you even more@@ for this.
- <<elseif $slaves[$i].devotion > 50>>
- knows about these and will be @@.hotpink;overjoyed.@@ $He will miss $his child<<if _count > 1>>ren<</if>>, but $he expected that.
- <<elseif $slaves[$i].devotion > 20>>
- will naturally miss $his child<<if _count > 1>>ren<</if>>, but will @@.hotpink;take comfort@@ in the hope that $his offspring will have a better life.
- <<else>>
- will naturally retain some resentment over being separated from $his child<<if _count > 1>>ren<</if>>, but this should be balanced by hope that $his offspring will have a better life.
- <</if>>
+ The child<<if _count > 1>>ren are<<else>> is<</if>> <<= BirthDestinationText("Citizen",$slaves[$i])>>
<<set $slaves[$i].devotion += 4, $citizenOrphanageTotal += _count, $slaveOrphanageTotal -= _count>>
<</replace>>
<</link>>
//Will cost <<print cashFormat(100)>> weekly//
| <<link 'Have them raised privately'>>
<<replace `"#" + $dispositionId`>>
- The child<<if _count > 1>>ren are<<else>> is<</if>> sent to be privately raised, to be brought up as a future high class citizen. $slaves[$i].slaveName
- <<if $slaves[$i].devotion > 95>>
- will @@.hotpink;worship you utterly@@ for this.
- <<elseif $slaves[$i].devotion > 50>>
- understands that this is the best possible outcome for the offspring of slave, and will be @@.hotpink;overjoyed.@@
- <<elseif $slaves[$i].devotion > 20>>
- will miss $his child<<if _count > 1>>ren<</if>>, but will be @@.hotpink;very grateful,@@ since <<print $he>>'ll understand this is the best possible outcome for a slave mother.
- <<else>>
- will resent being separated from $his child<<if _count > 1>>ren<</if>>, but @@.hotpink;should understand and be grateful@@ that this is the best possible outcome here.
- <</if>>
- The child<<if _count > 1>>ren<</if>> will be raised privately, with expert care and tutoring, an expensive proposition.
+ The <<= BirthDestinationText("Private",$slaves[$i])>>
<<set $slaves[$i].devotion += 6, $privateOrphanageTotal += _count, $slaveOrphanageTotal -= _count>>
<</replace>>
<</link>>
@@ -1007,43 +953,13 @@ All in all,
<<if $slaves[$i].prestige > 1 || $slaves[$i].pornPrestige > 2>>
| <<link 'Send them to auction'>>
<<replace `"#" + $dispositionId`>>
- <<set _babyCost = random(-12,100)>>
- <<if $slaves[$i].prematureBirth == 1>><<set _babyCost = random(-32,40)>><</if>>
- $His <<if _count > 1>>babies<<else>>baby<</if>> went for a <<if _curBabies > 1>>total <</if>>bid of @@.yellowgreen;<<print cashFormat(_count*(50+_babyCost))>>.@@<<if $slaves[$i].prematureBirth == 1>> A low price due to the added costs of caring for them.<</if>>
- <<if $slaves[$i].devotion > 95>>
- $He adheres to your thoughts so strongly that even though you backed out of caring for $his child<<if _count > 1>>ren<</if>>, $he still truly believes you are doing $him an honor.
- <<elseif $slaves[$i].devotion > 50>>
- $He is @@.mediumorchid;deeply hurt@@ by your sudden decision to sell $his child<<if _count > 1>>ren<</if>> instead of having <<if _count > 1>>them<<else>>it<</if>> cared for. $His trust in your words @@.gold;wavers@@ as $he thinks of $his child<<if _count > 1>>ren<</if>>'s future.
- <<set $slaves[$i].trust -= 5, $slaves[$i].devotion -= 5>>
- <<elseif $slaves[$i].devotion > 20>>
- $He is @@.mediumorchid;devastated@@ by your sudden decision to sell $his child<<if _count > 1>>ren<</if>> instead of having <<if _count > 1>>them<<else>>it<</if>> cared for. $His mind struggles to comprehend @@.gold;such betrayal.@@
- <<set $slaves[$i].trust -= 10, $slaves[$i].devotion -= 10>>
- <<else>>
- For a moment, $he saw a glimmer of good in you; @@.mediumorchid;$he was clearly wrong.@@ $His mind struggles to comprehend @@.gold;why $he could ever even think of trusting such a person.@@
- <<set $slaves[$i].trust -= 30, $slaves[$i].devotion -= 30>>
- <</if>>
- <<set $cash += _curBabies*(50+_babyCost)>>
+ <<= BirthDestinationText("Sold",$slaves[$i])>>
<</replace>>
<</link>>
<<else>>
| <<link 'Sell them anyway'>>
<<replace `"#" + $dispositionId`>>
- <<set _babyCost = random(-12,12)>>
- <<if $slaves[$i].prematureBirth == 1>><<set _babyCost = -45>><</if>>
- $His <<if _count > 1>>babies<<else>>baby<</if>> sold for <<if _curBabies > 1>>a total of <</if>>@@.yellowgreen;<<print cashFormat(_count*(50+_babyCost))>>.@@<<if $slaves[$i].prematureBirth == 1>> A low price due to the added costs of caring for them.<</if>>
- <<if $slaves[$i].devotion > 95>>
- $He adheres to your thoughts so strongly that even though you backed out of caring for $his child<<if _count > 1>>ren<</if>>, $he still truly believes you are doing $him an honor.
- <<elseif $slaves[$i].devotion > 50>>
- $He is @@.mediumorchid;deeply hurt@@ by your sudden decision to sell $his child<<if _count > 1>>ren<</if>> instead of having <<if _count > 1>>them<<else>>it<</if>> cared for. $His trust in your words @@.gold;wavers@@ as $he thinks of $his child<<if _count > 1>>ren<</if>>'s future.
- <<set $slaves[$i].trust -= 5, $slaves[$i].devotion -= 5>>
- <<elseif $slaves[$i].devotion > 20>>
- $He is @@.mediumorchid;devastated@@ by your sudden decision to sell $his child<<if _count > 1>>ren<</if>> instead of having <<if _count > 1>>them<<else>>it<</if>> cared for. $His mind struggles to comprehend @@.gold;such betrayal.@@
- <<set $slaves[$i].trust -= 10, $slaves[$i].devotion -= 10>>
- <<else>>
- For a moment, $he saw a glimmer of good in you; @@.mediumorchid;$he was clearly wrong.@@ $His mind struggles to comprehend @@.gold;why $he could ever even think of trusting such a person.@@
- <<set $slaves[$i].trust -= 30, $slaves[$i].devotion -= 30>>
- <</if>>
- <<set $cash += _curBabies*(50+_babyCost)>>
+ <<= BirthDestinationText("Sold",$slaves[$i])>>
<</replace>>
<</link>>
<</if>>
@@ -1051,7 +967,7 @@ All in all,
<</capture>>
<</if>>
<</span>>
-<<elseif $Cash4Babies == 1 && _curBabies > 0 && $DefaultBirthDestination === "anywhere" && $universalRulesChildrenBecomeBreeders < 1>>
+<<elseif $Cash4Babies == 1 && _curBabies > 0 && $DefaultBirthDestination === "individually decided fates" && $universalRulesChildrenBecomeBreeders < 1>>
<br><br>
<<set _babyCost = random(-12,12)>>
<<if $slaves[$i].prematureBirth == 1>><<set _babyCost = -45>><</if>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 4bbd02f11c397e1291097653144cc46743207ac0..08c459055c587d2ab2f973b746bc62a7b9f38c42 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -3595,11 +3595,11 @@ Done!
<<if def $sissy>>
<<unset $sissy>>
<</if>>
-<<if $DefaultBirthDestination === "">>
- <<set $DefaultBirthDestination = "anywhere">>
+<<if $DefaultBirthDestination === ""||$DefaultBirthDestination == "anywhere">>
+ <<set $DefaultBirthDestination = "individually decided fates">>
<</if>>
<<if ndef $DefaultBirthDestination>>
- <<set $DefaultBirthDestination = "anywhere">>
+ <<set $DefaultBirthDestination = "individually decided fates">>
<</if>>
<<if ndef $abbreviateHormoneBalance>>
<<set $abbreviateHormoneBalance = 2>>
diff --git a/src/uncategorized/REFS.tw b/src/uncategorized/REFS.tw
index 1b4cc30bc92e5e97254340113adaa29606751fae..afad1404d68b2288b88734481f61d4e8f37ef97b 100644
--- a/src/uncategorized/REFS.tw
+++ b/src/uncategorized/REFS.tw
@@ -376,7 +376,7 @@ On this particular outing you happen to cross paths with a comely female citizen
<span id="result">
<<link "Let them pass">>
<<replace "#result">>
- You step aside gracefully and bow your head, while signifying to the $girl that you intend to allow $him to pass you. $He seems taken aback by your geniality, especially given the gulf in social standing between the two of you, and has to be chaperoned from your presence by $his father. Nonetheless, $he is struck by $his chance encounter with you and cannot stop recounting the story to all $his friends, soon @@.green;the anecdote has seized the imaginations of $arcologies[0].name's youthful, female citizens.@@
+ You step aside gracefully and bow your head, while signifying to the $girl that you intend to allow $him to pass you. $He seems taken aback by your geniality, especially given the gulf in social standing between the two of you, and has to be chaperoned from your presence by $his father. Nonetheless, $he is struck by $his chance encounter with you and cannot stop recounting the story to all $his friends, soon @@.green;the anecdote has seized the imaginations of $arcologies[0].name's youthful, female citizens.@@
<<set $rep += 100>>
<</replace>>
<</link>>
@@ -390,7 +390,7 @@ On this particular outing you happen to cross paths with a comely female citizen
<</if>>
<br><<link "Manipulate $him into having sex with you">>
<<replace "#result">>
- It only takes a moment for $assistantName to uncover the father's financial records and the copious debt therein, and only another moment for you to browbeat the terrified father into allowing his daughter to sleep with you under threat of purchasing all their debt and summarily enslaving $him.
+ It only takes a moment for $assistantName to uncover the father's financial records and the copious debt therein, and only another moment for you to browbeat the terrified father into allowing his daughter to sleep with you under threat of purchasing all their debt and summarily enslaving $him.
<br><br>
Once you both retire to your private suite, you peel the girl's clothes off as easily as one might shed a gift of its wrapping. In the nude $his body is tastefully youthful, with narrow hips, firm breasts, and a delicate blush across $his shamefaced, rosy cheeks. Despite the circumstances of your sexual conquest of $him, $he seems to enjoy the fuck well enough by the sounds of $his frenzied moans - citizens like $him often do since sexual submission to a slave would be a crippling scandal to a prominent citizen, let alone one of $his diminished social stature.
<<if $cash >= 10000>>
diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw
index ac18155cca368422563c7fa2785312835e1fcb29..c74ca3bf5a26fec90eafb21106d6bb2da3ca5796 100644
--- a/src/uncategorized/bodyModification.tw
+++ b/src/uncategorized/bodyModification.tw
@@ -750,8 +750,8 @@ Choose a tattoo style:
<<if $activeSlave.bellyTat == 0>>
<br>
[[Heart|Body Modification][$activeSlave.bellyTat = "a heart",$cash -= $modCost]]
- | [[Star|Body Modification][$activeSlave.bellyTat = "a star",$cash -= $modCost]]
- | [[Butterfly|Body Modification][$activeSlave.bellyTat = "a butterfly",$cash -= $modCost,$degradation += 1]]
+ | [[Star|Body Modification][$activeSlave.bellyTat = "a star",$cash -= $modCost]]
+ | [[Butterfly|Body Modification][$activeSlave.bellyTat = "a butterfly",$cash -= $modCost,$degradation += 1]]
<</if>>
<<if $activeSlave.bellyTat != 0>>
//[[Remove tattoos|Body Modification][$activeSlave.bellyTat = 0,$cash -= $modCost]]//
diff --git a/src/uncategorized/buildingWidgets.tw b/src/uncategorized/buildingWidgets.tw
index 9d59311731bb31721ab6f9666fac6b60d4c64b50..a40324fd0396d1a004108e7c6bf828417d4b4d55 100644
--- a/src/uncategorized/buildingWidgets.tw
+++ b/src/uncategorized/buildingWidgets.tw
@@ -63,13 +63,13 @@ if(!Macro.has('sectorblock')) {
/* Usage: <<sectorblock sector index "other text (optional)">> */
Macro.add('sectorblock', {
/*
- * Add sector metadata here
- *
- * base: Which passage the sector link goes to if owned. Defaults to the sector type. Unowned go to "Private"
- * name: The sector name. Defaults to the sector type, with spaces inserted in case of WordsLikeThis
- * cls: The CSS id to use for styling if owned; else uses "Private"
- * extra: Some (SugarCube-style) extra text to add after the link
- */
+ * Add sector metadata here
+ *
+ * base: Which passage the sector link goes to if owned. Defaults to the sector type. Unowned go to "Private"
+ * name: The sector name. Defaults to the sector type, with spaces inserted in case of WordsLikeThis
+ * cls: The CSS id to use for styling if owned; else uses "Private"
+ * extra: Some (SugarCube-style) extra text to add after the link
+ */
sectors: {
LuxuryApartments: { base: 'Apartments' },
DenseApartments: { base: 'Apartments' },
diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw
index d1bd65c67cf02e14f6a7b04c9d4cb2c12d28d713..595557f25fb4a74cded4afc0035a66c65eaa26d7 100644
--- a/src/uncategorized/costsReport.tw
+++ b/src/uncategorized/costsReport.tw
@@ -565,7 +565,7 @@ $nursery > 0 || $masterSuiteUpgradePregnancy > 0 || $incubator > 0 ||
<br> <i>Specialized dietary adjustments and concentrated, quick to digest food required to support absurd multiples:</i> <<print cashFormat($foodCost*$slaves[$i].pregType*3*_pAccMult)>>
<<set _individualCosts += $foodCost*$slaves[$i].pregType*3*_pAccMult>>
<<elseif $slaves[$i].pregType >= 100>>
- <br> <i>Specialized dietary requirements and feeding methods to support absurd multiples:</i>
+ <br> <i>Specialized dietary requirements and feeding methods to support absurd multiples:</i>
@@.yellowgreen;<<print cashFormat($foodCost*$slaves[$i].pregType*5*_pAccMult)>>@@
<<set _individualCosts += $foodCost*$slaves[$i].pregType*5*_pAccMult>>
<</if>>
diff --git a/src/uncategorized/discardConfirm.tw b/src/uncategorized/discardConfirm.tw
index 0d2780f4ae744cae6af0103c9b7ebb20197d5bed..5243c52d3155f4b54357278d0d9d6a98cd4b4a1a 100644
--- a/src/uncategorized/discardConfirm.tw
+++ b/src/uncategorized/discardConfirm.tw
@@ -1,5 +1,5 @@
:: Discard Confirm [nobr]
-
+
This will permanently remove $activeSlave.slaveName from the game, and you will not receive any money for $him. This is primarily intended as a way to rid yourself of bugged slaves. Are you certain?
<br><br>
diff --git a/src/uncategorized/manufacturing.tw b/src/uncategorized/manufacturing.tw
index 7a6ab7be92407a1f64a3ab3ef19a200f5d7e42f2..6ea655497a30d11c79e6453df4437223f372bcf5 100644
--- a/src/uncategorized/manufacturing.tw
+++ b/src/uncategorized/manufacturing.tw
@@ -16,7 +16,7 @@ This is a space in the arcology's service areas,
<<if $sectors[$AS].type == "Sweatshops">>
<<if $menials > 0>>
<br><br>
- You own <<print commaNum($menials)>> menial slaves. All your sweatshops together can use only <<print $Sweatshops*500>>,
+ You own <<print commaNum($menials)>> menial slaves. All your sweatshops together can use only <<print $Sweatshops*500>>,
<<if $menials > $Sweatshops*500>>
the remainder is assigned to various odd-jobs in the arcology.
<<elseif $menials == $Sweatshops*500>>
diff --git a/src/uncategorized/masterSuite.tw b/src/uncategorized/masterSuite.tw
index f3bc2b7da03c2adf949f0e25e1177bd718448c39..814fe559bb4427a97e90742e8bf3af1302dab1b9 100644
--- a/src/uncategorized/masterSuite.tw
+++ b/src/uncategorized/masterSuite.tw
@@ -298,7 +298,7 @@ $masterSuiteNameCaps is furnished
<<set _Tmult0 = Math.trunc($masterSuite*1000*$upgradeMultiplierArcology)>>
[[Expand the Master Suite|Master Suite][$cash -= _Tmult0, $masterSuite += 2, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>>//
<<if $Concubine == 0 && $masterSuiteSlaves == 0>>
- | [[Decommission the Master Suite|Main][$masterSuite = 0, $masterSuiteUpgradeLuxury = 0, $masterSuitePregnancySlaveLuxuries = 0, $masterSuiteDecoration = "standard", $masterSuitePregnancyFertilityDrugs = 0, $masterSuitePregnancyFertilitySupplements = 0, $masterSuiteUpgradePregnancy = 0, $masterSuiteHyperPregnancy = 0]]
+ | [[Decommission the Master Suite|Main][$masterSuite = 0, $masterSuiteUpgradeLuxury = 0, $masterSuitePregnancySlaveLuxuries = 0, $masterSuiteDecoration = "standard", $masterSuitePregnancyFertilityDrugs = 0, $masterSuitePregnancyFertilitySupplements = 0, $masterSuiteUpgradePregnancy = 0, $masterSuiteHyperPregnancy = 0]]
<</if>>
<<if $masterSuiteSlaves > 0>>
diff --git a/src/uncategorized/masterSuiteReport.tw b/src/uncategorized/masterSuiteReport.tw
index 2d3e9c1c5825fc742f0f3a0e772736d24ef7b3cd..85f9fe16dbe855351bd27e1f0f697e741fb68a2d 100644
--- a/src/uncategorized/masterSuiteReport.tw
+++ b/src/uncategorized/masterSuiteReport.tw
@@ -118,7 +118,7 @@
<<if $verboseDescriptions == 1>>
Keeping such a prestigious slave as your concubine @@.green;adds to your fame.@@
<<if $Concubine.prestigeDesc == "She is a famed Free Cities whore, and commands top prices.">>
- When $he has a free moment, $he refines $his flexibility so that $he is prepared for any sexual position you can think of, and many more that $he researched just for your pleasure.
+ When $he has a free moment, $he refines $his flexibility so that $he is prepared for any sexual position you can think of, and many more that $he researched just for your pleasure.
<</if>>
<<if $Concubine.prestigeDesc == "She is a famed Free Cities slut, and can please anyone.">>
When $he has a free moment, $he pretties $himself up so that $he may be as beautiful as possible to make you look even better.
@@ -366,7 +366,7 @@
<br> $He <<include "SA please you">>
<br>
<<if $servantMilkers == 1 && $slaves[$i].lactation > 0 && $slaves[$i].fuckdoll == 0 && $slaves[$i].fetish != "mindbroken" && $slaves[$i].amp != 1 && $slaves[$i].intelligence+$slaves[$i].intelligenceImplant >= -90>>
- When $his breasts begin to feel full and you aren't around, $he avails $himself to the penthouse milkers and
+ When $his breasts begin to feel full and you aren't around, $he avails $himself to the penthouse milkers and
<<set $servantMilkersMultiplier = 0.25>><<silently>><<include "SA get milked">><</silently>><<set $servantMilkersMultiplier = 1>>
gives $milk liters of milk over the week, which is sold for @@.yellowgreen;<<print cashFormat($milkSale)>>.@@
<</if>>
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index 55a5688987749b53d403fe0e982c80e3f376a1d7..bc92ffbee4b8c22df8d3d9020cff2775068068cf 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -644,7 +644,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<= AnalVCheck()>>
<</link>>
- | <<link "Initiate $him with anal pain">>
+ | <<link "Initiate $him with anal pain">>
<<replace "#introResult">>
You haul $him wordlessly into the bathroom. In a few minutes $he finds $himself standing obediently behind you, waiting for your next command with a clean colon and an uncomfortably large buttplug stretching $his virgin ass. Once it's been in long enough to prevent any damage, you push $his fearful form over the desk and pull it free. $He squeals with more embarrassment than pain at the feeling of $his first sodomy, but before long you're pounding $him hard enough that all $he can do is moan and desperately wonder when you'll be done with $his poor little butt. You keep $him around all day; by night, $his asshole is well broken in and @@.mediumorchid;so is $his spirit.@@ $He @@.gold;fears@@ you now, knowing this is only the beginning.
<</replace>>
@@ -670,7 +670,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<set $activeSlave.dick = 0>>
<<set $activeSlave.balls = 0>>
<</link>>
- | <<link "Use $him as $he is">>
+ | <<link "Use $him as $he is">>
<<replace "#introResult">>
You announce that $he'll have to earn $his surgery - if $he ever gets it at all. $He only has time for a moment of shock and betrayal before $he finds $his face jammed into the cushions of your office couch. $He struggles, outraged, but only manages to avoid sodomy for a moment. $His resistance only makes it harder on $himself as you take $his anus without mercy. By the third time you buttfuck $him $he's learned to @@.hotpink;relax and let it happen.@@
<</replace>>
@@ -694,7 +694,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<</link>>
<</if>>
<<if ($activeSlave.indentureRestrictions <= 0) && ($seeExtreme == 1)>>
- | <<link "Cruelly castrate $him">>
+ | <<link "Cruelly castrate $him">>
<<replace "#introResult">>
You rise from your desk and move in close, wordlessly dominating $him without touch, tempting and overawing $him until $he's desperate with desire, $his prick stiff as iron. $He follows you willingly into the autosurgery and even allows you to strap $him in, face down, without comment. $His fuckhole welcomes your <<if $PC.dick == 1>>cock<<else>>strap-on<</if>> and $he gasps with pleasure. $He climaxes with indecent speed, dripping $his cum onto the surgery floor. You keep fucking $him, but lean forward to whisper to $him that that was $his last hardon. $He's completely confused and says nothing, but gradually realizes what the numb feeling around $his ballsack means. $He @@.gold;screams with horror@@ and @@.mediumorchid;sobs disconsolately@@ as the autosurgery disengages from $his clipped genitals and you disengage from $his <<if $PC.dick == 1>>cum-filled<<else>>wilting<</if>> butthole. $He gingerly stumbles back to your office with you and, without even being ordered to, arranges $himself on the couch with $his fuckhole ready. The gelding does affect $his @@.red;health@@ somewhat.
<</replace>>
@@ -730,7 +730,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<</link>>
<</if>>
<<if canDoAnal($activeSlave)>>
- | <<link "Make sure $he knows $he made a mistake">>
+ | <<link "Make sure $he knows $he made a mistake">>
<<replace "#introResult">>
You tell $him that slaves working in your penthouse are all expected to please you, and $he nods eagerly. $He strips, only starting to look doubtful again when you brusquely order $him to hurry up. You order $him to get down on the ground with $his face up, $his shoulders against the floor; $he does, and then you order $him to put $his legs over $his head. $He looks puzzled but does, flipping $himself flexibly up until $he's doing a shoulder stand, bent double with $his crotch over $his face. You stand over $him and shove <<if $PC.dick == 1>>your cock<<else>>a strap-on<</if>> down and into $his asshole. This is an advanced anal position and although $he's clearly no anal virgin it's well beyond $him. $He does $his best but tears begin to streak $his cheeks. After a while you tire of the position and flip $him over onto $his face to assrape $him doggy style. This allows you to whisper into $his ear that $his holes are your property now, to use, to abuse, or to sell. $He @@.mediumorchid;sobs in despair@@ at the latter, knowing $he's @@.gold;thrown $his life away.@@
<</replace>>
@@ -753,8 +753,8 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<set $oralTotal += 1>>
<</link>>
<<if canDoAnal($activeSlave)>>
- | <<link "Put $him in $his place">>
- <<replace "#introResult">>
+ | <<link "Put $him in $his place">>
+ <<replace "#introResult">>
You stand up and tell $him to strip. $He hesitates, staring at you in dawning apprehension, until $he sees that you're stepping into a strap-on. $He unconsciously takes a step backward, but that's as far as $he gets before you cover the ground between you, grab $him by the throat, and push $his back until $he falls onto the couch. You drag the head of the fake phallus down over $his pussylips, and $he shivers, but you keep going, telling $him that you'll only be fucking $him there when $he's good. When $he's bad, you'll assfuck $him. $His eyes fly open and $he tries to struggle, but you give $him a warning slap and then push yourself home. $He starts to cry, more from hopelessness than anal pain, knowing that @@.mediumorchid;you're a slaveowner like any other,@@ more likely to @@.gold;abuse $him@@ than be sympathetic.
<</replace>>
<<set $activeSlave.devotion -= 5>>
@@ -778,7 +778,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<= AnalVCheck()>>
<</link>>
<<if canDoAnal($activeSlave)>>
- | <<link "Let $him know $he'll have to earn $his rewards">>
+ | <<link "Let $him know $he'll have to earn $his rewards">>
<<replace "#introResult">>
You complete the induction and then perform a thorough inspection, noting down each area in which surgery or drugs could improve $his body. $He understands what you're doing and can barely contain $his excitement, but you tell $him that $he'll have to earn such improvements. $His face falls. You reassure $him that it won't take the years $he would have had to work to afford such things $himself, but that $he needs to be a good slave, and soon, for you to spend resources on $him. You let $him start by taking a rough buttfuck, bent over the desk. $His ass is tight and you are not merciful. $He gasps and moans but takes it all the same, @@.mediumaquamarine;trusting@@ that $he'll eventually be rewarded with transformation.
<</replace>>
@@ -1032,23 +1032,23 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<if $activeSlave.dick == 0>>
- | <<link "Give $him a smart clitoral piercing">>
+ | <<link "Give $him a smart clitoral piercing">>
<<set $cash -= $SPcost>>
<<replace "#introResult">>
You take $him to the body modification studio, strap $him down, pierce $his clit, and insert what appears to be a large stainless steel barbell piercing. It actually contains a device that can vibrate to give $him sexual stimulation or create subtle pain to suppress pleasure. It is connected wirelessly to the arcology, which can be given instructions to encourage or discourage sexual pleasure in specific situations. You run a quick test. On the oral setting, as soon as $he kneels in front of your crotch, $he gasps as the stimulation starts. On the anal setting, $he whimpers when you run a finger across $his asshole.
<</replace>>
<<set $activeSlave.clitPiercing = 3>>
<</link>>
- //This option costs <<print cashFormat($SPcost)>>//
+ //This option costs <<print cashFormat($SPcost)>>//
<<else>>
- | <<link "Give $him a smart frenulum piercing">>
+ | <<link "Give $him a smart frenulum piercing">>
<<set $cash -= $SPcost>>
<<replace "#introResult">>
You take $him to the body modification studio, strap $him down, pierce $his frenulum, and insert what appears to be a large stainless steel barbell piercing. It actually contains a device that can vibrate to give $him sexual stimulation or create subtle pain to suppress pleasure. It is connected wirelessly to the arcology, which can be given instructions to encourage or discourage sexual pleasure in specific situations. You run a quick test. On the oral setting, as soon as $he kneels in front of your crotch, $he gasps as the stimulation starts. On the anal setting, $he whimpers and gets rock hard when you run a finger across $his asshole.
<</replace>>
<<set $activeSlave.clitPiercing = 3>>
<</link>>
- //This option costs <<print cashFormat($SPcost)>>//
+ //This option costs <<print cashFormat($SPcost)>>//
<</if>>
@@ -1224,7 +1224,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<if $seePreg != 0>>
<<if isFertile($activeSlave) && $PC.dick == 1 && $activeSlave.ballType == "human">>
- | <<link "Impregnate $him">>
+ | <<link "Impregnate $him">>
<<replace "#introResult">>
You perform a careful medical examination to verify fertility, and then restrain $him in your office with $his ass in the air. Whenever you feel able, you drain your balls into $his <<if $activeSlave.mpreg == 1>>ass<<else>>cunt<</if>>, only releasing $him for other duties when scans verify a fertilized ovum. $He didn't properly understand the scans, so $he just thought it was bound, forced sex; $he won't realize what happened for some weeks at least.
<<if $activeSlave.mpreg == 1>>
@@ -1812,7 +1812,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<</link>>
<<if ($activeSlave.lactation > 0 || (($dairySlimMaintainUpgrade == 0 || $dairySlimMaintain == 0) && ($activeSlave.boobs > 300 || $activeSlave.dick == 0 || $dairyImplantsSetting == 1) && $dairyImplantsSetting != 2)) || ($activeSlave.balls > 0)>>
<<if ($dairyPrepUpgrade == 1) && ($dairy > $dairySlaves+$bioreactorsXY+$bioreactorsXX+$bioreactorsHerm+$bioreactorsBarren)>>
- | <<link "Send $him straight to the Industrial Dairy">>
+ | <<link "Send $him straight to the Industrial Dairy">>
<<set $activeSlave.choosesOwnAssignment = 0>>
<<set $activeSlave.anus = Math.clamp($activeSlave.anus, 3, 4)>>
<<if $activeSlave.vagina > -1>><<set $activeSlave.vagina = Math.clamp($activeSlave.vagina, 3, 4)>><</if>>
@@ -1824,7 +1824,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<</link>>
<</if>>
<<if $dairy > $dairySlaves+$bioreactorsXY+$bioreactorsXX+$bioreactorsHerm+$bioreactorsBarren>>
- | <<link "Break $him in for the Industrial Dairy">>
+ | <<link "Break $him in for the Industrial Dairy">>
<<set $activeSlave.choosesOwnAssignment = 0>>
<<set $activeSlave.anus = Math.clamp($activeSlave.anus, 3, 4)>>
<<if $activeSlave.vagina > -1>>
diff --git a/src/uncategorized/pCoupAttempt.tw b/src/uncategorized/pCoupAttempt.tw
index 256b03af319ccf2c4df10499ab74184acf320313..14bb3c413c70330ad5f6af0313b71c469d085024 100644
--- a/src/uncategorized/pCoupAttempt.tw
+++ b/src/uncategorized/pCoupAttempt.tw
@@ -13,7 +13,7 @@
<<else>>/* still pregnant slave */
<<set $traitor.preg = WombMaxPreg($traitor)>> /*most ready fetus is a base*/
<<set $traitor.pregWeek = WombMaxPreg($traitor)>> /*most ready fetus is a base*/
- <</if>>
+ <</if>>
<<run SetBellySize($traitor)>> /*In any case it's useful to do.*/
<<if $traitor.bald != 1>>
diff --git a/src/uncategorized/pCoupCollaboration.tw b/src/uncategorized/pCoupCollaboration.tw
index 0a6afe6549c835ad898ce2fd80a15c20189c0419..f159edd0d93129aeebca3dc3a2c12e5348c8869f 100644
--- a/src/uncategorized/pCoupCollaboration.tw
+++ b/src/uncategorized/pCoupCollaboration.tw
@@ -12,7 +12,7 @@
<<else>>/* still pregnant slave */
<<set $traitor.preg = WombMaxPreg($traitor)>> /*most ready fetus is a base*/
<<set $traitor.pregWeek = WombMaxPreg($traitor)>> /*most ready fetus is a base*/
-<</if>>
+<</if>>
<<run SetBellySize($traitor)>> /*In any case it's useful to do.*/
You are awakened in the middle of the night by an odd darkness. All the normal lights of your healthy arcology are out. Main power has gone out, and you claw your way in the darkness to the video feeds, running on emergency backup.
diff --git a/src/uncategorized/pCoupLoss.tw b/src/uncategorized/pCoupLoss.tw
index e6ea560ff933dc4066feb38f4d6e8e1f08ddb8ae..b97ca7f9a0714b9a5805f93d4293fdbcb11a044f 100644
--- a/src/uncategorized/pCoupLoss.tw
+++ b/src/uncategorized/pCoupLoss.tw
@@ -11,7 +11,7 @@
<<else>>/* still pregnant slave */
<<set $traitor.preg = WombMaxPreg($traitor)>> /*most ready fetus is a base*/
<<set $traitor.pregWeek = WombMaxPreg($traitor)>> /*most ready fetus is a base*/
-<</if>>
+<</if>>
<<run SetBellySize($traitor)>> /*In any case it's useful to do.*/
You are awakened in the middle of the night by a jolt that shakes the entire arcology, accompanied by a distant boom. It is followed by another, and another, and then the wail of the arcology's alarm systems, and then finally by a faint crackle that grows to a constant chatter of gunfire. Main power goes out, and you claw your way in the darkness to the video feeds, running on emergency backup.
diff --git a/src/uncategorized/pPeacekeepersIntro.tw b/src/uncategorized/pPeacekeepersIntro.tw
index 7af89b0edd0d9e4c7e4cc17a23488799d3de089c..4744510527e37bd234224f63582b9e81401db4a4 100644
--- a/src/uncategorized/pPeacekeepersIntro.tw
+++ b/src/uncategorized/pPeacekeepersIntro.tw
@@ -22,7 +22,7 @@ The aftermath of the attack on the Free City by forces from the neighboring fail
<<else>>
hard-fought, but the attackers did most of the dying. Modern weapons are powerful, especially on the defensive, and there's no appetite in that area to repeat the experiment.
<</if>>
-There are still enough weapons and desperate people there to keep banditry and warlordism going more or less indefinitely, though.
+There are still enough weapons and desperate people there to keep banditry and warlordism going more or less indefinitely, though.
<br><br>
diff --git a/src/uncategorized/pRivalryCapture.tw b/src/uncategorized/pRivalryCapture.tw
index 8f2db9cbd804dea8438a9adabd3c1cbc32d61176..26b8b8331c5467bb2cc2fc622b18f9a94e855318 100644
--- a/src/uncategorized/pRivalryCapture.tw
+++ b/src/uncategorized/pRivalryCapture.tw
@@ -429,13 +429,13 @@
<<setLocalPronouns $activeSlave>>
-Your
-<<if passage() == "P rivalry actions">>
- target is quickly delivered. Politely dismissing the head of your <<if $mercenariesTitle != "mercenaries">> $mercenariesTitle<<else>> mercenaries<</if>>, you savor
+Your
+<<if passage() == "P rivalry actions">>
+ target is quickly delivered. Politely dismissing the head of your <<if $mercenariesTitle != "mercenaries">> $mercenariesTitle<<else>> mercenaries<</if>>, you savor
<<else>>
- bounty is quickly claimed, and you are treated to
+ bounty is quickly claimed, and you are treated to
<</if>>
-the delicious moment of finding your rival on $his knees in front of you with a black bag over $his head and $his hands cuffed behind $him. $He's one of your slaves now, fundamentally no different than any other. Looking $him over, the causes of $his downfall are
+the delicious moment of finding your rival on $his knees in front of you with a black bag over $his head and $his hands cuffed behind $him. $He's one of your slaves now, fundamentally no different than any other. Looking $him over, the causes of $his downfall are
<<switch _rivalType>>
<<case "expansionist shemale">>
immediately apparent: $he's obviously been indulging in self-transformation to excess.
diff --git a/src/uncategorized/pTraitorMessage.tw b/src/uncategorized/pTraitorMessage.tw
index 5127bb2c2188cadbcc96d04de81ec70400cfd561..0783ef9bbbf5b4f16bf4f60cf768a83d39252539 100644
--- a/src/uncategorized/pTraitorMessage.tw
+++ b/src/uncategorized/pTraitorMessage.tw
@@ -23,7 +23,7 @@
<<else>>/* still pregnant slave */
<<set $traitor.preg = WombMaxPreg($traitor)>> /*most ready fetus is a base*/
<<set $traitor.pregWeek = WombMaxPreg($traitor)>> /*most ready fetus is a base*/
-<</if>>
+<</if>>
<<run SetBellySize($traitor)>> /*In any case it's useful to do.*/
<<if $traitor.preg > 0>>
@@ -32,7 +32,7 @@
<<set _isPreg = 0>>
<</if>>
-/* ------------------ pregnancy setup end here-----------------
+/* ------------------ pregnancy setup end here-----------------
As no broodmother cases in code below, it's no need to setup every case of impregnation through new system. Backup mechanic will do it for normal pregnancies.
*/
diff --git a/src/uncategorized/peHeadgirlConcubine.tw b/src/uncategorized/peHeadgirlConcubine.tw
index 521a08b00cafe087623ca8d1020f8c836a7d75ec..cacee3dc82b4ff26aea3166c8e0135785a1c0261 100644
--- a/src/uncategorized/peHeadgirlConcubine.tw
+++ b/src/uncategorized/peHeadgirlConcubine.tw
@@ -157,7 +157,7 @@ and it's also obvious that they've been filling the few minutes they've been wai
<<if canDoAnal($HeadGirl)>>
cocks $his hips, pulls one buttock aside, and winks $his asshole in your direction
<<else>>
- looks you in the eye and gives $his booty a slap
+ looks you in the eye and gives $his booty a slap
<</if>>
<<case "boobs">>
looks you in the eye and gives $his boobs a little bounce
diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw
index 8abe9487d4146053e1a883915b8d7c30879fe2cf..6f4c605551262d2b0e7ab03c06f6b2f87fd62a34 100644
--- a/src/uncategorized/persBusiness.tw
+++ b/src/uncategorized/persBusiness.tw
@@ -1055,11 +1055,11 @@ The RomanFS may need further tweaking (it probably got weaker). Could increase t
<<if $weatherToday.severity == 3>>
<<set $localEcon -= 1>>
<<set $econWeatherDamage += 1>>
- <br><br>This week's terrible weather did a number on the region, @@.red;hurting the local economy.@@
+ <br><br>This week's terrible weather did a number on the region, @@.red;hurting the local economy.@@ <<if $disasterResponse == 0>>//Investing in a disaster response unit will speed up recovery//<</if>>
<<elseif $weatherToday.severity > 3>>
<<set $localEcon -= 3>>
<<set $econWeatherDamage += 3>>
- <br><br>This week's extreme weather ravaged the region, @@.red;the local economy is seriously disrupted.@@
+ <br><br>This week's extreme weather ravaged the region, @@.red;the local economy is seriously disrupted.@@ <<if $disasterResponse == 0>>//Investing in a disaster response unit will speed up recovery//<</if>>
<</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/personalAttentionSelect.tw b/src/uncategorized/personalAttentionSelect.tw
index e0a31fca098cb0981e4d3eb121b8b360f0aeb201..556db0d737a1cfaa14a1f4d5af83755d87f5e87f 100644
--- a/src/uncategorized/personalAttentionSelect.tw
+++ b/src/uncategorized/personalAttentionSelect.tw
@@ -219,9 +219,9 @@
<br>
<<link "Remove $his behavioral flaw">><<set $personalAttention[_i].trainingRegimen = "fix her behavioral flaw">><<replace `"#training"+_i`>><strong>$personalAttention[_i].trainingRegimen</strong><</replace>><</link>>
<<if ($activeSlave.devotion < -20)>>
- | //$He must be broken before $his flaws can be softened//
+ | //$He must be broken before $his flaws can be softened//
<<else>>
- | <<link "Soften $his behavioral flaw">><<set $personalAttention[_i].trainingRegimen = "soften her behavioral flaw">><<replace `"#training"+_i`>><strong>$personalAttention[_i].trainingRegimen</strong><</replace>><</link>>
+ | <<link "Soften $his behavioral flaw">><<set $personalAttention[_i].trainingRegimen = "soften her behavioral flaw">><<replace `"#training"+_i`>><strong>$personalAttention[_i].trainingRegimen</strong><</replace>><</link>>
<</if>>
<</if>>
@@ -230,12 +230,12 @@
<<link "Remove $his sexual flaw">><<set $personalAttention[_i].trainingRegimen = "fix her sexual flaw">><<replace `"#training"+_i`>><strong>$personalAttention[_i].trainingRegimen</strong><</replace>><</link>>
<<if ($activeSlave.devotion < -20)>>
<<if ($activeSlave.behavioralFlaw == "none")>>
- | //$He must be broken before $his flaws can be softened//
+ | //$He must be broken before $his flaws can be softened//
<</if>>
<<elseif ["abusive", "anal addict", "attention whore", "breast growth", "breeder", "cum addict", "malicious", "neglectful", "self hating"].includes($activeSlave.sexualFlaw)>>
- | //Paraphilias cannot be softened//
+ | //Paraphilias cannot be softened//
<<else>>
- | <<link "Soften $his sexual flaw">><<set $personalAttention[_i].trainingRegimen = "soften her sexual flaw">><<replace `"#training"+_i`>><strong>$personalAttention[_i].trainingRegimen</strong><</replace>><</link>>
+ | <<link "Soften $his sexual flaw">><<set $personalAttention[_i].trainingRegimen = "soften her sexual flaw">><<replace `"#training"+_i`>><strong>$personalAttention[_i].trainingRegimen</strong><</replace>><</link>>
<</if>>
<</if>>
diff --git a/src/uncategorized/reBrothelFunction.tw b/src/uncategorized/reBrothelFunction.tw
index 69b5258015ebedfff9d3ff107130fd4560d7f64e..4c84453c38ff3accf510fab60bb6ffb9ae610d8b 100644
--- a/src/uncategorized/reBrothelFunction.tw
+++ b/src/uncategorized/reBrothelFunction.tw
@@ -9,7 +9,7 @@ One request comes to you written on a letterhead featuring the logo of a fellow
<br><br>
Another of these bids for your brothel comes in the form of a curious video call. The video comes from an infamous lothario in your arcology, a seducer of powerful and prominent women citizens. Indeed, the recording was surreptitiously recorded in the bedroom of one such influential woman, with the Casanova describing his request in hushed tones while his wealthy host minces about unknowingly in the background. He explains that he is finally ready to hang up his coat and end his days of debauchery and copious casual sex, but that he would like to do so by engaging in a full day of indulgence at $brothelNameCaps.
<br><br>
-The last of these requests comes in the form of a letter, stamped with the herald of a prominent arcology family. It seems the eldest son of the family, known to you largely as a spoiled child riding on the coattails of his parents, is about to reach the age of majority. At his behest, his parents have contacted you to reserve your brothel for a day so that their son may become a man in true Free Cities fashion - amongst a roil of writhing flesh and wanton debauchery.
+The last of these requests comes in the form of a letter, stamped with the herald of a prominent arcology family. It seems the eldest son of the family, known to you largely as a spoiled child riding on the coattails of his parents, is about to reach the age of majority. At his behest, his parents have contacted you to reserve your brothel for a day so that their son may become a man in true Free Cities fashion - amongst a roil of writhing flesh and wanton debauchery.
<br><br>
@@ -27,7 +27,7 @@ The last of these requests comes in the form of a letter, stamped with the heral
<</link>> //This will earn you <<print cashFormat(10000)>>//
<br><<link "Give this lady-killing rake a proper send off into retirement">>
<<replace "#result">>
- Though a citizen he may be, this serial seducer may have more notches on his proverbial bedpost than even your oldest slaves. Though you are not present to view his mastery of the sexual craft first-hand, the dreamy fucked-out looks of exhaustion and gratified satisfaction painting every single one of your girls' faces at the end of the day speak volumes. Indeed, all of your brothel slaves with any room for improvement in their whoring skills @@.green;learn from his skillful coupling,@@ while even those with nothing to learn from him @@.hotpink;gain confidence@@ from the intensity of their sexual congress.
+ Though a citizen he may be, this serial seducer may have more notches on his proverbial bedpost than even your oldest slaves. Though you are not present to view his mastery of the sexual craft first-hand, the dreamy fucked-out looks of exhaustion and gratified satisfaction painting every single one of your girls' faces at the end of the day speak volumes. Indeed, all of your brothel slaves with any room for improvement in their whoring skills @@.green;learn from his skillful coupling,@@ while even those with nothing to learn from him @@.hotpink;gain confidence@@ from the intensity of their sexual congress.
<<for $i = 0; $i < $slaves.length; $i++>>
<<if $slaves[$i].assignment == "work in the brothel">>
<<if $slaves[$i].whoreSkill < 100>>
diff --git a/src/uncategorized/resEndowment.tw b/src/uncategorized/resEndowment.tw
index 69511bac14d2ab18fafe83dc7ebe437dcce46770..007a8e23704dbfbff8e620a0421c4db5784facdb 100644
--- a/src/uncategorized/resEndowment.tw
+++ b/src/uncategorized/resEndowment.tw
@@ -33,7 +33,7 @@
<br><br>
"A generous donation," the representative insists, "would help us advance our mission to provide the very finest livestock to persons of quality such as yourself." Getting down to the business advantages, he adds that "donors receive considerable price advantage on available stock," which seems to translate into a discount of around 20% once the sales language is stripped off it. You point out that's bordering on pointlessness to you, given your ability to purchase almost anything you wish; he hesitates, but then admits that "as our foremost investor" you could use an endowment to guide stock policy to an extent.
<<else>>
- You receive a personal call from an older member of the Futanari Sisters. Like all of the Sisters, she's very beautiful, but you know how to judge age through the most cutting-edge treatments, and you guess she's in her early forties. That makes her one of the most senior Sisters, at the age when mandatory enslavement will happen very soon for her. She doesn't seem preoccupied by the prospect, though the pair of gorgeous young women cooperating to suck off her enormous cock may have something to do with that.
+ You receive a personal call from an older member of the Futanari Sisters. Like all of the Sisters, she's very beautiful, but you know how to judge age through the most cutting-edge treatments, and you guess she's in her early forties. That makes her one of the most senior Sisters, at the age when mandatory enslavement will happen very soon for her. She doesn't seem preoccupied by the prospect, though the pair of gorgeous young women cooperating to suck off her enormous cock may have something to do with that.
<<if $PC.surname>>"<<if $PC.title>>Mr.<<else>>Ms.<</if>> <<print $PC.surname>>,"<<else>>"<<print $PC.name>>,"<</if>>
she says forthrightly,
<<if ($PC.dick == 1) && ($PC.vagina == 1) && ($PC.boobs == 1)>>
@@ -274,13 +274,13 @@
<br>
<<link "Propose a dynamic compromise that supports both visions">>
<<replace "#result">>
- You reconnect the call you had with the first matron, splitting your desktop's display to accommodate both video call windows so that you can address both at once. Then you begin to suggest a compromise that should gratify both parties:
+ You reconnect the call you had with the first matron, splitting your desktop's display to accommodate both video call windows so that you can address both at once. Then you begin to suggest a compromise that should gratify both parties:
<br><br>
With their not so feminine voices, conspicuous Adam's Apples, dry barren artificial pussies, and naturally masculine hormonal balances, it is more or less an open secret that futanari 'Sisters' are all biologically, well, men. It is considered poor taste to mention such a thing among polite company, however, as some men who own futas willfully try to ignore this fact or are otherwise are upset to be reminded of it. Your proposed remedy allows both sisters to have their way: With your extensive funding, those current Sisters who were biologically born male (all of them) will be endowed with bigger balls at the second matron's behest. Meanwhile, a new lineup of biologically female Futanari Sisters will be very rapidly inducted, transformed, cultured, trained, and readied for resale, under the expert leadership of the first matron. These new lady-futas will only have erect dicks to complement their natural fertile pussies, feminine hormones, and soft voices; nary a testicle in sight. Slaveowning society on the other hand will enjoy a wider variety of futanari slaves to choose from, opening up exciting new opportunities for owner to sate their personal preferences and perfect their harems. In 15 weeks, the absolute minimum time that all can be feasibly accomplished, everybody wins. Business will continue as usual in the Futanari Sisters until then, with no immediate change in merchandise.
<br><br>
"Well, you aren't the first one to think of that." the first matron reluctantly states. "You see, there's this outcast group of Sisters who would be perfect for this, it's just... We haven't seen eye to eye for a long time." The second chimes in: "You could talk her into it, she approves of your build far more than mine. Will probably take several months though, to move them all over and integrate all the new Sisters into our fold, and to enjoy the new pussies, of course." After a moment of consideration, the first agrees. You donate the funds to the Sisters with your compliments, ensuring that neither matron completely controls the vast sum. They both understand what they have to do now, starting immediately.
<br><br>
- Days later, the grateful institution begins a mass marketing campaign all across the world's Free Cities, which includes adverts in FCNN, FCTV, and FC social media about the upcoming changes to their Sister inventory and their need for willing new blood and new specialists to help them bolster their ranks. You feature prominently in each and every promotional item as their foremost contributor. Thanks to this @@.green;you will be a household name in the Free Cities for some time.@@ Such a public flex of your financial muscles has also made your relative power very clear to some in the New World, attracting important players who @@.green;will start to show an interest@@ in doing business with you and your Free City.
+ Days later, the grateful institution begins a mass marketing campaign all across the world's Free Cities, which includes adverts in FCNN, FCTV, and FC social media about the upcoming changes to their Sister inventory and their need for willing new blood and new specialists to help them bolster their ranks. You feature prominently in each and every promotional item as their foremost contributor. Thanks to this @@.green;you will be a household name in the Free Cities for some time.@@ Such a public flex of your financial muscles has also made your relative power very clear to some in the New World, attracting important players who @@.green;will start to show an interest@@ in doing business with you and your Free City.
<<set $TFS.schoolUpgrade = 3>>
<<set $cash -= 250000>>
<<set $rep += 2000>>
diff --git a/src/uncategorized/saDevotion.tw b/src/uncategorized/saDevotion.tw
index 740419ecfb8104a616bd524355c73166458fc6e4..db7012e3640185bc122d65de10f5cab43241e5d1 100644
--- a/src/uncategorized/saDevotion.tw
+++ b/src/uncategorized/saDevotion.tw
@@ -161,10 +161,10 @@
<</if>>
<<if ($arcologies[0].FSRestart != "unset")>>
<<if $slaves[$i].bellyPreg >= 1500 && $slaves[$i].devotion <= 20>>
- Being visibly pregnant in a society that loathes slave breeding fills $him with @@.gold;fear@@ for $himself and $his unborn child.
+ Being visibly pregnant in a society that loathes slave breeding fills $him with @@.gold;fear@@ for $himself and $his unborn child.
<<set $slaves[$i].trust -= 10>>
<<elseif $slaves[$i].pregKnown == 1 && $slaves[$i].devotion <= 20>>
- Being pregnant in a society that loathes slave breeding fills $him with @@.gold;worry@@ that you'll harm $him or $his unborn child.
+ Being pregnant in a society that loathes slave breeding fills $him with @@.gold;worry@@ that you'll harm $him or $his unborn child.
<<set $slaves[$i].trust -= 5>>
<</if>>
<</if>>
diff --git a/src/uncategorized/saLiveWithHG.tw b/src/uncategorized/saLiveWithHG.tw
index 37390c136ffd6559c05884279edb7c5eca9f083d..c0826661385ff68733abbc4275b3dcac2dc4fdcb 100644
--- a/src/uncategorized/saLiveWithHG.tw
+++ b/src/uncategorized/saLiveWithHG.tw
@@ -643,7 +643,7 @@
<<set $HeadGirl.need = 0>>
<<if _cervixPump > 0>>
- $slaves[$i].slaveName notices $his @@.lime;belly swell@@ after
+ $slaves[$i].slaveName notices $his @@.lime;belly swell@@ after
<<if $slaves[$i].cervixImplant == 1>>
vaginal
<<elseif $slaves[$i].cervixImplant == 2>>
diff --git a/src/uncategorized/saPleaseYou.tw b/src/uncategorized/saPleaseYou.tw
index 7b6b5143b3fa3fed41fc437c5f730d1a29ffb04c..a0c5c737142e53461b8089ec543b4388b6a924f6 100644
--- a/src/uncategorized/saPleaseYou.tw
+++ b/src/uncategorized/saPleaseYou.tw
@@ -114,7 +114,7 @@ serves you this week.
<<if $PC.dick == 1>>
<<if ($slaves[$i].fetish != "mindbroken")>>
<<if $slaves[$i].fetish == "submissive">>
- $He frequently climaxes with your <<if $PC.title == 1>>strong<<else>>soft<</if>> hands holding $him and your cock spreading heat through $his core,
+ $He frequently climaxes with your <<if $PC.title == 1>>strong<<else>>soft<</if>> hands holding $him and your cock spreading heat through $his core,
<<if $slaves[$i].fetishKnown == 1>>
@@.hotpink;fulfilling $his life's role completely.@@
<<else>>
@@ -154,7 +154,7 @@ serves you this week.
<<elseif ($slaves[$i].toyHole == "ass")>>
<<if $slaves[$i].fuckdoll == 0>>
- $He spends the week
+ $He spends the week
<<if ($slaves[$i].fetish == "mindbroken")>>
unaware of your intent to use $his anus.
<<elseif ($slaves[$i].trust < -20)>>
@@ -182,7 +182,7 @@ serves you this week.
<<set $slaves[$i].devotion -= 3, $slaves[$i].trust -= 9>>
<<else>>
<<set _analUse = random(3,7)>>
- on occasion.
+ on occasion.
<<set $slaves[$i].devotion -= 3, $slaves[$i].trust -= 3>>
<</if>>
$He doesn't react, even if $his body does.
@@ -316,7 +316,7 @@ serves you this week.
<<set $slaves[$i].devotion -= 3, $slaves[$i].trust -= 9>>
<<else>>
<<set _oralUse = random(3,7)>>
- on occasion.
+ on occasion.
<<set $slaves[$i].devotion -= 3, $slaves[$i].trust -= 3>>
<</if>>
$He absentmindedly follows your lead.
@@ -356,7 +356,7 @@ serves you this week.
<<if ($PC.dick == 1)>>get a blowjob<<if $PC.vagina == 1>> and some pussy licking<</if>> from $him<<else>>let $him eat you out<</if>>
<<if ($fuckSlaves <= $PC.sexualEnergy/2)>>
<<set _oralUse = random(21,40)>>
- several times a day; constantly
+ several times a day; constantly
<<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>>
<<elseif ($fuckSlaves <= $PC.sexualEnergy)>>
<<set _oralUse = random(7,14)>>
@@ -453,7 +453,7 @@ serves you this week.
<<set $slaves[$i].devotion -= 3, $slaves[$i].trust -= 9>>
<<else>>
<<set _mammaryUse = random(3,7)>>
- on occasion.
+ on occasion.
<<set $slaves[$i].devotion -= 3, $slaves[$i].trust -= 3>>
<</if>>
$He absentmindedly follows your lead.
@@ -498,7 +498,7 @@ serves you this week.
$him on occasion; the threat of
<<set $slaves[$i].devotion -= 3, $slaves[$i].trust -= 3>>
<</if>>
- sexual abuse fills $him with @@.mediumorchid;revulsion@@ and @@.gold;fear.@@
+ sexual abuse fills $him with @@.mediumorchid;revulsion@@ and @@.gold;fear.@@
<<elseif ($slaves[$i].devotion <= 20)>>
play with $his tits
<<if ($fuckSlaves <= $PC.sexualEnergy/2)>>
@@ -553,7 +553,7 @@ serves you this week.
<<set $slaves[$i].devotion += 2>>
<<elseif _fetishChangeChance > random(0,100)>>
<<set $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10, $slaves[$i].fetish = "boobs">>
- $He climaxes to nipple stimulation alone, and starts acting as though
+ $He climaxes to nipple stimulation alone, and starts acting as though
<<if $slaves[$i].clit > 0 && $slaves[$i].nipples != "fuckable">>
$he has @@.lightcoral;three pleasure buttons@@ rather than just one.
<<elseif $slaves[$i].vagina > -1 && $slaves[$i].nipples == "fuckable">>
@@ -592,7 +592,7 @@ serves you this week.
/*check*/
<<elseif ($slaves[$i].toyHole == "dick")>>
<<if $slaves[$i].fuckdoll > 0>>
- All it takes is a simple command to force $his dick to attention. You have the sexual energy to ride $him
+ All it takes is a simple command to force $his dick to attention. You have the sexual energy to ride $him
<<if ($fuckSlaves <= $PC.sexualEnergy/2)>>
<<set _penetrativeUse = random(21,40)>>
several times a day.
@@ -1090,7 +1090,7 @@ serves you this week.
<<if ($slaves[$i].fetish == "mindbroken")>>
$He is completely oblivious to $his @@.lime;increasingly swollen belly@@ and stands no chance of linking it to
<<else>>
- $He notices $his @@.lime;belly has swollen@@ after
+ $He notices $his @@.lime;belly has swollen@@ after
<</if>>
all the
<<if $slaves[$i].cervixImplant == 1>>
diff --git a/src/uncategorized/saRivalries.tw b/src/uncategorized/saRivalries.tw
index 186ab373d7757c41e0c5defb06f7d9023026f9b0..11f699aac62abf410473692650ddd494690a58b9 100644
--- a/src/uncategorized/saRivalries.tw
+++ b/src/uncategorized/saRivalries.tw
@@ -154,14 +154,14 @@
<<if $slaves[$i].fetish == "sadist">>
$slaves[$i].slaveName is horny and sadistic, so $he rapes $his rival <<= SlaveFullName($slaves[_j])>> every chance $he gets; this @@.hotpink;thrills@@ $slaves[$i].slaveName, but $slaves[_j].slaveName is @@.golden;frightened@@ that you let it happen.
<<set $slaves[$i].need = 0, $slaves[$i].devotion += 3, $slaves[_j].trust -= 3, $slaves[$i].penetrativeCount += 5, $slaves[_j].oralCount += 5>>
- <<if $slaves[$i].rivalry < 3>>
+ <<if $slaves[$i].rivalry < 3>>
Of course, this @@.lightsalmon;worsens their rivalry.@@
<<set $slaves[_j].rivalry += 1, $slaves[$i].rivalry += 1, _worsenedRivalry = 1>>
<</if>>
<<elseif $slaves[$i].fetish == "dom">>
$slaves[$i].slaveName is horny and dominant, so $he forces $his rival <<= SlaveFullName($slaves[_j])>> to submit to $him whenever $he can; this @@.hotpink;thoroughly satisfies@@ $slaves[$i].slaveName, but $slaves[_j].slaveName is @@.golden;angered@@ that you let it happen.
<<set $slaves[$i].need = 0, $slaves[$i].devotion += 3, $slaves[_j].devotion -= 3, $slaves[$i].penetrativeCount += 5, $slaves[_j].oralCount += 5>>
- <<if $slaves[$i].rivalry < 3>>
+ <<if $slaves[$i].rivalry < 3>>
Of course, this @@.lightsalmon;worsens their rivalry.@@
<<set $slaves[_j].rivalry += 1, $slaves[$i].rivalry += 1, _worsenedRivalry = 1>>
<</if>>
diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw
index 4c1ae47a3efaf9da14f2c93480a71fd8cfafb5b2..aa714c907487c55490e6e8c57fce225a6aea6521 100644
--- a/src/uncategorized/saRules.tw
+++ b/src/uncategorized/saRules.tw
@@ -4509,7 +4509,7 @@
The spare living conditions and daily tasks @@.hotpink;get $him used@@ to the routine of slavery.
<<set $slaves[$i].devotion += 1>>
<<case "Roman Revivalist">>
- $He is
+ $He is
<<set $slaves[$i].devotion += 2, $slaves[$i].trust += 2>>
<<default>>
The reasonable living conditions allow $him to relax after the days work.
diff --git a/src/uncategorized/saServeYourOtherSlaves.tw b/src/uncategorized/saServeYourOtherSlaves.tw
index 3f5f22af6aa954d49c0ddc0fc75c58da9621dad0..2543f4c4136d620a97fee6205b0069fb3802b6e2 100644
--- a/src/uncategorized/saServeYourOtherSlaves.tw
+++ b/src/uncategorized/saServeYourOtherSlaves.tw
@@ -260,7 +260,7 @@ is serving ''$slaves[_dom].slaveName'' this week.
<<else>>
$slaves[_dom].slaveName finds _himself2 under the weight of $slaves[$i].slaveName's limbless body and
<<if $slaves[_dom].boobs >= 300>>
- _his2 _domRace tits
+ _his2 _domRace tits
<<else>>
_his2 <<print nippleColor($slaves[_dom])>> nipples
<</if>>
@@ -280,7 +280,7 @@ is serving ''$slaves[_dom].slaveName'' this week.
<<else>>
$slaves[_dom].slaveName finds _himself2 pushed firmly into _his2 bedsheets and _his2
<<if $slaves[_dom].boobs >= 300>>
- _domRace tits
+ _domRace tits
<<else>>
<<print nippleColor($slaves[_dom])>> nipples
<</if>>
@@ -292,7 +292,7 @@ is serving ''$slaves[_dom].slaveName'' this week.
<</if>>
<<set $slaves[$i].devotion += 1>>
<<elseif ($slaves[$i].devotion >= -20) && ($slaves[_dom].fetishKnown == 1) && ($slaves[_dom].fetishStrength > 60) && ($slaves[_dom].fetish == "dom") && canWalk($slaves[_dom])>>
- $slaves[_dom].slaveName loves to dominate, and the first indication $slaves[$i].slaveName gets of what $he's in for this week is when $slaves[_dom].slaveName ambushes $him in the dormitory, tackles $him from behind, and
+ $slaves[_dom].slaveName loves to dominate, and the first indication $slaves[$i].slaveName gets of what $he's in for this week is when $slaves[_dom].slaveName ambushes $him in the dormitory, tackles $him from behind, and
<<if $slaves[$i].amp == 1>>
bursts out <<if canTalk($slaves[_dom])>>laughing<<else>>in silent laughter<</if>> at $his inability to right $himself without limbs.
<<else>>
diff --git a/src/uncategorized/saWhore.tw b/src/uncategorized/saWhore.tw
index cff37a319ed31db0242de393fd29bb144c7dbfce..21cae4ef1c8cf5212d27cee401d7788c087dc285 100644
--- a/src/uncategorized/saWhore.tw
+++ b/src/uncategorized/saWhore.tw
@@ -218,7 +218,7 @@ _beautyCorrection = 0>>
$FResult = Math.trunc(_beautyCorrection * $FResult)>>
<</if>>
-$His appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a day)<<if $beauty > 160>>, so many that <<if canDoVaginal($slaves[$i]) && canDoAnal($slaves[$i])>>each of $his holes was<<elseif canDoVaginal($slaves[$i]) || canDoAnal($slaves[$i])>>each of $his available holes was<<else>>$his mouth and anywhere else a cock could fit was<</if>> often filled by more than one cock<<elseif $beauty > 140>>, so many that $he spent much of $his time getting gangbanged<<elseif $beauty > 120>>, so many that customers often <<if canDoAnal($slaves[$i]) || canDoVaginal($slaves[$i])>>spitroasted<<else>>double-teamed<</if>> the slut<<elseif $beauty > 100>>, so many that $he frequently had sex with multiple customers at once<<elseif $beauty > 70>>, so many that $he occasionally had sex with multiple customers at once<</if>>. They paid <<print cashFormat($FResult)>> on average<<if _beautyCorrection > 1>>, including a premium for being in extremely high demand<</if>>.
+$His appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a day)<<if $beauty > 160>>, so many that <<if canDoVaginal($slaves[$i]) && canDoAnal($slaves[$i])>>each of $his holes was<<elseif canDoVaginal($slaves[$i]) || canDoAnal($slaves[$i])>>each of $his available holes was<<else>>$his mouth and anywhere else a cock could fit was<</if>> often filled by more than one cock<<elseif $beauty > 140>>, so many that $he spent much of $his time getting gangbanged<<elseif $beauty > 120>>, so many that customers often <<if canDoAnal($slaves[$i]) || canDoVaginal($slaves[$i])>>spitroasted<<else>>double-teamed<</if>> the slut<<elseif $beauty > 100>>, so many that $he frequently had sex with multiple customers at once<<elseif $beauty > 70>>, so many that $he occasionally had sex with multiple customers at once<</if>>. They paid <<print cashFormat($FResult)>> on average<<if _beautyCorrection > 1>>, including a premium for being in extremely high demand<</if>>.
<<set _incomeStats.customers = $beauty>>
<<if $seeAge == 1>>
diff --git a/src/uncategorized/saWorkAGloryHole.tw b/src/uncategorized/saWorkAGloryHole.tw
index fe5d6c110f276e1e8171f11d11de0326c416b24f..cec3e56e284c5f2b4414894025e293a11a3d5055 100644
--- a/src/uncategorized/saWorkAGloryHole.tw
+++ b/src/uncategorized/saWorkAGloryHole.tw
@@ -152,7 +152,7 @@ $His feelings, skills, and appearance do not matter. $He is condemned to a world
<<case "Chinese Revivalist">>
<<set $arcologies[0].FSChineseRevivalist += _seed>>
<<case "Repopulation Focus">>
- <<set $arcologies[0].FSRepopulationFocus += _seed>>
+ <<set $arcologies[0].FSRepopulationFocus += _seed>>
<<case "Eugenics">>
<<set $arcologies[0].FSRestart += _seed>>
<<case "Chattel Religionist">>
diff --git a/src/uncategorized/salon.tw b/src/uncategorized/salon.tw
index 0343685a4a307b5f47d19ab9f6556000d2106d8f..f1acaab3be4fa5ce477b72d2890d3f37d28c6259 100644
--- a/src/uncategorized/salon.tw
+++ b/src/uncategorized/salon.tw
@@ -297,7 +297,7 @@
| [[In a ponytail|Salon][$activeSlave.hStyle = "ponytail",$cash -= $modCost]]
| [[In tails|Salon][$activeSlave.hStyle = "tails",$cash -= $modCost]]
| [[Luxurious|Salon][$activeSlave.hStyle = "luxurious",$cash -= $modCost]]
- | [[Messy|Salon][$activeSlave.hStyle = "messy",$cash -= $modCost]]
+ | [[Messy|Salon][$activeSlave.hStyle = "messy",$cash -= $modCost]]
| [[Neat|Salon][$activeSlave.hStyle = "neat",$cash -= $modCost]]
| [[Permed|Salon][$activeSlave.hStyle = "permed",$cash -= $modCost]]
| [[Shaved sides|Salon][$activeSlave.hStyle = "strip",$cash -= $modCost]]
@@ -455,7 +455,7 @@
| [[In a ponytail|Salon][$activeSlave.hStyle = "ponytail",$cash -= $modCost]]
| [[In tails|Salon][$activeSlave.hStyle = "tails",$cash -= $modCost]]
| [[Luxurious|Salon][$activeSlave.hStyle = "luxurious",$cash -= $modCost]]
- | [[Messy|Salon][$activeSlave.hStyle = "messy",$cash -= $modCost]]
+ | [[Messy|Salon][$activeSlave.hStyle = "messy",$cash -= $modCost]]
| [[Neat|Salon][$activeSlave.hStyle = "neat",$cash -= $modCost]]
| [[Permed|Salon][$activeSlave.hStyle = "permed",$cash -= $modCost]]
| [[Shaved sides|Salon][$activeSlave.hStyle = "strip",$cash -= $modCost]]
diff --git a/src/uncategorized/seBirth.tw b/src/uncategorized/seBirth.tw
index 19f03ca9abcdba9a4fa8c12b7e2439e6b2d9be39..918451565753140b567db28d4fd81c6311a96dc5 100644
--- a/src/uncategorized/seBirth.tw
+++ b/src/uncategorized/seBirth.tw
@@ -8,7 +8,7 @@ Refactoring this passage. Main idea for structure:
3. Make calculation of birth process. All live babies will be added to slave property .curBabies as array. They will be in it as long as slave not give next birth. Enough time for any processing.
4. Showing scene of birth based on calculation (broodmother and normal is merged in one scene, just with variations).
5. Dealing with babies - they are in separate array, no need to mess with mother .pregType or .preg now.
-6. Setting up postpartum
+6. Setting up postpartum
7. Dealing with mother critical states.
I need to break single passage to several widgets, as it's been overcomplicated monster with too many nested if's - true horror for me. :) At least for testing and bugfixing time, later it can be merged back, if needed for processing speed up.
@@ -38,68 +38,20 @@ I need to break single passage to several widgets, as it's been overcomplicated
<<seBirthCalc>>
<<seBirthMainScene>>
<<seBirthBabies>>
- <<if $DefaultBirthDestination != "anywhere" && $universalRulesChildrenBecomeBreeders < 1>>
- $His <<if _curBabies > 1>>babies<<else>>baby<</if>> were sent to $DefaultBirthDestination. $slaves[$i].slaveName
+ <<if $DefaultBirthDestination != "individually decided fates" && $universalRulesChildrenBecomeBreeders < 1>>
+ <<set _call = 1>> $His <<if _curBabies > 1>>babies were<<else>>baby was<</if>> sent to $DefaultBirthDestination.
<<switch $DefaultBirthDestination>>
<<case "an orphanage">>
- <<if $slaves[$i].devotion > 95>>
- worships you so completely that $he will not resent this.
- <<elseif $slaves[$i].devotion > 50>>
- is devoted to you, but $he will @@.mediumorchid;struggle to accept this.@@
- <<set $slaves[$i].devotion -= 2>>
- <<elseif $slaves[$i].devotion > 20>>
- has accepted being a sex slave, but $he will @@.mediumorchid;resent this intensely.@@
- <<set $slaves[$i].devotion -= 3>>
- <<else>>
- will of course @@.mediumorchid;hate you for this.@@
- <<set $slaves[$i].devotion -= 4>>
- <</if>>
+ <<= BirthDestinationText("Orphanage",$slaves[$i])>>
<<set $slaveOrphanageTotal += _curBabies>>
<<case "a citizen school">>
- <<if $slaves[$i].devotion > 95>>
- loves you already, but <<print $he>>'ll @@.hotpink;love you even more@@ for this.
- <<elseif $slaves[$i].devotion > 50>>
- knows about these and will be @@.hotpink;overjoyed.@@ $He will miss $his child<<if _curBabies > 1>>ren<</if>>, but $he expected that.
- <<elseif $slaves[$i].devotion > 20>>
- will naturally miss $his child<<if _curBabies > 1>>ren<</if>>, but will @@.hotpink;take comfort@@ in the hope that $his offspring will have a better life.
- <<else>>
- will naturally retain some resentment over being separated from $his child<<if _curBabies > 1>>ren<</if>>, but this should be balanced by hope that $his offspring will have a better life.
- <</if>>
+ child<<if _count > 1>>ren are<<else>> is<</if>> <<= BirthDestinationText("Citizen",$slaves[$i])>>
<<set $slaves[$i].devotion += 4, $citizenOrphanageTotal += _curBabies>>
<<case "a private school">>
- <<if $slaves[$i].devotion > 95>>
- will @@.hotpink;worship you utterly@@ for this.
- <<elseif $slaves[$i].devotion > 50>>
- understands that this is the best possible outcome for the offspring of slave, and will be @@.hotpink;overjoyed.@@
- <<elseif $slaves[$i].devotion > 20>>
- will miss $his child<<if _curBabies > 1>>ren<</if>>, but will be @@.hotpink;very grateful,@@ since <<print $he>>'ll understand this is the best possible outcome for a slave mother.
- <<else>>
- will resent being separated from $his child<<if _curBabies > 1>>ren<</if>>, but @@.hotpink;should understand and be grateful@@ that this is the best possible outcome here.
- <</if>>
- The child<<if _curBabies > 1>>ren<</if>> will be raised privately, with expert care and tutoring, an expensive proposition.
+ <<= BirthDestinationText("Private",$slaves[$i])>>
<<set $slaves[$i].devotion += 6, $privateOrphanageTotal += _curBabies>>
<<case "the market">>
- <<if $slaves[$i].prestige > 1 || $slaves[$i].pornPrestige > 2>>
- <<set _babyCost = random(-12,100)>>
- <<if $slaves[$i].prematureBirth > 0>><<set _babyCost = random(-32,40)>><</if>>
- <<else>>
- <<set _babyCost = random(-12,12)>>
- <<if $slaves[$i].prematureBirth > 0>><<set _babyCost = -45>><</if>>
- <</if>>
- $His <<if _curBabies > 1>>babies<<else>>baby<</if>> were sold for <<if _curBabies > 1>>a total of <</if>>@@.yellowgreen;<<print cashFormat(_curBabies*(50+_babyCost))>>.@@<<if $slaves[$i].prematureBirth == 1>> A low price due to the added costs of caring for them.<</if>>
- <<if $slaves[$i].devotion > 95>>
- $He adheres to your thoughts so strongly that even though you backed out of caring for $his child<<if _curBabies > 1>>ren<</if>>, $he still truly believes you are doing $him an honor.
- <<elseif $slaves[$i].devotion > 50>>
- $He is @@.mediumorchid;deeply hurt@@ by your sudden decision to sell $his child<<if _curBabies > 1>>ren<</if>> instead of having <<if _curBabies > 1>>them<<else>>it<</if>> cared for. $His trust in your words @@.gold;wavers@@ as $he thinks of $his child<<if _curBabies > 1>>ren<</if>>'s future.
- <<set $slaves[$i].trust -= 5, $slaves[$i].devotion -= 5>>
- <<elseif $slaves[$i].devotion > 20>>
- $He is @@.mediumorchid;devastated@@ by your sudden decision to sell $his child<<if _curBabies > 1>>ren<</if>> instead of having <<if _curBabies > 1>>them<<else>>it<</if>> cared for. $His mind struggles to comprehend @@.gold;such betrayal.@@
- <<set $slaves[$i].trust -= 10, $slaves[$i].devotion -= 10>>
- <<else>>
- For a moment, $he saw a glimmer of good in you; @@.mediumorchid;$he was clearly wrong.@@ $His mind struggles to comprehend @@.gold;why $he could ever even thing of trusting such a person.@@
- <<set $slaves[$i].trust -= 30, $slaves[$i].devotion -= 30>>
- <</if>>
- <<set $cash += _curBabies*(50+_babyCost)>>
+ <<= BirthDestinationText("Sold",$slaves[$i])>>
<</switch>>
<</if>>
<<seBirthPostpartum>>
diff --git a/src/uncategorized/seNicaeaCouncil.tw b/src/uncategorized/seNicaeaCouncil.tw
index 6d974a3e78a8da4215233685115bdc96b8388c2d..5fc4ea96d821834db75d0ac6a6c95f7ae09130e5 100644
--- a/src/uncategorized/seNicaeaCouncil.tw
+++ b/src/uncategorized/seNicaeaCouncil.tw
@@ -9,7 +9,7 @@
<<set $arcologies[0].FSChattelReligionistCreed = 1>>
The $nicaeaName is held in another arcology, without your involvement. Your abstention has weakened it. It authored a creed which the Council claims all good Chattel Religionists should subscribe. Most of it is uncontroversial, giving beliefs about slavery and faith that virtually all Chattel Religionists agree on. However, the new creed does purport to settle three major points of contention.
<br><br>
-First, it emphasizes
+First, it emphasizes
<<if $nicaeaFocus == "slaves">>
slaves throughout. The creed goes so far as to imply that slaveowners have a duty to slaves, which they fulfill by providing them the opportunity to enjoy the holy and pure state of being a sex slave.
<<else>>
diff --git a/src/uncategorized/seRaiding.tw b/src/uncategorized/seRaiding.tw
index 6a2febbb957ab1fc6912aeef9cdcda96ac1b11f5..283ac96b0046b59cd473a7ded492f5b85cbe8509 100644
--- a/src/uncategorized/seRaiding.tw
+++ b/src/uncategorized/seRaiding.tw
@@ -6,7 +6,7 @@ The leader of your $mercenariesTitle has contacted you from the world outside yo
<<if $SF.Toggle && $SF.Active >= 1 && (($SF.Squad.Satellite.lv >= 1 && $SF.Squad.Satellite.InOrbit > 0) || $SF.Squad.SpacePlane >= 1)>>
By having access to the use of $SF.Lower's
<<if $SF.Squad.Satellite.lv >= 1 && $SF.Squad.Satellite.InOrbit > 0>>
- satellite
+ satellite
<</if>>
<<if $SF.Squad.SpacePlane >= 1>>
space plane
diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index 80683b88d23fff967a2cc7267319a4ea1ee80d82..cd371dfe7721cc1e10987f84275eb5a76a689b11 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -550,18 +550,18 @@
* @author 000-250-006
*
* @param array _facListArr $args
- * Multidimensional temporary array
- * 0: The passage name for the facility's report
- * 1: The facility name capitalized (@see todo)
- * 2: max number of slaves allowed in facility - > 0 implies open
- * 3: number of slaves assigned to facility
- * 4: ID of the slave assigned to run the facility ("Boss")
- * 5: Text title of the Boss
+ * Multidimensional temporary array
+ * 0: The passage name for the facility's report
+ * 1: The facility name capitalized (@see todo)
+ * 2: max number of slaves allowed in facility - > 0 implies open
+ * 3: number of slaves assigned to facility
+ * 4: ID of the slave assigned to run the facility ("Boss")
+ * 5: Text title of the Boss
*
* @todo This is a proof of concept construct, if it works and cuts overhead, intended to create an object
- * for deeper use in multiple locations, including streamlining reports/facilities code to one widget
+ * for deeper use in multiple locations, including streamlining reports/facilities code to one widget
* @todo Figure out if this would be better as an object rather than an array for overhead
- * StoryInit also?
+ * StoryInit also?
* @todo Figure out why we're not using ndef/-1 for a bunch of these story variables. Leaky conditionals
* @todo Figure out why we're using variable space with capitalized facility names when we can parse it from true name
*/
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index 3ccb21eba0af4fcdc76bd63e93a1d609486ba367..d5e67c67e7256a1979f9756e16266ee1dd85ea48 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -8,72 +8,72 @@
"Recruiter Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.assignment != "recruit girls" && canWalk(s) && canSee(s) && canTalk(s)),
"HG Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.assignment != "be your Head Girl" && canWalk(s) && canHear(s) && canSee(s) && canTalk(s)),
"Head Girl Suite": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
- ($Flag == 0 && s.assignment != "be your Head Girl" && s.indentureRestrictions <= 0 && (s.breedingMark != 1 || $propOutcome == 0))
+ ($Flag == 0 && s.assignment != "be your Head Girl" && s.indentureRestrictions <= 0 && (s.breedingMark != 1 || $propOutcome == 0))
|| ($Flag != 0 && s.assignment == "live with your Head Girl"))),
"Subordinate Targeting": s => (s.devotion >= -20 && s.fuckdoll == 0 && $activeSlave.ID != s.ID && ($activeSlave.amp != 1 || s.amp != 1)),
"Spa": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
- ($Flag == 0 && s.assignment != "rest in the spa")
+ ($Flag == 0 && s.assignment != "rest in the spa")
|| ($Flag == 1 && s.assignment == "rest in the spa")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Attendant.ID))),
"Attendant Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && canWalk(s) && canHear(s)),
"Nursery": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (s.devotion > 20 || s.trust > 20) && (
- ($Flag == 0 && s.assignment != "work as a nanny")
+ ($Flag == 0 && s.assignment != "work as a nanny")
|| ($Flag == 1 && s.assignment == "work as a nanny")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Matron.ID))),
"Matron Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && canWalk(s) && canHear(s)),
"Brothel": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
- ($Flag == 0 && s.assignment != "work in the brothel")
+ ($Flag == 0 && s.assignment != "work in the brothel")
|| ($Flag == 1 && s.assignment == "work in the brothel")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Madam.ID))),
"Madam Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.intelligence+s.intelligenceImplant >= -50 && canWalk(s) && canSee(s) && canHear(s) && (s.breedingMark != 1 || $propOutcome == 0)),
"Club": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
- ($Flag == 0 && s.assignment != "serve in the club")
+ ($Flag == 0 && s.assignment != "serve in the club")
|| ($Flag == 1 && s.assignment == "serve in the club")
|| ($Flag != 0 && $Flag != 1 && s.ID == $DJ.ID))),
"DJ Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.intelligence+s.intelligenceImplant >= -50 && canTalk(s) && canHear(s) && canWalk(s) && (s.breedingMark != 1 || $propOutcome == 0)),
"Clinic": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
- ($Flag == 0 && s.assignment != "get treatment in the clinic")
+ ($Flag == 0 && s.assignment != "get treatment in the clinic")
|| ($Flag == 1 && s.assignment == "get treatment in the clinic")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Nurse.ID))),
"Nurse Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && canWalk(s) && canSee(s)),
"Schoolroom": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
- ($Flag == 0 && s.fetish != "mindbroken" && s.assignment != "learn in the schoolroom")
+ ($Flag == 0 && s.fetish != "mindbroken" && s.assignment != "learn in the schoolroom")
|| ($Flag == 1 && s.assignment == "learn in the schoolroom")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Schoolteacher.ID))),
"Schoolteacher Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && canTalk(s) && canHear(s) && canSee(s)),
"Dairy": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
- ($Flag == 0 && s.assignment != "work in the dairy")
+ ($Flag == 0 && s.assignment != "work in the dairy")
|| ($Flag == 1 && s.assignment == "work in the dairy")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Milkmaid.ID))),
"Milkmaid Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 20 && canWalk(s) && canSee(s) && canHear(s)),
"Farmyard": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && canWalk(s) && (
- ($Flag == 0 && s.assignment != "work as a farmhand")
+ ($Flag == 0 && s.assignment != "work as a farmhand")
|| ($Flag == 1 && s.assignment == "work as a farmhand")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Farmer.ID))),
"Farmer Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && canWalk(s) && canSee(s) && canHear(s)),
"Servants' Quarters": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
- ($Flag == 0 && s.assignment != "work as a servant")
+ ($Flag == 0 && s.assignment != "work as a servant")
|| ($Flag == 1 && s.assignment == "work as a servant")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Stewardess.ID))),
"Stewardess Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.intelligence+s.intelligenceImplant >= -50 && canWalk(s) && canSee(s) && canHear(s)),
"Master Suite": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
- ($Flag == 0 && s.assignment != "serve in the master suite")
+ ($Flag == 0 && s.assignment != "serve in the master suite")
|| ($Flag == 1 && s.assignment == "serve in the master suite")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Concubine.ID))),
"Concubine Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.amp != 1),
"Cellblock": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && s.fetish != "mindbroken" && (
- ($Flag == 0 && s.assignment != "be confined in the cellblock")
+ ($Flag == 0 && s.assignment != "be confined in the cellblock")
|| ($Flag == 1 && s.assignment == "be confined in the cellblock")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Wardeness.ID))),
"Wardeness Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && canWalk(s) && canSee(s) && canHear(s)),
"Arcade": s => (s.assignmentVisible == 1 && ($arcade >= $arcadeSlaves || $arcadeUpgradeFuckdolls == 1) && (
- ($Flag == 0 && s.assignment != "be confined in the arcade")
+ ($Flag == 0 && s.assignment != "be confined in the arcade")
|| ($Flag != 0 && s.assignment == "be confined in the arcade"))),
"Pit": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && (
- ($Flag == 0 && !$fighterIDs.includes(s.ID) && canWalk(s) && (s.assignment != "guard you") && (s.assignment != "work in the dairy" || $dairyRestraintsSetting < 2))
+ ($Flag == 0 && !$fighterIDs.includes(s.ID) && canWalk(s) && (s.assignment != "guard you") && (s.assignment != "work in the dairy" || $dairyRestraintsSetting < 2))
|| ($Flag != 0 && $fighterIDs.includes(s.ID)))),
"Coursing Association": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && (
- ($Flag == 0 && canWalk(s) && $Lurcher.ID != s.ID)
+ ($Flag == 0 && canWalk(s) && $Lurcher.ID != s.ID)
|| ($Flag != 0 && $Lurcher.ID == s.ID))),
"New Game Plus": s => (($Flag == 0 && s.assignment != "be imported") || ($Flag != 0 && s.assignment == "be imported")),
"Rules Slave Select": s => (($Flag == 0 && !ruleSlaveSelected(s, $currentRule)) || ($Flag != 0 && ruleSlaveSelected(s, $currentRule))),
@@ -94,24 +94,24 @@
<<if $useSlaveListInPageJSNavigation == 1>>
<<set _Count = _indexSlavesIdxs.length>>
/* Useful for finding weird combinations -- usages of this passage that don't yet generate the quick index.
- * <<print 'pass/count/indexed/flag::[' + _Pass + '/' + _Count + '/' + _indexed + '/' + $Flag + ']'>>
+ * <<print 'pass/count/indexed/flag::[' + _Pass + '/' + _Count + '/' + _indexed + '/' + $Flag + ']'>>
*/
<<if ((_Count > 1) && (_indexed == 0) && (((_Pass == 'Main') && (ndef $Flag) && (($useSlaveSummaryTabs == 0) || ($slaveAssignmentTab == "all"))) || ($Flag == 1)))>>
<<set _indexed = 1, _counter = 0, _buttons = [], _offset = -50>>
<<if (/Select/i.test(_Pass))>>
- <<set _offset = -25>>
+ <<set _offset = -25>>
<</if>>
<br />
<<set _tableCount = _tableCount || 0>>
<<set _tableCount++>>
/*
- * we want <button data-quick-index="<<= _tableCount>>"> ...
- */
+ * we want <button data-quick-index="<<= _tableCount>>"> ...
+ */
<<set _buttonAttributes = { 'data-quick-index': _tableCount }>>
<<htag _buttonAttributes 'button'>>Quick Index<</htag>>
/*
- * we want <div id="list_index3" class=" hidden">...
- */
+ * we want <div id="list_index3" class=" hidden">...
+ */
<<set _divAttributes = { id: 'list_index' + _tableCount, class: 'hidden'}>>
<<htag _divAttributes>>
<<for !_.isUndefined(_ssii = _indexSlavesIdxs.shift())>>
@@ -765,7 +765,7 @@ will
<<elseif (((_Slave.indentureRestrictions > 0) && ($dairyRestraintsSetting > 1)) || ((_Slave.indentureRestrictions > 1) && ($dairyRestraintsSetting > 0)) || (_Slave.breedingMark == 1 && $propOutcome == 1 && $dairyRestraintsSetting > 0) || (($dairyPregSetting > 0) && ((_Slave.bellyImplant != -1) || (_Slave.broodmother > 0))))>>
Dairy
<<elseif ((_Slave.lactation > 0) || (_Slave.balls > 0)) || (($dairyFeedersUpgrade == 1) && ($dairyFeedersSetting > 0) && ($dairySlimMaintainUpgrade == 0))>>
- [[Dairy|Assign][$assignTo = "Dairy", $i = _ssi]] /* $i = -1 tells Assign to use _Slave as-is */
+ [[Dairy|Assign][$assignTo = "Dairy", $i = _ssi]] /* $i = -1 tells Assign to use _Slave as-is */
<<else>>Dairy<</if>>
<<if _numFacilities-- > 1>>|<</if>>
<</if>>
diff --git a/src/uncategorized/spa.tw b/src/uncategorized/spa.tw
index 3e309654a8f032a509f021da8a8dee9cfd3bf5a5..721c6fdad57b374552dd787c38cde6fc16a35c52 100644
--- a/src/uncategorized/spa.tw
+++ b/src/uncategorized/spa.tw
@@ -140,7 +140,7 @@ $spaNameCaps
<</if>>
<<if $spaSlaves > 0>>
- | <<link "''Prise a slave out of $spaName''">>
+ | <<link "''Prise a slave out of $spaName''">>
<<replace #ComingGoing>>
<<spaAssignmentFilter>>
<<set $Flag = 1>>
diff --git a/src/uncategorized/universalRules.tw b/src/uncategorized/universalRules.tw
index 0e0783b6565eb450e2ba5a6598f1ff1aa3b1e23f..e2b41190e12170919b6fc47a1be18584cec2756b 100644
--- a/src/uncategorized/universalRules.tw
+++ b/src/uncategorized/universalRules.tw
@@ -138,44 +138,26 @@ Future society names for new slaves are currently @@.cyan;APPLIED.@@ [[Stop appl
//Will lessen medical costs, at the expense of scarring//
<</if>>
-<<if $DefaultBirthDestination === "anywhere">>
+<br><br>
+Upon birth slave babies will be sent to $DefaultBirthDestination.
+<br>You can decide on a new policy:
+ <<if $DefaultBirthDestination != "individually decided fates">>[[decide individually|Universal Rules][$DefaultBirthDestination = "individually decided fates",$universalRulesChildrenBecomeBreeders = 0]]|<</if>>
+ <<if $DefaultBirthDestination != "an orphanage">>[[slave orphanage|Universal Rules][$DefaultBirthDestination = "an orphanage",$universalRulesChildrenBecomeBreeders = 0]]<</if>>
+ <<if $DefaultBirthDestination != "a citizen school">>|[[citizen school|Universal Rules][$DefaultBirthDestination = "a citizen school",$universalRulesChildrenBecomeBreeders = 0]]<</if>>
+ <<if $DefaultBirthDestination != "a private school">>|[[private school|Universal Rules][$DefaultBirthDestination = "a private school",$universalRulesChildrenBecomeBreeders = 0]]<</if>>
+ <<if $Cash4Babies > 0>>
+ <<if $DefaultBirthDestination != "the market">>|[[market|Universal Rules][$DefaultBirthDestination = "the market",$universalRulesChildrenBecomeBreeders = 0]]<</if>>
+ <</if>>
<<if $arcologies[0].FSRepopulationFocus > 40>>
- <br><br>
- <<if $universalRulesChildrenBecomeBreeders == 1>>
- Unreserved children ''will be auto-enrolled'' in breeder schools to be raised into fine mothers and fathers.
- [[Decide children's fate on an individual level|Universal Rules][$universalRulesChildrenBecomeBreeders = 0]]
- <<else>>
- Unreserved children ''will not be auto-enrolled'' in breeder schools. Their fate will be decided at birth.
- [[All children with undecided fates will be given to breeder schools|Universal Rules][$universalRulesChildrenBecomeBreeders = 1]]
-
+ <br>
+ <<if $DefaultBirthDestination != "breeder schools">>
+ |[[breeder schools|Universal Rules][$DefaultBirthDestination = "breeder schools",$universalRulesChildrenBecomeBreeders = 1]]
//Will require a <<print cashFormat(50)>> donation per week once enrollment begins//
<</if>>
<</if>>
-<<else>>
- <br><br>
- //Option disabled as upon birth slave babies will be sent to $DefaultBirthDestination.//
-<</if>>
-
-<br><br>
-<<if $universalRulesChildrenBecomeBreeders < 1>>
- Upon birth slave babies
- <<if $DefaultBirthDestination === "anywhere">>
- can be sent anywhere. Pre-select their destination:
- [[Slave orphanage|Universal Rules][$DefaultBirthDestination = "an orphanage"]]
- | [[Citizen school|Universal Rules][$DefaultBirthDestination = "a citizen school"]]
- | [[Private school|Universal Rules][$DefaultBirthDestination = "a private school"]]
- <<if $Cash4Babies > 0>>
- [[market|Universal Rules][$DefaultBirthDestination = "the market"]]
- <</if>>
- <<else>>
- will be sent to $DefaultBirthDestination. [[Change your mind|Universal Rules][$DefaultBirthDestination = "anywhere"]]
- <</if>>
-<<else>>
- //Option disabled as unreserved children ''will be auto-enrolled'' in breeder schools.//
-<</if>>
-
-<</if>>
+ <br>//Children reserved for the incubator or any other pre-assigned fate e.g the elites or the nursery will not be affected//
+<</if>>/*Closes seePreg check*/
<br><br>
<<if $universalRulesImmobileSlavesMaintainMuscles == 1>>
Immobile slaves ''will maintain'' their muscles rather than allow themselves to become soft.
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index 11dd3d0419c8886f90e6a0140dacb4dfa3ac900d..3afa05280e2c8e98b7316d1b38dcab460792c93b 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -273,7 +273,7 @@
fertility.
<</if>>
<<elseif $activeSlave.geneticQuirks.fertility == 2>>
- $He is naturally
+ $He is naturally
<<if $activeSlave.ovaries == 1 || $activeSlave.mpreg == 1>>
fertile and prone to having twins.
<<else>>
diff --git a/src/utility/extendedFamilyWidgets.tw b/src/utility/extendedFamilyWidgets.tw
index 50458f06585562dc14ff44069ecf858a804471a0..03811128432841ebdc898c395b7e9c5d94b5bb54 100644
--- a/src/utility/extendedFamilyWidgets.tw
+++ b/src/utility/extendedFamilyWidgets.tw
@@ -704,7 +704,7 @@
<<if $activeSlave.cloneID == -1>>
your clone.
<<else>>
- a clone of $activeSlave.clone.
+ a clone of $activeSlave.clone.
<</if>>
<</if>>
@@ -881,7 +881,7 @@
<<if $activeSlave.cloneID == -1>>
yourself.
<<else>>
- $PC.clone.
+ $PC.clone.
<</if>>
<</if>>
*/
diff --git a/src/utility/saRulesWidgets.tw b/src/utility/saRulesWidgets.tw
index 047707e8a0a16fbd5ff0c2037b09c54e1f161b5a..38b5e07c4fc0ffb3d89d249e3e719f023071edcb 100644
--- a/src/utility/saRulesWidgets.tw
+++ b/src/utility/saRulesWidgets.tw
@@ -221,7 +221,7 @@ and
<</if>>
<</if>>
<</if>> /* close overactive balls block */
- <<if $slaves[$i].drugs == "super fertility drugs" && canImpreg($slaves[$i], $PC)>>
+ <<if $slaves[$i].drugs == "super fertility drugs" && canImpreg($slaves[$i], $PC)>>
<<if ($slaves[$i].devotion > 20) || ($slaves[$i].trust < -20)>>
$His reproductive system is in overdrive leading $him to come to you for insemination several times a day; $he @@.mediumaquamarine;desperately hopes@@ for the day your seed takes root in $his womb.
<<set $slaves[$i].trust += 1>>