From 30f7b07c47fbbcd0d408e228ceb17432fdbfe7b3 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Tue, 28 Aug 2018 00:30:54 -0400 Subject: [PATCH] fixes --- devNotes/VersionChangeLog-Premod+LoliMod.txt | 6 ++++ src/events/intro/introSummary.tw | 10 ++++++ src/uncategorized/options.tw | 4 +-- src/uncategorized/remoteSurgery.tw | 32 +++++++++----------- src/uncategorized/surgeryDegradation.tw | 4 +-- src/utility/assayWidgets.tw | 24 +++++++++++++-- src/utility/descriptionWidgetsFlesh.tw | 12 ++++---- 7 files changed, 62 insertions(+), 30 deletions(-) diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 93aa4288577..892a5cbb436 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -2,6 +2,12 @@ 0.10.7.1-0.7.x +8/28/2018 + + 5 + -fixes + -option to allow male slaves to gen with male names + 8/27/2018 4 diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw index 4ff9f8ae65f..3a474036c73 100644 --- a/src/events/intro/introSummary.tw +++ b/src/events/intro/introSummary.tw @@ -149,6 +149,16 @@ __''General slave settings''__ [[Enable mentions of nationality|Intro Summary][$seeNationality = 1]] <</if>> +<br> +<<if $allowMaleSlaveNames>> + Slaves ''can generate with male names.'' + [[Only use female names|Options][$allowMaleSlaveNames = false]] +<<else>> + Slaves will ''always generate with female names.'' + [[Allow male names|Options][$allowMaleSlaveNames = true]] +<</if>> +//This only affects slave generation and not your ability to name your slaves.// + <br> <<if $surnameOrder != 1>> Order names ''based on country of origin''. [[Force name surname|Intro Summary][$surnameOrder = 1]] diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw index 2cfa37e0ea8..4287124dd52 100644 --- a/src/uncategorized/options.tw +++ b/src/uncategorized/options.tw @@ -391,9 +391,9 @@ Experimental male pronouns are currently @@.red;DISABLED@@. [[Enable|Options][$d <br> <<if $allowMaleSlaveNames>> -Male slave names are currently @@.cyan;ENABLED@@. [[Disable|Options][$allowMaleSlaveNames = false]] +Male slave names are currently @@.cyan;Permitted@@. [[Deny|Options][$allowMaleSlaveNames = false]] <<else>> -Male slave names are currently @@.red;DISABLED@@. [[Enable|Options][$allowMaleSlaveNames = true]] +Male slave names are currently @@.red;Forbidden@@. [[Allow|Options][$allowMaleSlaveNames = true]] <</if>> //This only affects slave generation and not your ability to name your slaves.// diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw index d02da84c759..f12d0569936 100644 --- a/src/uncategorized/remoteSurgery.tw +++ b/src/uncategorized/remoteSurgery.tw @@ -283,27 +283,25 @@ $He has <</if>> <<if $activeSlave.voiceImplant >= 1>> $He has had surgery on $his voice box to raise $his voice. -<</if>> -<<if $activeSlave.voiceImplant <= -1>> +<<elseif $activeSlave.voiceImplant <= -1>> $He has had surgery on $his voice box to lower $his voice. <</if>> -<<if ($activeSlave.indentureRestrictions < 1) && ($activeSlave.electrolarynx == 0)>> - <<if $activeSlave.voice < 3>> - [[Perform surgery to raise voice|Surgery Degradation][$activeSlave.voice += 1, $activeSlave.voiceImplant += 1, $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "voice"]] - <</if>> - <<if $activeSlave.voice == 2>> - | - <</if>> - <<if $activeSlave.voice > 1>> - [[Perform surgery to lower voice|Surgery Degradation][$activeSlave.voice -= 1, $activeSlave.voiceImplant -= 1, $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "voice2"]] - <</if>> - <<if $seeExtreme == 1>> - <<if $activeSlave.voice != 0>> - | [[Remove vocal cords|Surgery Degradation][$activeSlave.voice = 0, $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "mute"]] +<<if ($activeSlave.indentureRestrictions < 1)>> + <<if $activeSlave.voice != 0>> + <<if $activeSlave.voice < 3>> + [[Perform surgery to raise voice|Surgery Degradation][$activeSlave.voice += 1, $activeSlave.voiceImplant += 1, $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "voice"]] + <</if>> + <<if $activeSlave.voice == 2>> + | + <</if>> + <<if $activeSlave.voice > 1>> + [[Perform surgery to lower voice|Surgery Degradation][$activeSlave.voice -= 1, $activeSlave.voiceImplant -= 1, $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "voice2"]] <</if>> - <<if ($cyberMod == 1) && ($stockpile.electrolarynx > 0)>> - | [[Give her an electrolarynx|Surgery Degradation][$activeSlave.electrolarynx = 1, $stockpile.electrolarynx--,$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "electrolarynx"]] + <<if $seeExtreme == 1>> + | [[Remove vocal cords|Surgery Degradation][$activeSlave.voice = 0, $activeSlave.voiceImplant = 0, $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "mute"]] <</if>> + <<elseif ($cyberMod == 1) && ($stockpile.electrolarynx > 0)>> + | [[Give her an electrolarynx|Surgery Degradation][$activeSlave.electrolarynx = 1, $stockpile.electrolarynx--,$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "electrolarynx"]] <</if>> <</if>> diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw index 04de160d09b..d72010e82bd 100644 --- a/src/uncategorized/surgeryDegradation.tw +++ b/src/uncategorized/surgeryDegradation.tw @@ -1498,12 +1498,12 @@ As the remote surgery's long recovery cycle completes, <<if $activeSlave.fetish == "mindbroken">> The autosurgery instructed $him in no uncertain terms not to speak during recovery, but $he fails to recall that. $He doesn't notice anything different. As with all surgery @@.red;$his health has been slightly affected.@@ <<elseif ($activeSlave.devotion > 50)>> - Before surgery, $he was warned repeatedly not to try talking for a while, and $he obeys. When $he finally does, $his voice is raspy and weak, but it gains strength gradually. It comes out <<if $activeSlave.voice == 3>>far <</if>>higher and more girly than it was before, and $he laughs at $himself as $he gets used to it. @@.hotpink;$He has become more submissive,@@ since this helps $him to think of $himself as a <<if $activeSlave.voice == 3>>bimbo slut<<elseif $activeSlave.voice == 2>>real woman<</if>>. As with all surgery @@.red;$his health has been slightly affected.@@ + Before surgery, $he was warned repeatedly not to try talking for a while, and $he obeys. When $he finally does, $his voice is raspy and weak, but it gains strength gradually. It comes out <<if $activeSlave.voice == 3>>far <</if>>higher and more girly than it was before, and $he laughs at $himself as $he gets used to it. @@.hotpink;$He has become more submissive,@@ since this helps $him to think of $himself as a <<if $activeSlave.voice == 3>>bimbo slut<<else>>real woman<</if>>. As with all surgery @@.red;$his health has been slightly affected.@@ <<set $activeSlave.devotion += 4>> <<elseif ($activeSlave.devotion > 20)>> Before surgery, $he was warned repeatedly not to try talking for a while, and $he obeys. When $he finally does, $his voice is raspy and weak, but it gains strength gradually. It comes out <<if $activeSlave.voice == 3>>far <</if>> higher and more girly than it was before, and $he laughs grimly at $himself as $he gets used to it. $He carries on regardless, accepting it as one more thing to learn to accept. As with all surgery @@.red;$his health has been slightly affected.@@ <<else>> - Before surgery, $he was warned repeatedly not to try talking for a while, and $he obeys. When $he finally does, $his voice is raspy and weak, but it gains strength gradually. It comes out <<if $activeSlave.voice == 3>>far <</if>> higher and more girly than it was before. For now, @@.mediumorchid;$he feels this <<if $activeSlave.voice == 3>>bimbo<<elseif $activeSlave.voice == 2>>feminine<</if>> voice is not $hers, a cruel mockery.@@ As with all surgery @@.red;$his health has been slightly affected.@@ $He is now @@.gold;terribly afraid@@ of your total power over $his body. + Before surgery, $he was warned repeatedly not to try talking for a while, and $he obeys. When $he finally does, $his voice is raspy and weak, but it gains strength gradually. It comes out <<if $activeSlave.voice == 3>>far <</if>> higher and more girly than it was before. For now, @@.mediumorchid;$he feels this <<if $activeSlave.voice == 3>>bimbo<<else>>feminine<</if>> voice is not $hers, a cruel mockery.@@ As with all surgery @@.red;$his health has been slightly affected.@@ $He is now @@.gold;terribly afraid@@ of your total power over $his body. <<set $activeSlave.trust -= 10, $activeSlave.devotion -= 5>> <</if>> diff --git a/src/utility/assayWidgets.tw b/src/utility/assayWidgets.tw index ede3f40594e..ec418a532f1 100644 --- a/src/utility/assayWidgets.tw +++ b/src/utility/assayWidgets.tw @@ -1029,7 +1029,11 @@ <<elseif $args[0].underArmHStyle == "shaved">> <<set $beauty += 2>> <<elseif $args[0].underArmHStyle == "bushy">> - <<set $beauty -= 2>> + <<if $arcologies[0].FSBodyPurist > 0>> + <<set $beauty -= 2>> + <<else>> + <<set $beauty += 4>> + <</if>> <</if>> <<if ($args[0].physicalAge < 11)>> @@ -1044,9 +1048,23 @@ <<elseif ($args[0].pubicHStyle == "waxed")>> <<set $beauty += 2>> <<elseif $args[0].pubicHStyle == "bushy">> - <<set $beauty -= 4>> + <<if $arcologies[0].FSBodyPurist > 0>> + <<set $beauty += 2>> + <<else>> + <<set $beauty -= 4>> + <</if>> <<elseif $args[0].pubicHStyle == "bushy in the front and neat in the rear">> - <<set $beauty -= 2>> + <<if $arcologies[0].FSBodyPurist > 0>> + <<set $beauty += 4>> + <<else>> + <<set $beauty -= 2>> + <</if>> +<<elseif $args[0].pubicHStyle == "very bushy">> + <<if $arcologies[0].FSBodyPurist > 0>> + <<set $beauty += 2>> + <<else>> + <<set $beauty -= 6>> + <</if>> <</if>> <<if $args[0].amp == 0>> diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw index 920c0087731..b70602325ba 100644 --- a/src/utility/descriptionWidgetsFlesh.tw +++ b/src/utility/descriptionWidgetsFlesh.tw @@ -13932,7 +13932,7 @@ $He has <<elseif $activeSlave.preg == $activeSlave.pregWeek/4>> $he could shockingly pass for a girl only a quarter as far along. <<else>> - $he shockingly only looks like a girl on $his ordinalSuffix($activeSlave.preg) week of pregnancy. + $he shockingly only looks like a girl on $his <<= ordinalSuffix($activeSlave.preg)>> week of pregnancy. <</if>> <<elseif $activeSlave.preg+20 <= $activeSlave.pregWeek>> <<if $activeSlave.preg == $activeSlave.pregWeek/2>> @@ -13940,7 +13940,7 @@ $He has <<elseif $activeSlave.preg == $activeSlave.pregWeek/4>> $he could surprisingly pass for a girl only a quarter as far along. <<else>> - $he surprisingly only looks like a girl on $his ordinalSuffix($activeSlave.preg) week of pregnancy. + $he surprisingly only looks like a girl on $his <<= ordinalSuffix($activeSlave.preg)>> week of pregnancy. <</if>> <<elseif $activeSlave.preg+10 <= $activeSlave.pregWeek>> <<if $activeSlave.preg == $activeSlave.pregWeek/2>> @@ -13948,7 +13948,7 @@ $He has <<elseif $activeSlave.preg == $activeSlave.pregWeek/4>> $he could pass for a girl only a quarter as far along. <<else>> - $he only looks like a woman on $his ordinalSuffix($activeSlave.preg) week of pregnancy. + $he only looks like a woman on $his <<= ordinalSuffix($activeSlave.preg)>> week of pregnancy. <</if>> <<else>> $his pregnancy is smaller than anticipated. @@ -13963,7 +13963,7 @@ $He has <<elseif $activeSlave.preg == $activeSlave.pregWeek*4>> $he could shockingly pass for a girl nearly four times as far along. <<else>> - $he shockingly looks like a girl on $his ordinalSuffix($activeSlave.preg) week of pregnancy. + $he shockingly looks like a girl on $his <<= ordinalSuffix($activeSlave.preg)>> week of pregnancy. <</if>> <<elseif $activeSlave.preg >= $activeSlave.pregWeek+10>> Despite being pregnant for only $activeSlave.pregWeek weeks, @@ -13972,7 +13972,7 @@ $He has <<elseif $activeSlave.preg == $activeSlave.pregWeek*4>> $he could surprisingly pass for a girl nearly four times as far along. <<else>> - $he surprisingly looks like a girl on $his ordinalSuffix($activeSlave.preg) week of pregnancy. + $he surprisingly looks like a girl on $his <<= ordinalSuffix($activeSlave.preg)>> week of pregnancy. <</if>> <<elseif $activeSlave.preg >= $activeSlave.pregWeek+5>> Despite being pregnant for only $activeSlave.pregWeek weeks, @@ -13981,7 +13981,7 @@ $He has <<elseif $activeSlave.preg == $activeSlave.pregWeek*4>> $he could pass for a girl nearly four times as far along. <<else>> - $he looks like a woman on $his ordinalSuffix($activeSlave.preg) week of pregnancy. + $he looks like a woman on $his <<= ordinalSuffix($activeSlave.preg)>> week of pregnancy. <</if>> <<else>> Despite being pregnant for only $activeSlave.pregWeek weeks, $his pregnancy is larger than anticipated. -- GitLab