diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index a27a2cfd97fa09f2c74d3ce7ac74febd4c6fbc33..40f88a8c0723f1a2cf725336f988a37db7b1e48b 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -2,6 +2,13 @@ 0.10.7.1-0.1.x +3/27/2018 + + 11 + -added many new git submitted nationalities + -fixed needless space between knock yourself up and its link + -revised saLiveWithHG's diet block to better stick to dietary targets + 3/26/2018 10 diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw index 7c1afe1462074f1761f95c6dc9d71c3e3ffd5571..c8626f53a7720d8f6834dc146a2b668cd6bc8cf1 100644 --- a/src/events/intro/introSummary.tw +++ b/src/events/intro/introSummary.tw @@ -157,6 +157,7 @@ __''General slave settings''__ <</if>> //Extended family mode must be on for the incubation facility to be enabled.// <<if $familyTesting == 1>> +<br> <<if $inbreeding == 1>> Successive breeding ''will'' result in sub-average slaves. [[Disable inbreeding|Intro Summary][$inbreeding = 0]] diff --git a/src/pregmod/managePersonalAffairs.tw b/src/pregmod/managePersonalAffairs.tw index 48649f13b3a1818c263aba24c273b95870ba6879..ef41134f7a0384db77bcea664e2094d6ea9309e4 100644 --- a/src/pregmod/managePersonalAffairs.tw +++ b/src/pregmod/managePersonalAffairs.tw @@ -467,7 +467,7 @@ In total, you have given birth to: <<else>> <br><br> You have an empty vagina, a working set of balls, and a strong craving for a hot creampie. Who better to give it to you than you? - <br><br>[[Grab an extra syringe.|MpregSelf]] + [[Grab an extra syringe.|MpregSelf]] <</if>> <</if>> diff --git a/src/uncategorized/reNickname.tw b/src/uncategorized/reNickname.tw index f6accaf3be85239dd1b26dc18d5681120615f9db..f7715900cdeec4757623b52c050ef6c658af7ac3 100644 --- a/src/uncategorized/reNickname.tw +++ b/src/uncategorized/reNickname.tw @@ -568,7 +568,7 @@ <<case "Samoan">> <<set $nickname = either("'Apia'", "'Navigator'")>> <<case "SĆ£o TomĆ©an">> - <<set $nickname to either("'PrĆncipe'", "'RoƧas"')>> + <<set $nickname to either("'PrĆncipe'", "'RoƧas'")>> <<case "Saudi">> <<set $nickname = either("'Burqa'", "'Mecca'", "'Riyadh'", "'Sandy'", "'Al Qaeda'")>> <<case "Scottish">> diff --git a/src/uncategorized/saLiveWithHG.tw b/src/uncategorized/saLiveWithHG.tw index 8baedcb9b15550c9521d5761b8311430618ca645..416e35c7ade55d24003709e2f1a6f9828a0a7e7e 100644 --- a/src/uncategorized/saLiveWithHG.tw +++ b/src/uncategorized/saLiveWithHG.tw @@ -753,32 +753,56 @@ <</if>> <</if>> -<<if ($slaves[$i].weight < 100) && ($slaves[$i].diet != "fattening") && ($arcologies[0].FSHedonisticDecadence >= 20)>> - $HeadGirl.slaveName puts $slaves[$i].slaveName on a fattening diet since plump girls are all the rage in your arcology. - <<set $slaves[$i].diet = "fattening">> -<<elseif ($slaves[$i].weight > 30) && ($slaves[$i].diet != "restricted") && ($arcologies[0].FSHedonisticDecadence == "unset")>> - $HeadGirl.slaveName puts $slaves[$i].slaveName on a diet. - <<set $slaves[$i].diet = "restricted">> -<<elseif ($slaves[$i].weight < -10) && ($slaves[$i].diet != "fattening") && ($arcologies[0].FSHedonisticDecadence == "unset")>> - $HeadGirl.slaveName puts $slaves[$i].slaveName on a fattening diet. - <<set $slaves[$i].diet = "fattening">> -<<elseif ($slaves[$i].muscles <= 95) && ($arcologies[0].FSPhysicalIdealist > 0) && ($slaves[$i].amp != 1) && ($slaves[$i].diet != "muscle building")>> - $HeadGirl.slaveName wants to support your societal goals, so she makes $slaves[$i].slaveName work out hard. - <<set $slaves[$i].diet = "muscle building">> -<<elseif ($slaves[$i].muscles <= 95) && ($HeadGirl.fetish == "submissive") && ($HeadGirl.fetishKnown == 1) && ($slaves[$i].amp != 1) && ($slaves[$i].diet != "muscle building")>> - $HeadGirl.slaveName wants a strong girl in bed with her, so she makes $slaves[$i].slaveName work out hard. - <<set $slaves[$i].diet = "muscle building">> -<<elseif ($slaves[$i].muscles <= 95) && ($HeadGirl.fetish == "masochist") && ($HeadGirl.fetishKnown == 1) && ($slaves[$i].amp != 1) && ($slaves[$i].diet != "muscle building")>> - $HeadGirl.slaveName wants a strong girl to spank her, so she makes $slaves[$i].slaveName work out hard. - <<set $slaves[$i].diet = "muscle building">> -<<elseif ($slaves[$i].muscles <= 5) && ($slaves[$i].amp != 1) && ($slaves[$i].diet != "muscle building")>> - $HeadGirl.slaveName likes a bit of muscle, so she makes $slaves[$i].slaveName work out hard. - <<set $slaves[$i].diet = "muscle building">> -<<elseif ($slaves[$i].balls > 0) && ($HeadGirl.fetish == "cumslut") && ($HeadGirl.fetishKnown == 1) && ($slaves[$i].diet != "cum production") && ($cumProDiet == 1)>> - HeadGirl.slaveName loves cum, so she puts $slaves[$i].slaveName on a diet designed to make her cum harder and stronger. - <<set $slaves[$i].diet = "cum production">> -<<elseif ($slaves[$i].diet != "healthy")>> - <<set $slaves[$i].diet = "healthy">> +<<if ($slaves[$i].weight < 100 && $arcologies[0].FSHedonisticDecadence >= 20) || ($slaves[$i].weight < -10)>> + $HeadGirl.slaveName thinks $slaves[$i].slaveName could use a little extra weight <<if $arcologies[0].FSHedonisticDecadence >= 20>>since plump girls are all the rage in your arcology <</if>> + <<if $slaves[$i].diet != "fattening">> + and assigns her a diet to fatten her up. + <<set $slaves[$i].diet = "fattening">> + <<else>> + and keeps her on her fattening diet. + <</if>> +<<elseif $slaves[$i].weight > 30 && $arcologies[0].FSHedonisticDecadence == "unset">> + $HeadGirl.slaveName thinks $slaves[$i].slaveName is a little too porky + <<if $slaves[$i].diet != "restricted">> + and puts her on a diet. + <<set $slaves[$i].diet = "restricted">> + <<else>> + and keeps her on her diet. + <</if>> +<<elseif (($slaves[$i].muscles <= 95 && ($arcologies[0].FSPhysicalIdealist > 0 || (($HeadGirl.fetish == "submissive" || $HeadGirl.fetish == "masochist") && $HeadGirl.fetishKnown == 1))) || $slaves[$i].muscles <= 5) && $slaves[$i].amp != 1>> + $HeadGirl.slaveName thinks $slaves[$i].slaveName + <<if $arcologies[0].FSPhysicalIdealist > 0>> + could use bigger muscles to support your societal goals + <<elseif $HeadGirl.fetish == "submissive">> + could use bigger muscles to better dominate her with in bed + <<elseif $HeadGirl.fetish == "masochist">> + could use bigger muscles to better spank her + <<else>> + could use a bit of muscle + <</if>> + <<if $slaves[$i].diet != "muscle building">> + and makes her work out hard. + <<set $slaves[$i].diet = "muscle building">> + <<else>> + and keeps her working out. + <</if>> +<<elseif $slaves[$i].balls > 0 && $HeadGirl.fetish == "cumslut" && $HeadGirl.fetishKnown == 1 && $cumProDiet == 1>> + HeadGirl.slaveName loves cum, so she + <<if $slaves[$i].diet != "cum production">> + puts + <<set $slaves[$i].diet = "cum production">> + <<else>> + keeps + <</if>> + $slaves[$i].slaveName on a diet designed to make her cum harder and stronger. +<<else>> + $HeadGirl.slaveName thinks $slaves[$i].slaveName is fine as is + <<if $slaves[$i].diet != "healthy">> + and puts her on a normal diet. + <<set $slaves[$i].diet = "healthy">> + <<else>> + and keeps her on her healthy diet + <</if>> <</if>> <<if $HGSuiteHormones != 0 && $slaves[$i].hormones != 2>>