From dbe96776b12c3981f5c65775e5c87a921f98a341 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sat, 28 Sep 2019 14:00:29 -0400
Subject: [PATCH] FS work
---
src/npc/acquisition.tw | 92 +++++++++++++++++++++-
src/npc/takeoverTarget.tw | 10 ++-
src/pregmod/widgets/pregmodBirthWidgets.tw | 4 +-
src/uncategorized/futureSociety.tw | 12 +--
4 files changed, 106 insertions(+), 12 deletions(-)
diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw
index e8f096d9674..a23436210f1 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 18381ef8758..3c5cc2cd7e1 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/widgets/pregmodBirthWidgets.tw b/src/pregmod/widgets/pregmodBirthWidgets.tw
index 05126d62716..5c4efc60437 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 2405f3bf14b..c587da32ec8 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">>
--
GitLab