diff --git a/player variables documentation - Pregmod.txt b/player variables documentation - Pregmod.txt index d74d8091844a600ac3b2f9152b4222fbe378e327..48b54feced0a464cd28a3d48cedda491582e5398 100644 --- a/player variables documentation - Pregmod.txt +++ b/player variables documentation - Pregmod.txt @@ -468,7 +468,7 @@ how big your balls are (requires dick == 1) ballsImplant: -how big your balls are (requires dick == 1) +how big your balls implants are (requires dick == 1) 0 - normal 1 - large 2 - huge diff --git a/src/endWeek/saChoosesOwnClothes.js b/src/endWeek/saChoosesOwnClothes.js index ba36abbea9a0a86fca847b4907c533c1db04f612..8f9947a0035901e96f0bfe303d6888537c888b8b 100644 --- a/src/endWeek/saChoosesOwnClothes.js +++ b/src/endWeek/saChoosesOwnClothes.js @@ -949,6 +949,10 @@ window.saChoosesOwnClothes = (function() { if (isItemAccessible("a kimono")) { wardrobeTastes.push({text: `and chooses an outfit that makes ${him} feel oddly nostalgic.`, clothes: "a kimono"}); } + } else if (slave.nationality === "Korean") { + if (isItemAccessible("a hanbok")) { + wardrobeTastes.push({text: `and chooses an outfit that makes ${him} feel oddly nostalgic.`, clothes: "a hanbok"}); + } } else if (slave.nationality === "Mongolian") { if (isItemAccessible("a biyelgee costume")) { wardrobeTastes.push({text: `and chooses an outfit that makes ${him} feel oddly nostalgic.`, clothes: "a biyelgee costume"}); diff --git a/src/npc/agent/agentSelect.tw b/src/npc/agent/agentSelect.tw index 52490fc1de9f0f07911259f03e780f88a4ad2d1d..5c6ff3eaf43e6ac97bcd2aa2b1b6938144c2ba39 100644 --- a/src/npc/agent/agentSelect.tw +++ b/src/npc/agent/agentSelect.tw @@ -4,7 +4,7 @@ ''Appoint an Agent from your devoted slaves:'' <<= App.UI.SlaveList.slaveSelectionList( - s => (s.fuckdoll === 0 && s.devotion > 20 && s.intelligence + s.intelligenceImplant > 15 && s.intelligenceImplant >= 15 && canWalk(s) && canSee(s) && canHear(s) && canTalk(s) && s.broodmother < 2 && (s.breedingMark !== 1 || State.variables.propOutcome === 0 || State.variables.eugenicsFullControl !== 1 || State.variables.arcologies[0].FSRestart === "unset")), + s => (s.fuckdoll === 0 && s.devotion > 20 && s.intelligence + s.intelligenceImplant > 15 && s.intelligenceImplant >= 15 && canWalk(s) && canSee(s) && canHear(s) && canTalk(s) && s.broodmother < 2 && (s.breedingMark !== 1 || State.variables.propOutcome === 0 || State.variables.eugenicsFullControl === 1 || State.variables.arcologies[0].FSRestart === "unset")), (slave, index) => App.UI.passageLink(SlaveFullName(slave), 'Agent Workaround', `$i = ${index}`), s => App.Entity.facilities.arcologyAgent.manager.slaveHasExperience(s) )>> diff --git a/src/npc/fFeelings.tw b/src/npc/fFeelings.tw index 3020bee7bdd80349692b913cb4a7ed8d0fb29a1c..297b198adf7f1ca0b58a419ac9e8ba4f4f987154 100644 --- a/src/npc/fFeelings.tw +++ b/src/npc/fFeelings.tw @@ -605,7 +605,7 @@ My favorite part of my body i<<s>> <</if>> <<Master>>. <<elseif ($activeSlave.fetish == "boobs") && ($activeSlave.fetishStrength > 60)>> - <<if $PC.boobsBonus == 3>>Your brea<<s>>t<<s>> are giant, <<Master>>," $he <<say>>s eagerly. "I ju<<s>>t want to bury my fa<<c>>e in them. + <<if $PC.boobsBonus >= 3>>Your brea<<s>>t<<s>> are giant, <<Master>>," $he <<say>>s eagerly. "I ju<<s>>t want to bury my fa<<c>>e in them. <<elseif $PC.boobsBonus == 2>>Your brea<<s>>t<<s>> are huge, <<Master>>," $he <<say>>s eagerly. "I love them. <<elseif $PC.boobsBonus == 1>>Your brea<<s>>t<<s>> are <<s>>o big and lovely, <<Master>>," $he <<say>>s eagerly. "I love them. <<elseif $PC.boobs == 1>>Your brea<<s>>t<<s>> are incredible, <<Master>>," $he <<say>>s eagerly. "I love them. diff --git a/src/pregmod/eliteTakeOverResult.tw b/src/pregmod/eliteTakeOverResult.tw index 968f004df4c20ec0d067b864b93fdf3bac2b361a..fa416f5bbf976de120643232de24e84527a3f723 100644 --- a/src/pregmod/eliteTakeOverResult.tw +++ b/src/pregmod/eliteTakeOverResult.tw @@ -95,10 +95,10 @@ </span> <<if $SF.MercCon.CanAttend === -1>> <<switch $SF.Colonel.Core>> - <<case "kind">> - The Colonel is shocked that you would allow her troops to do this but understands that it comes with the territory. <<if _SFHappyEverAfter == 1>>Thanks for being kind to one of my soldiers.<</if>> - <<case "brazen" "cruel" "jaded">> - The Colonel is grateful that you let her troops let off some steam. <<if _SFHappyEverAfter == 1>>Thanks for being kind to one of my soldiers.<</if>> + <<case "kind">> + The Colonel is shocked that you would allow her troops to do this but understands that it comes with the territory.<<if _SFHappyEverAfter == 1>> "Thanks for being kind to one of my soldiers."<</if>> + <<case "brazen" "cruel" "jaded">> + The Colonel is grateful that you let her troops let off some steam.<<if _SFHappyEverAfter == 1>> "Thanks for being kind to one of my soldiers."<</if>> <</switch>> <</if>> <<set $SF.Depravity += 0.05>> @@ -109,7 +109,7 @@ While some citizens respectfully step out, some join you in the fun. The impromptu festivities will go on for hours, getting more and more depraved. <</if>> <<else>> - <<if $Bodyguard.fetish == "sadist">>$Bodyguard.slaveName gets out $his melee weapon and starts to give them many small cuts, the look of pleasure on $his face is evident.<<else>>$Bodyguard.slaveName ties them and then gets out $his melee weapon and starts to abuse them, $his face is blank.<</if>> + <<if $Bodyguard.fetish == "sadist">>$Bodyguard.slaveName gets out $his melee weapon and starts to give them many small cuts, the look of pleasure on $his face is evident.<<else>>$Bodyguard.slaveName ties them and then gets out $his melee weapon and starts to abuse them; $his face is blank.<</if>> <br>Shortly after, the terrified <<if $eliteLeft < $eliteTotal>>remaining<</if>> Elite are quickly brought away to be officially enslaved. <</if>> <</switch>> diff --git a/src/pregmod/fDick.tw b/src/pregmod/fDick.tw index 783d68a267ea9172b35ab8335c58005e9a026d96..0f956c73aa6a62ea94fc30f06e67624e6970df66 100644 --- a/src/pregmod/fDick.tw +++ b/src/pregmod/fDick.tw @@ -183,7 +183,7 @@ <<if $activeSlave.dick <= 6>> until you are sitting on $his loins. <<else>> - until feel that you can't take more of $him inside you. + until you feel that you can't take any more of $him inside you. <</if>> You reach back diff --git a/src/pregmod/huskSlaveSwapWorkaround.tw b/src/pregmod/huskSlaveSwapWorkaround.tw index 7bbecbd60d6ac127159ee5cd1a2dfeb64569b56c..5e3c7a94745b1741e324ace1c6bbd60d89f6ce93 100644 --- a/src/pregmod/huskSlaveSwapWorkaround.tw +++ b/src/pregmod/huskSlaveSwapWorkaround.tw @@ -14,7 +14,7 @@ __Select an eligible slave:__ <<if $slaves[_i].fuckdoll == 0>> <<if $slaves[_i].amp >= 0>> <<if $slaves[_i].indenture == -1>> - <<if $slaves[_i].breedingMark == 0 || $propOutcome == 0>> + <<if $slaves[_i].breedingMark == 0 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset">> <<if WombReserveCount($slaves[_i]) == 0>> <<if $slaves[_i].ID != $activeSlave.ID>> <<set _name = SlaveFullName($slaves[_i])>> diff --git a/src/pregmod/newChildIntro.tw b/src/pregmod/newChildIntro.tw index bf65052ed0afbfdcc24dc5c979d36503250f7bf4..4952ef2a4a3b5c283e17df87ce3877f4341b4337 100644 --- a/src/pregmod/newChildIntro.tw +++ b/src/pregmod/newChildIntro.tw @@ -529,7 +529,7 @@ You slowly strip down, gauging $his reactions to your show, until you are fully <</if>> <</if>> -<<if $PC.boobsBonus == 3>> +<<if $PC.boobsBonus >= 3>> Now that you are alone with $him, $he seems incapable of pulling $his eyes off your huge tits. Every motion and jiggle in them is reflected in $his expression. $He licks $his lips as $he gazes at your erect nipples, but it will be you who decides who may suck on them. Though it doesn't stop $him from @@.hotpink;longing@@ to nurse from you. <<set $activeSlave.devotion += 5>> <</if>> @@ -880,7 +880,7 @@ You slowly strip down, gauging $his reactions to your show, until you are fully <</if>> <</if>> -<<if $PC.boobsBonus == 3>> +<<if $PC.boobsBonus >= 3>> <br><<link "Permit $him to explore your expansive bust">> <<replace "#result">> You beckon the curious $girl to your hefty breasts, having noticed how hungrily $he has been <<if canSee($activeSlave)>>eying<<else>>focusing on<</if>> them. $He eagerly places $his hands to them and begins squeezing and massaging them, quickly becoming aroused $himself. $He pays close attention to your nipples, <<if $PC.lactation > 0>> squealing happily when milk begins to flow from them<<set $PC.lactationDuration = 2>><<else>> grumbling unhappily when $he finds no milk within<</if>>. @@ -1037,7 +1037,7 @@ You slowly strip down, gauging $his reactions to your show, until you are fully <<if $arcologies[0].FSRestart >= 10>> <<if $activeSlave.preg != -2 && $activeSlave.ovaries > 0>> - <<if $activeSlave.breedingMark == 0 || $propOutcome == 0>> + <<if $activeSlave.breedingMark == 0 || $propOutcome == 0 || $eugenicsFullControl == 1>> <br><<link "Sterilize $him">> <<set $activeSlave.preg = -2>> <<set $activeSlave.pregType = 0>> diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw index 6b351f94d9a7fa1a16ef5fda310763838853aff2..556ba7a59124b65901018824c987275bcff4a518 100644 --- a/src/uncategorized/bodyModification.tw +++ b/src/uncategorized/bodyModification.tw @@ -1099,7 +1099,7 @@ Or a custom site: <<textbox "$brandTarget.local" $brandTarget.local "Body Modifi <</if>> <</if>> -<<if $activeSlave.breedingMark == 1 && $propOutcome == 0>> +<<if $activeSlave.breedingMark == 1 && ($propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset")>> <br> $He has an intricate tattoo on $his lower belly that suggests $he was made to be bred. [[Remove it|Body Modification][$activeSlave.breedingMark = 0]] <</if>> diff --git a/src/uncategorized/reputation.tw b/src/uncategorized/reputation.tw index c3ca4ea7be319925e882e995dc293f0c4484939e..47faec4b8df20072f30a9a310c25ae52ff7e7ce3 100644 --- a/src/uncategorized/reputation.tw +++ b/src/uncategorized/reputation.tw @@ -366,16 +366,22 @@ On formal occasions, you are announced as $PCTitle. <<set $failedElite -= 10>> <</if>> <<else>> - Most prominent female owners avoid being penetrated on - <<if $sexualOpeness == 1>> - principle, though you choose the opposite; your fecund figure suggests a slave knocked you up, a huge + <<if $PC.pregSource != -1 && $PC.pregSource != -6>> + Most prominent female owners avoid being penetrated on + <<if $sexualOpeness == 1>> + principle, though you choose the opposite; your fecund figure suggests a slave knocked you up, a huge + <<else>> + principle; your fecund figure exposes not only your willingness to be penetrated, but your + <</if>> + breach of the eugenics you are pushing for. Your citizens are @@.red;disgusted@@ by both your body and your lack of commitment. + <<run repX(-500, "PCactions")>> + <<if $eugenicsFullControl != 1>> + <<set $failedElite += 50>> + <</if>> <<else>> - principle; your fecund figure exposes not only your willingness to be penetrated, but your - <</if>> - breach of the eugenics you are pushing for. Your citizens are @@.red;disgusted@@ by both your body and your lack of commitment. - <<run repX(-500, "PCactions")>> - <<if $eugenicsFullControl != 1>> - <<set $failedElite += 50>> + Since it is public knowledge that you are carrying a child in the name of eugenics, society views you as a bearer of modernity and @@.green;commends@@ your contributions to society. + <<run repX(200, "PCappearance")>> + <<set $failedElite -= 5>> <</if>> <</if>> <<elseif $arcologies[0].FSRepopulationFocus >= 60>> diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw index c8b1c315cdd5a10a8a6ceed67fe91c4de3c51cad..28301cc384ee4d2b60ccb9a0a68705f20d9e15b6 100644 --- a/src/uncategorized/saRules.tw +++ b/src/uncategorized/saRules.tw @@ -2829,7 +2829,7 @@ <<if canDoVaginal($slaves[$i])>> <<if $slaves[$i].vagina != 0>> <<set $slaves[$i].counter.vaginal += 7, $vaginalTotal += 7>> - <<if canImpreg($slaves[$i], $Schoolteacher) && $slaves[$i].breedingMark == 0 && $slaves[$i].vagina != 0>> + <<if canImpreg($slaves[$i], $Schoolteacher) && ($slaves[$i].breedingMark == 0 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset") && $slaves[$i].vagina != 0>> <<= knockMeUp($slaves[$i], 5, 0, $Schoolteacher.ID, 1)>> <</if>> <</if>> @@ -2838,7 +2838,7 @@ <<if canDoAnal($slaves[$i])>> <<if $slaves[$i].anus != 0>> <<set $slaves[$i].counter.anal += 7, $analTotal += 7>> - <<if canImpreg($slaves[$i], $Schoolteacher) && $slaves[$i].breedingMark == 0 && $slaves[$i].anus != 0>> + <<if canImpreg($slaves[$i], $Schoolteacher) && ($slaves[$i].breedingMark == 0 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset") && $slaves[$i].anus != 0>> <<= knockMeUp($slaves[$i], 5, 1, $Schoolteacher.ID, 1)>> <</if>> <</if>> @@ -2847,7 +2847,7 @@ <<if canPenetrate($slaves[$i])>> <<set $slaves[$i].counter.penetrative += 7, $penetrativeTotal += 7>> <<set $slaves[$i].need -= 10>> - <<if canImpreg($Schoolteacher, $slaves[$i]) && $Schoolteacher.breedingMark == 0>> + <<if canImpreg($Schoolteacher, $slaves[$i]) && ($Schoolteacher.breedingMark == 0 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset")>> <<if $Schoolteacher.vagina != 0 && $Schoolteacher.ovaries == 1>> <<= knockMeUp($slaves[_FLs], 5, 0, $slaves[$i].ID, 1)>> <<elseif $Schoolteacher.anus != 0 && $Schoolteacher.mpreg == 1>> diff --git a/src/uncategorized/seIndependenceDay.tw b/src/uncategorized/seIndependenceDay.tw index 473e9d940eb490e6ab5a3a144a386fd8f53bd1c9..f5000f0e56a19573d1f115c5273a8e5a0d39fdb0 100644 --- a/src/uncategorized/seIndependenceDay.tw +++ b/src/uncategorized/seIndependenceDay.tw @@ -426,7 +426,7 @@ In the Free Cities, Independence Day falls on the day when the Free City achieve <<run repX(1250, "event")>> <</if>> <<if ($SF.ROE === "hold") && ($SF.Depravity >= 1.5)>> - The sight of $SF.Lower's forcing their captured slaves to suck them off while swinging their swords and other none lethal tools around trigger fingers twitch inspires terror in your citizens. + The sight of $SF.Lower's forcing their captured slaves to suck them off while swinging their swords and other nonlethal tools around their itchy trigger fingers inspires terror in your citizens. <<run repX(-200, "event")>> <<elseif ($SF.ROE === "limited") && ($SF.Depravity >= 1.5)>> The sight of $SF.Lower's forcing their captured slaves to suck them off with itchy trigger fingers inspires terror in your citizens. diff --git a/src/uncategorized/wardrobeUse.tw b/src/uncategorized/wardrobeUse.tw index 6f8310b32a2b8a39b3be975525cefbe8f6eb140c..7e5f34bbfcd92b05443562aa881e1de20eae2999 100644 --- a/src/uncategorized/wardrobeUse.tw +++ b/src/uncategorized/wardrobeUse.tw @@ -411,7 +411,7 @@ Torso accessory: ''$activeSlave.bellyAccessory.'' <<options $activeSlave.bellyAccessory>> <<option "none" "None">> <<option "a corset" "Tight corset">> - <<optionif `($activeSlave.breedingMark != 1 || $propOutcome == 0)`>> + <<optionif `($activeSlave.breedingMark != 1 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset")`>> <<option "an extreme corset" "Extreme corset">> <<optionif `($activeSlave.belly > 10000)`>> <<option "a support band" "Supportive band">> @@ -481,13 +481,13 @@ Torso accessory: ''$activeSlave.bellyAccessory.'' <<optionif `isItemAccessible("smart bullet vibrator")`>> <<option "smart bullet vibrator" "Smart bullet vibrator">> <<option "dildo" "Dildo">> - <<optionif `isItemAccessible("long dildo") && ($activeSlave.breedingMark != 1 || $propOutcome == 0)`>> + <<optionif `isItemAccessible("long dildo") && ($activeSlave.breedingMark != 1 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset")`>> <<option "long dildo" "Long dildo">> - <<optionif `isItemAccessible("long, large dildo") && ($activeSlave.breedingMark != 1 || $propOutcome == 0)`>> + <<optionif `isItemAccessible("long, large dildo") && ($activeSlave.breedingMark != 1 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset")`>> <<option "long, large dildo" "Large and long dildo">> <<optionif `$activeSlave.vagina >= 2`>> <<option "huge dildo" "Huge dildo">> - <<optionif `isItemAccessible("long, huge dildo") && ($activeSlave.breedingMark != 1 || $propOutcome == 0)`>> + <<optionif `isItemAccessible("long, huge dildo") && ($activeSlave.breedingMark != 1 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset")`>> <<option "long, huge dildo" "Huge and long dildo">> <</options>> @@ -522,13 +522,13 @@ Anal accessory: ''$activeSlave.buttplug.'' <<option "none" "None">> <<option "plug" "Normal">> <<option "large plug" "Large">> - <<optionif `isItemAccessible("long plug") && ($activeSlave.breedingMark != 1 || $propOutcome == 0)`>> + <<optionif `isItemAccessible("long plug") && ($activeSlave.breedingMark != 1 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset")`>> <<option "long plug" "Long">> - <<optionif `isItemAccessible("long, large plug") && ($activeSlave.breedingMark != 1 || $propOutcome == 0)`>> + <<optionif `isItemAccessible("long, large plug") && ($activeSlave.breedingMark != 1 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset")`>> <<option "long, large plug" "Long and large">> <<optionif `$activeSlave.anus >= 2`>> <<option "huge plug" "Huge">> - <<optionif `$activeSlave.anus >= 2 && isItemAccessible("long, huge plug") && ($activeSlave.breedingMark != 1 || $propOutcome == 0) && $activeSlave.anus >= 2`>> + <<optionif `$activeSlave.anus >= 2 && isItemAccessible("long, huge plug") && ($activeSlave.breedingMark != 1 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset") && $activeSlave.anus >= 2`>> <<option "long, huge plug" "Long and huge">> <</options>> <br>