diff --git a/Changelog.txt b/Changelog.txt
index 69b109ab5b1567b8666af51c1c0b39542d8f4edb..6ff99ba2446f6d5c7a1646faca7adeaffff2324c 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -2,6 +2,14 @@ Pregmod
0.10.7.1-2.8.x
+ 10/01/2019
+
+ 2
+ -amputation rework
+ -support for missing eyes
+ -added RA controls for birth and abortion tallies
+ -fixes and cleaning
+
9/03/2019
1
diff --git a/src/002-config/fc-version.js b/src/002-config/fc-version.js
index 70b8bee2c7aefe72059d4e1ede6e35c545ba50b2..cea16f8fdece6326b2596833364a0ead66652ef7 100644
--- a/src/002-config/fc-version.js
+++ b/src/002-config/fc-version.js
@@ -1,7 +1,7 @@
App.Version = {
base: "0.10.8",
pmod: "2.8.X",
- release: 1052,
+ release: 1053,
};
/* Use release as save version */
diff --git a/src/cheats/mod_EditSlaveCheat.tw b/src/cheats/mod_EditSlaveCheat.tw
index 8165b7bcb72d0e085d8d5421399624ab63571981..23bcd8588c8e6e5a1bb2a0296b9a962ea8c921db 100644
--- a/src/cheats/mod_EditSlaveCheat.tw
+++ b/src/cheats/mod_EditSlaveCheat.tw
@@ -906,6 +906,25 @@ Custom sclera color: <<textbox "$tempSlave.sclerae" $tempSlave.sclerae>>
<</if>>
<<textbox "$tempSlave.preg" $tempSlave.preg>>
+<br>
+''Pregnancy adaptation rating (5: prepubescent loli, 20: adult male, 50: adult female, 51+: practiced):''
+<<if $tempSlave.pregAdaptation < 10>>
+ Critically poor.
+<<elseif $tempSlave.pregAdaptation < 30>>
+ Very poor.
+<<elseif $tempSlave.pregAdaptation < 50>>
+ Poor.
+<<elseif $tempSlave.pregAdaptation < 60>>
+ Normal.
+<<elseif $tempSlave.pregAdaptation < 100>>
+ Well-adapted.
+<<elseif $tempSlave.pregAdaptation < 300>>
+ Astonishingly well-adapted.
+<<else>>
+ Unshakeable broodmother.
+<</if>>
+<<textbox "$tempSlave.pregAdaptation" $tempSlave.pregAdaptation>>
+
<br>
''Number of babies (0: none, 1 - 5):''
<<if $tempSlave.pregType == 1>>
diff --git a/src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw b/src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw
index 3c5613c98a9352b9d65cecbeef70631a9766e05a..8daeaa606527f4443f6ad2da8e1968faad9fbca0 100644
--- a/src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw
+++ b/src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw
@@ -29,6 +29,36 @@
<<elseif $tempSlave.lactation == 0 && $tempSlave.lactationDuration > 0>>
<<set $tempSlave.lactationDuration = 0>>
<</if>>
+<<set $tempSlave.pregAdaptation = Number($tempSlave.pregAdaptation) || 0>>
+<<if $tempSlave.pregAdaptation <= 0>>
+ <<if $tempSlave.genes === "XY">> /* copied from GenerateXYPregAdaptation */
+ <<if slave.physicalAge <= 6>>
+ <<set $tempSlave.pregAdaptation = 5>>
+ <<elseif $tempSlave.physicalAge <= 11>>
+ <<set $tempSlave.pregAdaptation = $tempSlave.physicalAge - 1>>
+ <<elseif $tempSlave.physicalAge <= 15>>
+ <<set $tempSlave.pregAdaptation = 2 * ($tempSlave.physicalAge - 12) + 12>>
+ <<else>>
+ <<set $tempSlave.pregAdaptation = 20>>
+ <</if>>
+ <<else>> /* copied from GenerateXXPregAdaptation */
+ <<if $tempSlave.physicalAge <= 6>>
+ <<set $tempSlave.pregAdaptation = 5>>
+ <<elseif $tempSlave.physicalAge <= 11>>
+ <<set $tempSlave.pregAdaptation = $tempSlave.physicalAge - 1>>
+ <<elseif $tempSlave.physicalAge <= 14>>
+ <<set $tempSlave.pregAdaptation = 4 * ($tempSlave.physicalAge - 12) + 14>>
+ <<elseif $tempSlave.physicalAge <= 15>>
+ <<set $tempSlave.pregAdaptation = 28>>
+ <<elseif $tempSlave.physicalAge <= 16>>
+ <<set $tempSlave.pregAdaptation = 34>>
+ <<elseif $tempSlave.physicalAge <= 17>>
+ <<set $tempSlave.pregAdaptation = 42>>
+ <<else>>
+ <<set $tempSlave.pregAdaptation = 50>>
+ <</if>>
+ <</if>>
+<</if>>
<<run SlaveDatatypeCleanup($tempSlave)>> /* will break cheated pregnancies if run before the above block of code */
You perform the dark rituals, pray to the dark gods, and sell your soul for the power to change and mold slaves to your will.
diff --git a/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw b/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
index 4cf757ee8aca34bef015f416aea65baccc3ac4b9..8ed3ce2ca00e9c057d29edbe15629f4828f6a0c0 100644
--- a/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
+++ b/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
@@ -35,6 +35,36 @@
<<elseif $tempSlave.preg > 0>>
<<set $tempSlave.pregKnown = 1>>
<</if>>
+<<set $tempSlave.pregAdaptation = Number($tempSlave.pregAdaptation) || 0>>
+<<if $tempSlave.pregAdaptation <= 0>>
+ <<if $tempSlave.genes === "XY">> /* copied from GenerateXYPregAdaptation */
+ <<if slave.physicalAge <= 6>>
+ <<set $tempSlave.pregAdaptation = 5>>
+ <<elseif $tempSlave.physicalAge <= 11>>
+ <<set $tempSlave.pregAdaptation = $tempSlave.physicalAge - 1>>
+ <<elseif $tempSlave.physicalAge <= 15>>
+ <<set $tempSlave.pregAdaptation = 2 * ($tempSlave.physicalAge - 12) + 12>>
+ <<else>>
+ <<set $tempSlave.pregAdaptation = 20>>
+ <</if>>
+ <<else>> /* copied from GenerateXXPregAdaptation */
+ <<if $tempSlave.physicalAge <= 6>>
+ <<set $tempSlave.pregAdaptation = 5>>
+ <<elseif $tempSlave.physicalAge <= 11>>
+ <<set $tempSlave.pregAdaptation = $tempSlave.physicalAge - 1>>
+ <<elseif $tempSlave.physicalAge <= 14>>
+ <<set $tempSlave.pregAdaptation = 4 * ($tempSlave.physicalAge - 12) + 14>>
+ <<elseif $tempSlave.physicalAge <= 15>>
+ <<set $tempSlave.pregAdaptation = 28>>
+ <<elseif $tempSlave.physicalAge <= 16>>
+ <<set $tempSlave.pregAdaptation = 34>>
+ <<elseif $tempSlave.physicalAge <= 17>>
+ <<set $tempSlave.pregAdaptation = 42>>
+ <<else>>
+ <<set $tempSlave.pregAdaptation = 50>>
+ <</if>>
+ <</if>>
+<</if>>
<<run SlaveDatatypeCleanup($tempSlave)>> /* will break cheated pregnancies if run before the above block of code */
/* Dependency Check */
diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw
index 535ad454374713b10eaf9c168b603c4361298c53..479521e3ac7f981b3fe558a8f3a635bf32a1df66 100644
--- a/src/cheats/mod_editSlaveCheatNew.tw
+++ b/src/cheats/mod_editSlaveCheatNew.tw
@@ -2812,6 +2812,25 @@
<br>
''Pregnancy Week (Literal number of weeks pregnant):''
<<textbox "$tempSlave.pregWeek" $tempSlave.pregWeek>>
+
+ <br>
+ ''Pregnancy adaptation rating (5: prepubescent loli, 20: adult male, 50: adult female, 51+: practiced):''
+ <<if $tempSlave.pregAdaptation < 10>>
+ @@.yellow;Critically poor@@.
+ <<elseif $tempSlave.pregAdaptation < 30>>
+ @@.yellow;Very poor@@.
+ <<elseif $tempSlave.pregAdaptation < 50>>
+ @@.yellow;Poor@@.
+ <<elseif $tempSlave.pregAdaptation < 60>>
+ @@.yellow;Normal@@.
+ <<elseif $tempSlave.pregAdaptation < 100>>
+ @@.yellow;Well-adapted@@.
+ <<elseif $tempSlave.pregAdaptation < 300>>
+ @@.yellow;Astonishingly well-adapted@@.
+ <<else>>
+ @@.yellow;Unshakeable broodmother@@.
+ <</if>>
+ <<textbox "$tempSlave.pregAdaptation" $tempSlave.pregAdaptation>>
<br>
''Number of babies (0: none, 1 - 5):''
diff --git a/src/endWeek/saChoosesOwnClothes.js b/src/endWeek/saChoosesOwnClothes.js
index f8309b269105844626a641c86ae2a220f88a6071..2e2b244b61f702c34bbff51f56ed9399a4efd1a0 100644
--- a/src/endWeek/saChoosesOwnClothes.js
+++ b/src/endWeek/saChoosesOwnClothes.js
@@ -993,6 +993,9 @@ window.saChoosesOwnClothes = (function() {
if (hasBothLegs(slave) && slave.heels === 1) {
shoes.push({text: `${He} finds ${he} can inexplicably walk if ${he} wears heels; a daily lesson for ${him}, as ${he} forgets shortly after leaving.`, shoes: jsEither(["boots", "extreme heels", "heels", "pumps"])});
}
+ if (V.arcologies[0].FSIntellectualDependencyLawBeauty === 1 || V.arcologies[0].FSStatuesqueGlorification > 0) {
+ shoes.push({text: `A fleeting thought of heels crosses ${his} mind, so ${he} grabs the nearest pair.`, shoes: jsEither(["extreme heels", "heels", "pumps"])});
+ }
shoes.push({text: `${He} vaguely remembers putting things on ${his} feet, so ${he} does.`, shoes: jsEither(["boots", "extreme heels", "flats", "heels", "pumps"])});
shoes.push({text: `${He} entered without shoes, and will leave the same.`, shoes: "none"});
} else if (slave.devotion <= 20) {
@@ -1002,7 +1005,9 @@ window.saChoosesOwnClothes = (function() {
shoes.push({text: `${He} angrily wears the heels ${he} needs to walk.`, shoes: "heels"});
}
} else {
- if (slave.fetishKnown === 1 && slave.fetish === "dom") {
+ if (V.arcologies[0].FSStatuesqueGlorification > 0) {
+ shoes.push({text: `${He} wears heels to boost ${his} height further.`, shoes: jsEither(["heels"])});
+ } else if (slave.fetishKnown === 1 && slave.fetish === "dom") {
shoes.push({text: `${He} wears boots to look like a proper dominant.`, shoes: "boots"});
} else if (slave.fetishKnown === 1 && slave.fetish === "sadist") {
shoes.push({text: `${He} wears boots, since ${he} thinks they make ${him} look dangerous.`, shoes: "boots"});
@@ -1010,16 +1015,26 @@ window.saChoosesOwnClothes = (function() {
shoes.push({text: `${He} wears painfully tall heels, since ${he} enjoys the twinge of pain with each step.`, shoes: "extreme heels"});
} else if (slave.heels === 1) {
shoes.push({text: `${He} wears the heels ${he} needs to walk.`, shoes: "heels"});
- } else if (slave.fetishKnown === 1 && slave.fetish === "pregnancy" && slave.bellyPreg >= 500) {
- shoes.push({text: `${He} goes barefoot to complement ${his} pregnancy.`, shoes: "none"});
- } else if (slave.fetishKnown === 1 && slave.fetish === "none") {
- shoes.push({text: `${He} wears comfortable flats, since ${he} doesn't have a fetish to show off.`, shoes: "flats"});
} else if (slave.actualAge < 13) {
+ if (V.arcologies[0].FSIntellectualDependencyLawBeauty === 1) {
+ shoes.push({text: `${He} wants to be a bimbo too so ${he} chooses a proper pair of heels.`, shoes: "heels"});
+ } else {
+ shoes.push({text: `${He} playfully puts on heels to be like all the other girls.`, shoes: "heels"});
+ }
+ if (slave.bellyPreg >= 1500) {
+ shoes.push({text: `${His} feet are a little sensetive, so ${he} decides to not wear shoes.`, shoes: "none"});
+ }
shoes.push({text: `${He} puts on boots so ${he} can stomp around.`, shoes: "boots"});
- shoes.push({text: `${He} playfully puts on heels to be like all the other girls.`, shoes: "heels"});
shoes.push({text: `${He} wears flats as they are comfortable and easy to take on and off.`, shoes: "flats"});
shoes.push({text: `Going barefoot is fun, so no shoes for ${him}.`, shoes: "none"});
+ } else if (V.arcologies[0].FSIntellectualDependencyLawBeauty === 1) {
+ shoes.push({text: `${He} slips on a pair of heels like a proper bimbo.`, shoes: "heels"});
} else {
+ if (slave.fetishKnown === 1 && slave.fetish === "pregnancy" && slave.bellyPreg >= 500) {
+ shoes.push({text: `${He} goes barefoot to complement ${his} pregnancy.`, shoes: "none"});
+ } else if (slave.fetishKnown === 1 && slave.fetish === "none") {
+ shoes.push({text: `${He} wears comfortable flats, since ${he} doesn't have a fetish to show off.`, shoes: "flats"});
+ }
shoes.push({text: `${He} wears heels to strut ${his} stuff.`, shoes: "heels"});
shoes.push({text: `${He} wears comfortable flats to take it easy.`, shoes: "flats"});
shoes.push({text: `${He} goes barefoot to show off ${his} toes.`, shoes: "none"});
diff --git a/src/facilities/nursery/nursery.tw b/src/facilities/nursery/nursery.tw
index 98a737cb994bed67b6508296a542cc0f1dbe6765..a4812991f55b128beb39c2c32e8395a3966ac6a3 100644
--- a/src/facilities/nursery/nursery.tw
+++ b/src/facilities/nursery/nursery.tw
@@ -73,7 +73,7 @@ $nurseryNameCaps
<</switch>>
<<if $Matron>>
- <<setLocalPronouns $Matron 2>>
+ <<setLocalPronouns $Matron>>
<</if>>
<<if _NL > 2>>
@@ -82,7 +82,7 @@ $nurseryNameCaps
$nurseryNameCaps is working steadily. Nannies are moving about, cleaning up and feeding hungry children.
<<set $nannyInfluence = 1>>
<<elseif $Matron>>
- $Matron.slaveName is alone in $nurseryName, and keeps the place clean and looks after the children $herself2.
+ $Matron.slaveName is alone in $nurseryName, and keeps the place clean and looks after the children $herself.
<<set $MatronInfluence = 1>>
<<elseif (_NL <= 0) && ($nurseryBabies <= 0)>>
$nurseryNameCaps is empty and quiet. <<link "Decommission the Nursery" "Main">><<set $nursery = 0, $nurseryNannies = 0, $nannyInfluence = 0, $nurseryDecoration = "standard", $cribs = [], $reservedChildrenNursery = 0>><<for _i = 0; _i < $slaves.length; _i++>><<run WombCleanGenericReserve($slaves[_i], "nursery", 9999)>><</for>><</link>>
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 78668674b66672644d4a36efac0430eebc628bf1..1b213ea05bf49ceff2e6d9ba3d8fa4c65d44a906 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -2739,7 +2739,7 @@ LORE: INTERVIEWS
<<case "Petite Admiration">>
''Petite Admiration'' is a future society model. It:
- <br> Approves of slaves shorter than lengthToEitherUnit(160).
+ <br> Approves of slaves shorter than <<= lengthToEitherUnit(160)>>.
<br> Improves value and beauty of sufficiently short slaves.
<br> Can be developed to accept relative shortness.
<br> Can be developed to radically affect goods seen in the slave market.
@@ -2748,7 +2748,7 @@ LORE: INTERVIEWS
<<case "Statuesque Glorification">>
''Statuesque Glorification'' is a future society model. It:
- <br> Approves of slaves taller than lengthToEitherUnit(170).
+ <br> Approves of slaves taller than <<= lengthToEitherUnit(170)>>.
<br> Improves value and beauty of sufficiently tall slaves.
<br> Can be developed to accept relative tallness.
<br> Can be developed to radically affect goods seen in the slave market.
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index 34afaac5ba197a9d3af86489429d0df1605c6c27..ff6c8811cf3812f3a84edaeaa7785553a2e4c6a9 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -2861,6 +2861,44 @@ window.DefaultRules = (function() {
r += `<br>${slave.slaveName}'s lower back has been tattooed.`;
}
}
+ if (rule.birthsTat !== undefined && (rule.birthsTat !== null)) {
+ if ((slave.birthsTat !== rule.birthsTat)) {
+ if (rule.birthsTat === "remove") {
+ if (slave.birthsTat > 0) {
+ cashX(forceNeg(V.modCost), "slaveMod", slave);
+ r += `<br>${slave.slaveName}'s birth tallies have been removed.`;
+ } else if (slave.birthsTat > -1) {
+ r += `<br>${slave.slaveName} will no longer be tattooed with each birth.`;
+ }
+ slave.birthsTat = -1;
+ } else if (slave.birthsTat > 0) {
+ r += `<br>${slave.slaveName} will not be tattooed with each birth.`;
+
+ } else {
+ r += `<br>${slave.slaveName} will be tattooed with each birth.`;
+ }
+ slave.birthsTat = rule.birthsTat;
+ }
+ }
+ if (rule.abortionTat !== undefined && (rule.abortionTat !== null)) {
+ if ((slave.abortionTat !== rule.abortionTat)) {
+ if (rule.abortionTat === "remove") {
+ if (slave.abortionTat > 0) {
+ cashX(forceNeg(V.modCost), "slaveMod", slave);
+ r += `<br>${slave.slaveName}'s abortion tallies have been removed.`;
+ } else if (slave.abortionTat > -1) {
+ r += `<br>${slave.slaveName} will no longer be tattooed with each abortion and miscarriage.`;
+ }
+ slave.abortionTat = -1;
+ } else if (slave.birthsTat > 0) {
+ r += `<br>${slave.slaveName} will not be tattooed with each abortion and miscarriage.`;
+
+ } else {
+ r += `<br>${slave.slaveName} will be tattooed with each abortion and miscarriage.`;
+ }
+ slave.abortionTat = rule.abortionTat;
+ }
+ }
if ((rule.autoBrand === 1)) {
if ((slave.health > -20)) {
if (slave.earShape === "none" && rule.brandTarget !== "ears") {
diff --git a/src/js/rulesAssistant.js b/src/js/rulesAssistant.js
index d8c3345d51bb0eebc514da42fca60a3eb981106f..ea427065e15edc54d05508e870147c967b3e02a3 100644
--- a/src/js/rulesAssistant.js
+++ b/src/js/rulesAssistant.js
@@ -321,6 +321,8 @@ App.RA.newRule = function() {
legsTat: null,
backTat: null,
stampTat: null,
+ birthsTat: null,
+ abortionTat: null,
brandDesign: null,
brandTarget: null,
scarTarget: null,
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index b3698d60ccfa5b0b0581c292991d4091da411f5f..b75351e07c51d67b03e8191e13b3d3b5fb7074c0 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -1610,6 +1610,9 @@ window.rulesAssistantOptions = (function() {
this.appendChild(new ButtockTattooList());
this.appendChild(new AnalTattooList());
this.appendChild(new LegTattooList());
+
+ this.appendChild(new BirthsTattooList());
+ this.appendChild(new AbortionTattooList());
}
}
@@ -3612,6 +3615,14 @@ window.rulesAssistantOptions = (function() {
items.push(["(FS) Chain Symbol", "a chain symbol"]);
}
+ if (V.arcologies[0].FSIntellectualDependency !== "unset") {
+ items.push(["(FS) Scores", "how much sex $he needs per day"]);
+ }
+
+ if (V.arcologies[0].FSSlaveProfessionalism !== "unset") {
+ items.push(["(FS) Scores", "$his average slave aptitude test scores"]);
+ }
+
if (V.arcologies[0].FSBodyPurist !== "unset") {
items.push(["(FS) Vitruvian Man", "a Vitruvian man"]);
}
@@ -3628,6 +3639,10 @@ window.rulesAssistantOptions = (function() {
items.push(["(FS) Sexual Skill Info", "$his sexual skills"]);
}
+ if (V.arcologies[0].FSPetiteAdmiration !== "unset" || V.arcologies[0].FSStatuesqueGlorification !== "unset") {
+ items.push(["(FS) Current height", "$his current height"]);
+ }
+
if (V.arcologies[0].FSSlimnessEnthusiast !== "unset") {
items.push(["(FS) Breast Ceiling", "$his absolute maximum breast size"]);
}
@@ -3797,6 +3812,32 @@ window.rulesAssistantOptions = (function() {
}
}
+ class BirthsTattooList extends RadioSelector {
+ constructor() {
+ const items = [
+ ["remove", "remove"],
+ ["enabled", 0],
+ ["disabled", -1],
+ ];
+ super("Tattoo a mark for each successful birth", items, true);
+ this.setValue(current_rule.set.birthsTat);
+ this.onchange = (value) => current_rule.set.birthsTat = value;
+ }
+ }
+
+ class AbortionTattooList extends RadioSelector {
+ constructor() {
+ const items = [
+ ["remove", "remove"],
+ ["enabled", 0],
+ ["disabled", -1],
+ ];
+ super("Tattoo a mark for each abortion", items, true);
+ this.setValue(current_rule.set.abortionTat);
+ this.onchange = (value) => current_rule.set.abortionTat = value;
+ }
+ }
+
class VisionSurgeryList extends RadioSelector {
constructor() {
const items = [
diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw
index e8f096d9674a6217bd0a48cb2894e606321d1f19..a23436210f127f122d95833ed7a0a3284ef4f588 100644
--- a/src/npc/acquisition.tw
+++ b/src/npc/acquisition.tw
@@ -549,12 +549,94 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.diet = "fattening">>
<<set $activeSlave.livingRules = "luxurious">>
<<set $activeSlave.assignment = "rest">>
+ <<case "IntellectualDependency">>
+ <<set $activeSlaveOneTimeMinAge = 14>>
+ <<set $activeSlaveOneTimeMaxAge = 18>>
+ <<set $oneTimeDisableDisability = 1>>
+ <<set $activeSlave = GenerateNewSlave()>>
+ <<set $activeSlave.devotion = random(45,65), $activeSlave.trust = random(-15,45)>>
+ <<set $activeSlave.face = random(30,100)>>
+ <<set $activeSlave.energy = 100>>
+ <<set $activeSlave.weight = random(-25,-15)>>
+ <<set $activeSlave.skill.oral = 0, $activeSlave.skill.anal = 0, $activeSlave.skill.vaginal = 0, $activeSlave.skill.entertainment = 0, $activeSlave.skill.whoring = 0>>
+ <<set $activeSlave.intelligence = -100>>
+ <<set $activeSlave.intelligenceImplant = 0>>
+ <<if $activeSlave.vagina == 0>><<set $activeSlave.vagina++>><</if>>
+ <<set $activeSlave.anus++>>
+ <<case "SlaveProfessionalism">>
+ <<set $activeSlaveOneTimeMinAge = 18>>
+ <<set $activeSlaveOneTimeMaxAge = 25>>
+ <<set $oneTimeDisableDisability = 1>>
+ <<set $activeSlave = GenerateNewSlave()>>
+ <<set $activeSlave.devotion = 100, $activeSlave.trust = 20, $activeSlave.health = 80>>
+ <<set $activeSlave.face = random(30,100)>>
+ <<set $activeSlave.energy = 10>>
+ <<set $activeSlave.weight = random(-15,5)>>
+ <<set $activeSlave.skill.oral = 100, $activeSlave.skill.anal = 100, $activeSlave.skill.vaginal = 100, $activeSlave.skill.entertainment = 100, $activeSlave.skill.whoring = 100>>
+ <<set $activeSlave.intelligence = 100>>
+ <<set $activeSlave.intelligenceImplant = 30>>
+ <<set $activeSlave.accent = 0>>
+ <<run SoftenBehavioralFlaw($activeSlave)>>
+ <<run SoftenSexualFlaw($activeSlave)>>
+ <<set $activeSlave.clothes = "a maid outfit", $activeSlave.collar = "pretty jewelry">>
+ <<set $activeSlave.assignment = "be your Head Girl", $HeadGirl = $activeSlave>>
+ <<case "PetiteAdmiration">>
+ <<set $activeSlaveOneTimeMinAge = 14>>
+ <<set $activeSlaveOneTimeMaxAge = 18>>
+ <<set $oneTimeDisableDisability = 1>>
+ <<set $activeSlave = GenerateNewSlave()>>
+ <<set $activeSlave.devotion = random(55,65), $activeSlave.trust = random(-15,15), $activeSlave.health = random(25,45)>>
+ <<set $activeSlave.face = random(15,100)>>
+ <<if $activeSlave.height >= 150>>
+ <<set $activeSlave.height = Math.trunc(Height.random($activeSlave, {limitMult: [-3, -1]}))>>
+ <<if $activeSlave.height >= 150>>
+ <<set $activeSlave.height = Math.trunc(Height.random($activeSlave, {limitMult: [-4, -2]}))>>
+ <<if $activeSlave.height >= 150>>
+ <<set $activeSlave.height = random(90,130)>>
+ <<set $activeSlave.geneticQuirks.dwarfism = 2>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <<set $activeSlave.skill.oral = random(35,65), $activeSlave.skill.anal = random(15,35)>>
+ <<if $activeSlave.vagina > -1>>
+ <<if $activeSlave.vagina == 0>><<set $activeSlave.vagina++>><</if>>
+ <<set $activeSlave.skill.vaginal = random(15,35)>>
+ <</if>>
+ <<set $activeSlave.clothes = "a succubus outfit", $activeSlave.legAccessory = "long stockings">>
+ <<set $activeSlave.assignment = "please you">>
+ <<case "StatuesqueGlorification">>
+ <<set $activeSlaveOneTimeMinAge = 18>>
+ <<set $activeSlaveOneTimeMaxAge = 30>>
+ <<set $one_time_age_overrides_pedo_mode = 1>>
+ <<set $oneTimeDisableDisability = 1>>
+ <<set $activeSlave = GenerateNewSlave()>>
+ <<set $activeSlave.devotion = random(55,65), $activeSlave.trust = random(-15,15), $activeSlave.health = random(25,45)>>
+ <<set $activeSlave.face = random(15,100)>>
+ <<set $activeSlave.weight = random(-5,5)>>
+ <<set $activeSlave.muscles = random(20,40)>>
+ <<if $activeSlave.height < 185>>
+ <<set $activeSlave.height = Math.trunc(Height.random($activeSlave, {limitMult: [1, 3]}))>>
+ <<if $activeSlave.height < 185>>
+ <<set $activeSlave.height = Math.trunc(Height.random($activeSlave, {limitMult: [2, 4]}))>>
+ <<if $activeSlave.height < 185>>
+ <<set $activeSlave.height = random(200,264)>>
+ <<set $activeSlave.geneticQuirks.gigantism = 2>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <<set $activeSlave.skill.oral = random(15,35), $activeSlave.skill.anal = random(15,35)>>
+ <<if $activeSlave.vagina > -1>>
+ <<if $activeSlave.vagina == 0>><<set $activeSlave.vagina++>><</if>>
+ <<set $activeSlave.skill.vaginal = random(15,35)>>
+ <</if>>
+ <<set $activeSlave.clothes = "slutty business attire", $activeSlave.shoes = "heels">>
+ <<set $activeSlave.assignment = "please you">>
<<default>>
ERROR: bad arcology type
<</switch>>
<<set $activeSlave.origin = "You acquired $him along with the arcology.", $activeSlave.career = "a slave">>
<<set $slaveCost = slaveCost($activeSlave)>>
- <<if ["AztecRevivalist", "ChineseRevivalist", "Eugenics"].includes($targetArcology.type)>>
+ <<if ["AztecRevivalist", "ChineseRevivalist", "Eugenics", "SlaveProfessionalism"].includes($targetArcology.type)>>
<<set _valueGiven += $slaveCost*4>>
<<else>>
<<set _valueGiven += $slaveCost>>
@@ -611,6 +693,14 @@ The previous owner seems to have left in something of a hurry.
They kept a personal stable of slaves for breeding purposes. Several of them are still here. They've been kept heavily pregnant, and are used to being used whilst so.
<<case "HedonisticDecadence">>
Their slaves were heavily pampered; free to lie about, fuck, and eat as much as they wanted. Several of them are still here, too lazy and spoiled to leave. They eagerly paw at you upon your arrival, begging for their bellies to be filled with food and for a good, hard fucking.
+ <<case "IntellectualDependency">>
+ They kept several vapid sluts, who are now desperately begging you for sex. It seems they've drained the life out of every toy left behind and have no idea how to recharge them.
+ <<case "SlaveProfessionalism">>
+ The only one of their slaves left has made it $his mission to have the penthouse ready for whomever should come to own it. $He greets you cordially, hands you a detailed summary of $his skills and information on your new arcology, and calmly awaits further orders.
+ <<case "PetiteAdmiration">>
+ They had quite the impish little harem. Several of them are still here and immediately swarm you as a welcome, eager to see someone taller again.
+ <<case "StatuesqueGlorification">>
+ They had quite the collection of towering slaves. Several of them are still here. They gaze down on you, evaluating how best to serve their new owner.
<<default>>
ERROR: bad arcology type
<</switch>>
diff --git a/src/npc/takeoverTarget.tw b/src/npc/takeoverTarget.tw
index 18381ef8758271829fd63e84c743b8ee14021d4f..3c5cc2cd7e10f3ad7e8d7fca13bd84700d9c57aa 100644
--- a/src/npc/takeoverTarget.tw
+++ b/src/npc/takeoverTarget.tw
@@ -35,7 +35,7 @@ Alternatively, arcologies are being built every day, and their owners' control i
<br>
//Recommended for new players.//
<hr style="margin:0">
-<<set _arcologyTypes = ["ArabianRevivalist", "AssetExpansionist", "AztecRevivalist", "BodyPurist", "ChattelReligionist", "ChineseRevivalist", "EdoRevivalist", "EgyptianRevivalist", "Eugenics", "HedonisticDecadence", "MaturityPreferentialist", "Multiculturalist", "Pastoralist", "Paternalist", "PhysicalIdealist", "Repopulationist", "RomanRevivalist", "SlimnessEnthusiast", "Subjugationist", "Supremacist", "TransformationFetishist", "YouthPreferentialist"]>>
+<<set _arcologyTypes = ["ArabianRevivalist", "AssetExpansionist", "AztecRevivalist", "BodyPurist", "ChattelReligionist", "ChineseRevivalist", "EdoRevivalist", "EgyptianRevivalist", "Eugenics", "HedonisticDecadence", "IntellectualDependency", "MaturityPreferentialist", "Multiculturalist", "Pastoralist", "Paternalist", "PetiteAdmiration", "PhysicalIdealist", "Repopulationist", "RomanRevivalist", "SlaveProfessionalism", "SlimnessEnthusiast", "StatuesqueGlorification", "Subjugationist", "Supremacist", "TransformationFetishist", "YouthPreferentialist"]>>
<<if $seeDicks != 0>><<set _arcologyTypes.push("GenderRadicalist")>><</if>>
<<if $seeDicks != 100>><<set _arcologyTypes.push("GenderFundamentalist")>><</if>>
<<if $seeExtreme != 0>><<set _arcologyTypes.push("Degradationist")>><</if>>
@@ -134,6 +134,10 @@ Alternatively, arcologies are being built every day, and their owners' control i
<<case "Repopulationist">><<set $targetArcology.name = setup.ArcologyNamesRepopulationist.random()>>
<<case "Eugenics">><<set $targetArcology.name = setup.ArcologyNamesEugenics.random()>>
<<case "HedonisticDecadence">><<set $targetArcology.name = setup.ArcologyNamesHedonisticDecadence.random()>>
+ <<case "IntellectualDependency">><<set $targetArcology.name = setup.ArcologyNamesIntellectualDependency.random()>>
+ <<case "SlaveProfessionalism">><<set $targetArcology.name = setup.ArcologyNamesSlaveProfessionalism.random()>>
+ <<case "PetiteAdmiration">><<set $targetArcology.name = setup.ArcologyNamesPetiteAdmiration.random()>>
+ <<case "StatuesqueGlorification">><<set $targetArcology.name = setup.ArcologyNamesStatuesqueGlorification.random()>>
<<default>><<set $targetArcology.name = "Arcology X-4">>
<</switch>>
<<set $targetArcology.FSProgress = either(10,30,50)>>
@@ -216,6 +220,10 @@ Alternatively, arcologies are being built every day, and their owners' control i
<<case "Repopulationist">>@@.orange;Repopulationism,@@ the belief that the key to humanity's survival is a child in every fertile womb.
<<case "Eugenics">>@@.orange;Eugenics,@@ the belief that the world's failings were caused by rampant breeding of the inferior, and as such, only society's best should reproduce.
<<case "HedonisticDecadence">>@@.orange;Decadent Hedonism,@@ a movement to embody life's pleasures, particularly eating and sex.
+ <<case "IntellectualDependency">>@@.orange;Intellectual Dependency,@@ an appetite for horny, stupid slaves based on bimbo fetishism.
+ <<case "SlaveProfessionalism">>@@.orange;Slave Professionalism,@@ a strain of slavery that seeks smart, skilled, elegant slaves to hone to perfection.
+ <<case "PetiteAdmiration">>@@.orange;Petite Admiration,@@ which prefers its slaves to stand heads and shoulders shorter than their masters.
+ <<case "StatuesqueGlorification">>@@.orange;Statuesque Glorification,@@ an obsession, both sexual and otherwise, over height.
<<default>>@@.orange;Multiculturalism,@@ a celebration of the total liberty that was the original purpose of the Free Cities.
<</switch>>
<hr style="margin:0">
diff --git a/src/pregmod/incubatorReport.tw b/src/pregmod/incubatorReport.tw
index d536d42385496c2c12f588a6a975d18c026da744..53a63fb7ac9d90f2bbc8a0748a82de706caf4ca6 100644
--- a/src/pregmod/incubatorReport.tw
+++ b/src/pregmod/incubatorReport.tw
@@ -233,8 +233,7 @@
<<if $incubatorUpgradeReproduction == 1>>
<br>
- <<set _rearQuirk = $tanks[_inc].geneticQuirks.rearLipedema == 2 ? 2 : 0>>
- <<set _rearQuirkDivider = _rearQuirk == 0 ? 1 : _rearQuirk>>
+ <<set _rearQuirk = $tanks[_inc].geneticQuirks.rearLipedema == 2 ? 2 : 1>>
<<if $incubatorReproductionSetting == 2>>
$His developing body is being flooded with hormones.
<<if $incubatorWeightSetting == 1>>
@@ -261,7 +260,7 @@
The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@
<<set $tanks[_inc].hips += 2>>
<</if>>
- <<if $tanks[_inc].butt < 12*_rearQuirk && random(1,100) > 30/_rearQuirkDivider>>
+ <<if $tanks[_inc].butt < 12*_rearQuirk && random(1,100) > 30/_rearQuirk>>
The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@
<<set $tanks[_inc].butt += 4>>
<</if>>
@@ -274,7 +273,7 @@
The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@
<<set $tanks[_inc].hips++>>
<</if>>
- <<if $tanks[_inc].butt < 12*_rearQuirk && random(1,100) > 50/_rearQuirkDivider>>
+ <<if $tanks[_inc].butt < 12*_rearQuirk && random(1,100) > 50/_rearQuirk>>
The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@
<<set $tanks[_inc].butt += 3>>
<</if>>
@@ -287,7 +286,7 @@
The excess estrogen-laced growth hormones @@.green;causes $his hips to widen for childbirth.@@
<<set $tanks[_inc].hips++>>
<</if>>
- <<if $tanks[_inc].butt < 12*_rearQuirk && random(1,100) > 50/_rearQuirkDivider>>
+ <<if $tanks[_inc].butt < 12*_rearQuirk && random(1,100) > 50/_rearQuirk>>
The excess estrogen-laced growth hormones @@.green;cause $his rear grow fatter.@@
<<set $tanks[_inc].butt += 2>>
<</if>>
@@ -300,7 +299,7 @@
The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@
<<set $tanks[_inc].hips++>>
<</if>>
- <<if $tanks[_inc].butt < 12*_rearQuirk && random(1,100) > 60/_rearQuirkDivider>>
+ <<if $tanks[_inc].butt < 12*_rearQuirk && random(1,100) > 60/_rearQuirk>>
The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@
<<set $tanks[_inc].butt++>>
<</if>>
@@ -313,7 +312,7 @@
The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@
<<set $tanks[_inc].hips++>>
<</if>>
- <<if $tanks[_inc].butt < 12*_rearQuirk && random(1,100) > 70/_rearQuirkDivider>>
+ <<if $tanks[_inc].butt < 12*_rearQuirk && random(1,100) > 70/_rearQuirk>>
The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@
<<set $tanks[_inc].butt++>>
<</if>>
@@ -397,7 +396,7 @@
The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@
<<set $tanks[_inc].hips++>>
<</if>>
- <<if $tanks[_inc].butt < 8*_rearQuirk && random(1,100) > 50/_rearQuirkDivider>>
+ <<if $tanks[_inc].butt < 8*_rearQuirk && random(1,100) > 50/_rearQuirk>>
The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@
<<set $tanks[_inc].butt += 3>>
<</if>>
@@ -410,7 +409,7 @@
The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@
<<set $tanks[_inc].hips++>>
<</if>>
- <<if $tanks[_inc].butt < 8*_rearQuirk && random(1,100) > 50/_rearQuirkDivider>>
+ <<if $tanks[_inc].butt < 8*_rearQuirk && random(1,100) > 50/_rearQuirk>>
The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@
<<set $tanks[_inc].butt++>>
<</if>>
@@ -423,7 +422,7 @@
The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@
<<set $tanks[_inc].hips++>>
<</if>>
- <<if $tanks[_inc].butt < 8*_rearQuirk && random(1,100) > 60/_rearQuirkDivider>>
+ <<if $tanks[_inc].butt < 8*_rearQuirk && random(1,100) > 60/_rearQuirk>>
The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@
<<set $tanks[_inc].butt++>>
<</if>>
@@ -436,7 +435,7 @@
The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@
<<set $tanks[_inc].hips++>>
<</if>>
- <<if $tanks[_inc].butt < 8*_rearQuirk && random(1,100) > 70/_rearQuirkDivider>>
+ <<if $tanks[_inc].butt < 8*_rearQuirk && random(1,100) > 70/_rearQuirk>>
The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@
<<set $tanks[_inc].butt++>>
<</if>>
@@ -449,7 +448,7 @@
The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@
<<set $tanks[_inc].hips++>>
<</if>>
- <<if $tanks[_inc].butt < 8*_rearQuirk && random(1,100) > 80/_rearQuirkDivider>>
+ <<if $tanks[_inc].butt < 8*_rearQuirk && random(1,100) > 80/_rearQuirk>>
The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@
<<set $tanks[_inc].butt++>>
<</if>>
@@ -533,7 +532,7 @@
The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@
<<set $tanks[_inc].hips += 2>>
<</if>>
- <<if $tanks[_inc].butt < 6*_rearQuirk && random(1,100) > 70/_rearQuirkDivider>>
+ <<if $tanks[_inc].butt < 6*_rearQuirk && random(1,100) > 70/_rearQuirk>>
The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@
<<set $tanks[_inc].butt += 2>>
<</if>>
@@ -546,7 +545,7 @@
The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@
<<set $tanks[_inc].hips++>>
<</if>>
- <<if $tanks[_inc].butt < 6*_rearQuirk && random(1,100) > 70/_rearQuirkDivider>>
+ <<if $tanks[_inc].butt < 6*_rearQuirk && random(1,100) > 70/_rearQuirk>>
The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@
<<set $tanks[_inc].butt++>>
<</if>>
@@ -559,7 +558,7 @@
The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@
<<set $tanks[_inc].hips++>>
<</if>>
- <<if $tanks[_inc].butt < 6*_rearQuirk && random(1,100) > 90/_rearQuirkDivider>>
+ <<if $tanks[_inc].butt < 6*_rearQuirk && random(1,100) > 90/_rearQuirk>>
The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@
<<set $tanks[_inc].butt++>>
<</if>>
@@ -572,7 +571,7 @@
The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@
<<set $tanks[_inc].hips++>>
<</if>>
- <<if $tanks[_inc].butt < 6*_rearQuirk && random(1,100) > 90/_rearQuirkDivider>>
+ <<if $tanks[_inc].butt < 6*_rearQuirk && random(1,100) > 90/_rearQuirk>>
The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@
<<set $tanks[_inc].butt++>>
<</if>>
@@ -585,7 +584,7 @@
The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@
<<set $tanks[_inc].hips++>>
<</if>>
- <<if $tanks[_inc].butt < 6*_rearQuirk && random(1,100) > 90/_rearQuirkDivider>>
+ <<if $tanks[_inc].butt < 6*_rearQuirk && random(1,100) > 90/_rearQuirk>>
The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@
<<set $tanks[_inc].butt++>>
<</if>>
@@ -663,7 +662,7 @@
The added estrogen @@.green;causes $his hips to widen.@@
<<set $tanks[_inc].hips++>>
<</if>>
- <<if $tanks[_inc].butt < 5*_rearQuirk && random(1,100) > 80/_rearQuirkDivider>>
+ <<if $tanks[_inc].butt < 5*_rearQuirk && random(1,100) > 80/_rearQuirk>>
The added estrogen @@.green;causes $his butt to grow.@@
<<set $tanks[_inc].butt++>>
<</if>>
diff --git a/src/pregmod/widgets/pregmodBirthWidgets.tw b/src/pregmod/widgets/pregmodBirthWidgets.tw
index 05126d62716d708e1afcc4a2f9487b50aff0a7a5..5c4efc6043786f1179da6aac9d3a0751f3afe8c6 100644
--- a/src/pregmod/widgets/pregmodBirthWidgets.tw
+++ b/src/pregmod/widgets/pregmodBirthWidgets.tw
@@ -1351,7 +1351,7 @@
<<ClothingBirth>>
She cums across $his face before helping $him to $his rear and handing $him the newborn child.
<<else>>
- While taking a citizen's dick in $his ass, $slaves[$i].slaveName's body begins to birth another of $his brood. $He desperately struggles to disengage but he shoves $him onto $his bloated womb and mounts $him. Quickly $he spreads $his legs apart and begins pushing out $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>. $He can't hide what's happening between $his legs, <<if $slaves[$i].fetish == "humiliation">>but that only makes it more exciting<<else>>so $he bears with it<</if>>. He came strongly thanks to $him and gives $him a slap on the ass as $he collapses onto $his bloated womb. Once $he recovers enough to collect $his child, $he awaits for it to be sent off.
+ While taking a citizen's dick in $his ass, $slaves[$i].slaveName's body begins to birth another of $his brood. $He desperately struggles to disengage but he shoves $him onto $his bloated womb and mounts $him. Quickly $he spreads $his legs apart and begins pushing out $his baby. $He can't hide what's happening between $his legs, <<if $slaves[$i].fetish == "humiliation">>but that only makes it more exciting<<else>>so $he bears with it<</if>>. He came strongly thanks to $him and gives $him a slap on the ass as $he collapses onto $his bloated womb. Once $he recovers enough to collect $his child, $he awaits for it to be sent off.
<<set $humiliation = 1>>
<</if>>
<</if>>
@@ -1372,7 +1372,7 @@
<</if>>
<<else>>
<<if (_pbw > 80)>>
- While riding a citizen's dick, $slaves[$i].slaveName's body begins to birth another of $his brood. $He desperately tries to disengage but he shoves $him onto $his bloated womb and mounts $him. He thoroughly enjoys $his contracting cunt before pulling out and standing over $him, jacking off. Quickly $he spreads $his legs apart and begins pushing out $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>. $He can't hide what's happening between $his legs, <<if $slaves[$i].fetish == "humiliation">>but that only makes it more exciting<<else>>so $he bears with it<</if>>. He comes over $his exhausted body and moves on leaving $him to recover and collect $his child to be sent off.
+ While riding a citizen's dick, $slaves[$i].slaveName's body begins to birth another of $his brood. $He desperately tries to disengage but he shoves $him onto $his bloated womb and mounts $him. He thoroughly enjoys $his contracting cunt before pulling out and standing over $him, jacking off. Quickly $he spreads $his legs apart and begins pushing out $his baby. $He can't hide what's happening between $his legs, <<if $slaves[$i].fetish == "humiliation">>but that only makes it more exciting<<else>>so $he bears with it<</if>>. He comes over $his exhausted body and moves on leaving $him to recover and collect $his child to be sent off.
<<set $humiliation = 1>>
<<elseif (_pbw > 60)>>
While sucking a citizen's dick, $slaves[$i].slaveName's body begins to birth another of $his brood. $He desperately tries to disengage but he grabs $his head and slams $him back into his crotch.
diff --git a/src/uncategorized/futureSociety.tw b/src/uncategorized/futureSociety.tw
index 2405f3bf14b0e305bcc79348e023bfb42ae98959..c587da32ec865b1a73d9d474c52c0edde8f44709 100644
--- a/src/uncategorized/futureSociety.tw
+++ b/src/uncategorized/futureSociety.tw
@@ -791,7 +791,6 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</if>>
-/*
<<if $arcologies[0].FSSlaveProfessionalism == "unset">>
<<if $arcologies[0].FSIntellectualDependency != "unset">>
<br>''You are pursuing'' intellectual dependency, a belief that slaves should be airheaded, horny and fully dependent on their owners.
@@ -807,7 +806,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<<if $FSCredits > 0>>
<br>''''[[Intellectual Dependency|Future Society][$arcologies[0].FSIntellectualDependency = 4, $FSCredits -= 1]]: a belief that slaves should be airheaded, horny and fully dependent on their owners.
<<else>>
- //''Intellectual Dependency'': a belief that slaves should be airheaded, horny and fully dependent on their owners.//
+ /*//''Intellectual Dependency'': a belief that slaves should be airheaded, horny and fully dependent on their owners.//*/
<</if>>
<</if>>
<</if>>
@@ -827,11 +826,10 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<<if $FSCredits > 0>>
<br>''''[[Slave Professionalism|Future Society][$arcologies[0].FSSlaveProfessionalism = 4, $FSCredits -= 1]]: increased interest in smart, refined, altogether perfect slaves.
<<else>>
- //''Slave Professionalism'': increased interest in smart, refined, altogether perfect slaves.//
+ /*//''Slave Professionalism'': increased interest in smart, refined, altogether perfect slaves.//*/
<</if>>
<</if>>
<</if>>
-*/
<<if $seeDicks != 0 || $makeDicks == 1>>
<<if $arcologies[0].FSGenderFundamentalist == "unset">>
@@ -995,7 +993,6 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</if>>
-/*
<<if $arcologies[0].FSStatuesqueGlorification == "unset">>
<<if $arcologies[0].FSPetiteAdmiration != "unset">>
<br>''You are pursuing'' an accentuated societal preference for short slaves.
@@ -1011,7 +1008,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<<if $FSCredits > 0>>
<br>''''[[Petite Admiration|Future Society][$arcologies[0].FSPetiteAdmiration = 4, $FSCredits -= 1]]: increased interest in short slaves.
<<else>>
- //''Petite Admiration'': increased interest in short slaves.//
+ /*//''Petite Admiration'': increased interest in short slaves.//*/
<</if>>
<</if>>
<</if>>
@@ -1031,11 +1028,10 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<<if $FSCredits > 0>>
<br>''''[[Statuesque Glorification|Future Society][$arcologies[0].FSStatuesqueGlorification = 4, $FSCredits -= 1]]: societal fixation on tallness.<br>
<<else>>
- //''Statuesque Glorification'': societal fixation on tallness.//
+ /*//''Statuesque Glorification'': societal fixation on tallness.//*/
<</if>>
<</if>>
<</if>>
-*/
<<if $arcologies[0].FSAssetExpansionist == "unset">>
<<if $arcologies[0].FSSlimnessEnthusiast != "unset">>
diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw
index fe31ca60e7a94e9ca731f1687460a25600d4f84e..b6e2c24f28a5724ecf6df8573349deb3be942190 100644
--- a/src/uncategorized/manageArcology.tw
+++ b/src/uncategorized/manageArcology.tw
@@ -35,7 +35,14 @@ __Construction__
<br>
<<if $arcologyUpgrade.drones != 1>>
- //The first major upgrade needed is the installation of a drone security system so higher-class citizens will feel safe and protected should they choose to immigrate. This upgrade will cost <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>>.// [[Install drone security system|Manage Arcology][cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "capEx"), $arcologyUpgrade.drones = 1, $secBots.active = 1, $secBots.troops = 30, $secBots.maxTroops = 30, $PC.engineering += 1]]
+ //The first major upgrade needed is the installation of a drone security system so higher-class citizens will feel safe and protected should they choose to immigrate. This upgrade will cost <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>>.//
+ <<link "Install drone security system" "Manage Arcology">>
+ <<run cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "capEx")>>
+ <<set $arcologyUpgrade.drones = 1, $PC.engineering += 1>>
+ <<if $secExpEnabled == 1>>
+ <<set $secBots.active = 1, $secBots.troops = 30, $secBots.maxTroops = 30>>
+ <</if>>
+ <</link>>
<<elseif $arcologyUpgrade.hydro != 1>>
//The next major upgrade needed is the installation of a better water reclamation system so your residents will have access to cheaper water and hydroponically grown food. This upgrade will cost <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology))>>.// [[Upgrade water reclamation system|Manage Arcology][cashX(forceNeg(Math.trunc(10000*$upgradeMultiplierArcology)), "capEx"), $arcologyUpgrade.hydro = 1, $PC.engineering += 1]]
<<elseif $arcologyUpgrade.apron != 1>>
diff --git a/src/uncategorized/managePenthouse.tw b/src/uncategorized/managePenthouse.tw
index be81a69cab1e1a6d6ca7ad38db9ce6a067452449..0992fb9cbe46d391505aa97bc8f07a5b9a6225fa 100644
--- a/src/uncategorized/managePenthouse.tw
+++ b/src/uncategorized/managePenthouse.tw
@@ -81,12 +81,14 @@ __Penthouse Facilities__
<<if $familyTesting == 1 && $seePreg != 0>>
<br>
+ <<if $cheatMode == 1>>
<<if $nursery == 0>>
[[Build a nursery to raise children from birth|Manage Penthouse][cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "capEx"), $nursery = 5, $nurseryNannies = 1, $PC.engineering += 1]]
//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>>//
<<else>>
The penthouse has a nursery built where infants can be brought up.
<</if>>
+ <</if>>
<</if>>
<br>
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index 112ad9f88d794ec5286123ad27f1a4f8f0ddf088..f8bf6c6c505a56548ce118561bc11d1339b03c55 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -1374,8 +1374,8 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<= FutureSocieties.Change("Eugenics", 2)>>
<</if>>
<</replace>>
+ <<set WombFlush($activeSlave)>>
<<set $activeSlave.preg = -3>>
- <<set $activeSlave.pregType = 0>>
<<set $activeSlave.pregWeek = -4>>
<<set $activeSlave.pregKnown = 0>>
<<run SetBellySize($activeSlave)>>
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index cba358bfad0b0215e208be4865ee624161c35bb6..e7571546a92e6b32a535852ab7653a9d4d17f076 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -381,7 +381,6 @@
<<set $activeSlave.devotion = random(25,45)>>
<<set $activeSlave.trust = random(-15,15)>>
<<set $activeSlave.ageImplant = 0>>
-<<run removeLimbs($activeSlave, "all")>>
<<if $activeSlave.career != "a Futanari Sister">><<set $activeSlave.career = "a slave">><</if>>
<<set $activeSlave.relationship = 0>>
<<set $activeSlave.relationshipTarget = 0>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 39cda439254708982ca7426d440c73bd6deb334a..d34d7715c04278f825838306232409d0e82885a7 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -5509,7 +5509,7 @@
<<set $failedElite += 5+$slaves[$i].pregType>>
<</if>>
<</if>>
- <<if $slaves[$i].balls > 0 && $slaves[$i].vasectomy == 0>>
+ <<if $slaves[$i].balls > 0 && $slaves[$i].pubertyXY == 1 && $slaves[$i].vasectomy == 0>>
Society @@.red;disapproves@@ of $his working testicles.
<<= FutureSocieties.ChangePorn("Eugenics", -$slaves[$i].balls)>>
<<elseif $slaves[$i].dick > 0 && $slaves[$i].balls > 0 && $slaves[$i].vasectomy == 1>>