diff --git a/Changelog.txt b/Changelog.txt index e05f052f6d78d31f49c678848d1a8e876dc34d51..c864fabf5890497caca59103ccdc7299dba09f47 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -4,6 +4,8 @@ Pregmod 0 -scar system added + -partial amputation and amp rework underway + -four wip FSs now neighbor ready -player slave impregnation bug fixed -fixes and cleaning diff --git a/src/js/generateMarketSlave.js b/src/js/generateMarketSlave.js index fbc3583c05bd3a65bb12eaea9d70b03b69287f5d..c21587c9800a9fdbe96e54593302bb0d64ba448f 100644 --- a/src/js/generateMarketSlave.js +++ b/src/js/generateMarketSlave.js @@ -643,6 +643,44 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { } } } + if (V.arcologies[market].FSIntellectualDependency > 20) { + r += `The only thing that rivals their idiocy is their uncontrollable libido. `; + V.activeSlave.slaveName = setup.bimboSlaveNames.random(); + if (V.activeSlave.intelligence > -50) { + V.activeSlave.intelligence = Intelligence.random({limitIntelligence: [-100, -50]}); + } + V.intelligenceImplant = 0; + if (V.activeSlave.energy < 80) { + V.activeSlave.energy = jsRandom(80, 100); + } + } else if (V.arcologies[market].FSSlaveProfessionalism > 20) { + r += `They possess brilliant minds and expert training; a slave that truly knows their role in life. `; + if (V.activeSlave.intelligence <= 50) { + V.activeSlave.intelligence = Intelligence.random({limitIntelligence: [51, 100]}); + } + V.intelligenceImplant = 30; + if (V.activeSlave.energy > 40) { + V.activeSlave.energy -= 30; + } + if (V.activeSlave.vagina > 0) { + V.activeSlave.skill.vaginal += Math.clamp(V.arcologies[market].prosperity/2, 20, 100); + V.activeSlave.skill.vaginal = Math.clamp(V.activeSlave.skill.vaginal, 50, 100); + } + if (V.activeSlave.anus > 0) { + V.activeSlave.skill.anal += Math.clamp(V.arcologies[market].prosperity/2, 20, 100); + V.activeSlave.skill.anal = Math.clamp(V.activeSlave.skill.anal, 50, 100); + } + V.activeSlave.skill.oral += Math.clamp(V.arcologies[market].prosperity/2, 20, 100); + V.activeSlave.skill.oral = Math.clamp(V.activeSlave.skill.oral, 50, 100); + V.activeSlave.skill.entertainment += Math.clamp(V.arcologies[market].prosperity/2, 20, 100); + V.activeSlave.skill.entertainment = Math.clamp(V.activeSlave.skill.entertainment, 50, 100); + V.activeSlave.skill.whoring += Math.clamp(V.arcologies[market].prosperity/2, 20, 100); + V.activeSlave.skill.whoring = Math.clamp(V.activeSlave.skill.whoring, 50, 100); + V.activeSlave.sexualFlaw = "none"; + V.activeSlave.behavioralFlaw = "none"; + V.activeSlave.fetishKnown = 1; + V.activeSlave.attrKnown = 1; + } if (V.arcologies[market].FSBodyPurist > 80) { r += `They're quite pristine, free of any genomic damage or addictions regardless of any transformations they've had. `; V.activeSlave.chem = 0; @@ -708,6 +746,31 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { } } } + if (V.arcologies[market].FSPetiteAdmiration > 20) { + r += `They tend to be short, some far more than others. `; + if (V.activeSlave.height >= 160) { + V.activeSlave.height = Math.trunc(Height.random(V.activeSlave, {limitMult: [-2, 0]})); + if (V.activeSlave.height >= 160) { + V.activeSlave.height = Math.trunc(Height.random(V.activeSlave, {limitMult: [-3, -1]})); + if (V.activeSlave.height >= 160) { + V.activeSlave.height = jsRandom(90, 130); + V.activeSlave.geneticQuirks.dwarfism = 2; + } + } + } + } else if (V.arcologies[market].FSStatuesqueGlorification > 20) { + r += `They tend to be tall, if not unbelievably so. `; + if (V.activeSlave.height < 170) { + V.activeSlave.height = Math.trunc(Height.random(V.activeSlave, {limitMult: [0, 2]})); + if (V.activeSlave.height < 170) { + V.activeSlave.height = Math.trunc(Height.random(V.activeSlave, {limitMult: [1, 3]})); + if (V.activeSlave.height < 170) { + V.activeSlave.height = jsRandom(200, 264); + V.activeSlave.geneticQuirks.gigantism = 2; + } + } + } + } if (V.arcologies[market].FSSlimnessEnthusiast > 20) { r += `They're never overweight, and are often quite lithe. `; if (V.activeSlave.boobs > 400) { @@ -886,9 +949,11 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { } } else if (V.arcologies[market].FSChineseRevivalist > 20) { r += `They've all passed through a thorough and uncompromising educational system for slaves. `; - V.activeSlave.intelligenceImplant = 10; - if (V.activeSlave.intelligence < 60) { - V.activeSlave.intelligence += jsRandom(0, 20); + V.activeSlave.intelligenceImplant = 30; + if (V.arcologies[market].FSIntellectualDependency === "unset") { + if (V.activeSlave.intelligence < 60) { + V.activeSlave.intelligence += jsRandom(0, 20); + } } } if (V.arcologies[market].FSIncestFetishist > 20) { diff --git a/src/uncategorized/neighborsFSAdoption.tw b/src/uncategorized/neighborsFSAdoption.tw index 978416f928df0b07b5f86da49cc296b3df911994..6c5dc67c16078fd41a1fee01b98fb3f8bd24a501 100644 --- a/src/uncategorized/neighborsFSAdoption.tw +++ b/src/uncategorized/neighborsFSAdoption.tw @@ -65,6 +65,14 @@ societal development. <<if $arcologies[$i].FSDegradationist != "unset">><<set $arcologies[$i].FSDegradationist = "unset">><</if>> $desc devoted to their slaves' advancement, leading the arcology to @@.yellow;adopt Paternalism.@@ <<set $arcologies[$i].FSPaternalist = 5>><<set _adopted = 1>> + <<case "Intellectual Dependency">> + <<if $arcologies[$i].FSIntellectualDependency != "unset">><<set $arcologies[$i].FSIntellectualDependency = "unset">><</if>> + $desc obsessed with crafting the perfect slave, leading the arcology to @@.yellow;adopt Slave Professionalism.@@ + <<set $arcologies[$i].FSSlaveProfessionalism = 5>><<set _adopted = 1>> + <<case "Slave Professionalism">> + <<if $arcologies[$i].FSSlaveProfessionalism != "unset">><<set $arcologies[$i].FSSlaveProfessionalism = "unset">><</if>> + $desc worried that they may one day be outsmarted by their chattel, leading the arcology to @@.yellow;adopt Intellectual Dependency.@@ + <<set $arcologies[$i].FSIntellectualDependency = 5>><<set _adopted = 1>> <<case "Body Purism">> <<if $arcologies[$i].FSBodyPurist != "unset">><<set $arcologies[$i].FSBodyPurist = "unset">><</if>> $desc fascinated with extreme surgery, leading the arcology to @@.yellow;adopt Transformation Fetishism.@@ @@ -81,6 +89,14 @@ societal development. <<if $arcologies[$i].FSMaturityPreferentialist != "unset">><<set $arcologies[$i].FSMaturityPreferentialist = "unset">><</if>> $desc devoted to fucking nubile young slaves, leading the arcology to @@.yellow;adopt Youth Preferentialism.@@ <<set $arcologies[$i].FSYouthPreferentialist = 5>><<set _adopted = 1>> + <<case "Petite Admiration">> + <<if $arcologies[$i].FSPetiteAdmiration != "unset">><<set $arcologies[$i].FSPetiteAdmiration = "unset">><</if>> + $desc convinced that tall equals beauty, leading the arcology to @@.yellow;adopt Statuesque Glorification.@@ + <<set $arcologies[$i].FSSlaveProfessionalism = 5>><<set _adopted = 1>> + <<case "Statuesque Glorification">> + <<if $arcologies[$i].FSStatuesqueGlorification != "unset">><<set $arcologies[$i].FSStatuesqueGlorification = "unset">><</if>> + $desc enamored by those shorter than them, leading the arcology to @@.yellow;adopt Petite Admiration.@@ + <<set $arcologies[$i].FSPetiteAdmiration = 5>><<set _adopted = 1>> <<case "Slimness Enthusiasm">> <<if $arcologies[$i].FSSlimnessEnthusiast != "unset">><<set $arcologies[$i].FSSlimnessEnthusiast = "unset">><</if>> $desc loves boobs, the bigger, the better, leading the arcology to @@.yellow;adopt Asset Expansionism.@@ @@ -221,6 +237,17 @@ societal development. <<set $arcologies[$i].FSPaternalist = 5>><<set _adopted = 1>> <</if>> <</if>> + <<if $arcologies[0].FSIntellectualDependency > random(5,60)>> + <<if ($arcologies[$i].FSIntellectualDependency == "unset") && ($arcologies[$i].FSSlaveProfessionalism == "unset")>> + $desc obsessed with crafting the perfect slave, leading the arcology to @@.yellow;adopt Slave Professionalism.@@ + <<set $arcologies[$i].FSSlaveProfessionalism = 5>><<set _adopted = 1>> + <</if>> + <<elseif $arcologies[0].FSSlaveProfessionalism > random(5,60)>> + <<if ($arcologies[$i].FSIntellectualDependency == "unset") && ($arcologies[$i].FSSlaveProfessionalism == "unset")>> + $desc worried that they may one day be outsmarted by their chattel, leading the arcology to @@.yellow;adopt Intellectual Dependency.@@ + <<set $arcologies[$i].FSIntellectualDependency = 5>><<set _adopted = 1>> + <</if>> + <</if>> <<if $arcologies[0].FSBodyPurist > random(5,60)>> <<if ($arcologies[$i].FSBodyPurist == "unset") && ($arcologies[$i].FSTransformationFetishist == "unset")>> $desc fascinated with extreme surgery, leading the arcology to @@.yellow;adopt Transformation Fetishism.@@ @@ -243,6 +270,17 @@ societal development. <<set $arcologies[$i].FSYouthPreferentialist = 5>><<set _adopted = 1>> <</if>> <</if>> + <<if $arcologies[0].FSPetiteAdmiration > random(5,60)>> + <<if ($arcologies[$i].FSPetiteAdmiration == "unset") && ($arcologies[$i].FSStatuesqueGlorification == "unset")>> + $desc convinced that tall equals beauty, leading the arcology to @@.yellow;adopt Statuesque Glorification.@@ + <<set $arcologies[$i].FSStatuesqueGlorification = 5>><<set _adopted = 1>> + <</if>> + <<elseif $arcologies[0].FSStatuesqueGlorification > random(5,60)>> + <<if ($arcologies[$i].FSPetiteAdmiration == "unset") && ($arcologies[$i].FSStatuesqueGlorification == "unset")>> + $desc enamored by those shorter than them, leading the arcology to @@.yellow;adopt Petite Admiration.@@ + <<set $arcologies[$i].FSPetiteAdmiration = 5>><<set _adopted = 1>> + <</if>> + <</if>> <<if $arcologies[0].FSSlimnessEnthusiast > random(5,60)>> <<if ($arcologies[$i].FSSlimnessEnthusiast == "unset") && ($arcologies[$i].FSAssetExpansionist == "unset")>> $desc loves boobs, the bigger, the better, leading the arcology to @@.yellow;adopt Asset Expansionism.@@ @@ -411,6 +449,17 @@ societal development. <</if>> <</if>> <</if>> +<<if ($arcologies[$i].FSPetiteAdmiration == "unset")>> + <<if ($arcologies[$i].FSStatuesqueGlorification == "unset")>> + <<if $leaders[$j].height >= 200>> + Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Statuesque Glorification,@@ since $he is tired of being one of the tallest in arcology. + <<set $arcologies[$i].FSStatuesqueGlorification = 5>><<break>> + <<elseif $leaders[$j].height >= 170 && $leaders[$j].fetish == "dom">> + Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Petite Admiration,@@ since it is far easier to dominate someone much smaller than oneself. + <<set $arcologies[$i].FSPetiteAdmiration = 5>><<break>> + <</if>> + <</if>> +<</if>> <<if ($arcologies[$i].FSIncestFetishist == "unset")>> <<if $familyTesting == 1>> <<set _lover = $slaves.find(function(s) { return s.ID == $leaders[$j].relationshipTarget && areRelated(s, $leaders[$j]) && s.assignment == "live with your agent"; })>>