From 0d709e124d57b4166bceb8b22b0011562ce5e43d Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Sun, 19 Mar 2017 00:48:06 -0400 Subject: [PATCH] Bugfixes and some cleaning. --- src/events/intro/initNationalities.tw | 2 +- src/npc/acquisition.tw | 7 ++++++- src/uncategorized/clinicReport.tw | 2 +- src/uncategorized/newGamePlus.tw | 4 ++++ src/uncategorized/saLongTermEffects.tw | 8 ++++---- 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw index eeafb2b71d5..59aa557138b 100644 --- a/src/events/intro/initNationalities.tw +++ b/src/events/intro/initNationalities.tw @@ -47,7 +47,7 @@ <<set $cash += 10000>> <<elseif $PC.rumor is "social engineering">> <<set $FSAnnounced to 1>> - <<set $FSCredits to 1>> + <<set $FSCredits++>> <<elseif $PC.rumor is "luck">> <<set $rep += 4000>> <</if>> diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw index 23b97b50952..f7dd670c73f 100644 --- a/src/npc/acquisition.tw +++ b/src/npc/acquisition.tw @@ -118,6 +118,11 @@ The previous owner seems to have left in something of a hurry. They could not get all of their personal effects away. Since they <<if $targetArcology.type == "Multiculturalist">>tried to sample different kinds of sexual slavery<<else>>did not have the time in control of the arcology to develop a specific stable of sex slaves<</if>>, their slaves were quite varied. <</if>> +<<if ($targetArcology.type != "New")>> + <<set $FSAnnounced to 1>> + <<set $FSCredits++>> +<</if>> + <<set $heroSlaves to $heroSlaves.shuffle()>> <<set _valueGiven to 0>> <<if $ageMode == 1>> @@ -413,7 +418,7 @@ The previous owner seems to have left in something of a hurry. <<include "Generate XX Slave">> <<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(-25,-45), $activeSlave.health = random(55,65)>> <<set $activeSlave.face = random(1,3)>> - <<set $activeSlave.preg = random(10,35),$activeSlave.pregType = random(3,5) , $activeSlave.lactation = 1>> + <<set $activeSlave.preg = random(10,35),$activeSlave.pregType = random(3,5), $activeSlave.lactation = 1>> <<set $activeSlave.birthsTotal = 5>> <<set $activeSlave.bellySag = 20>> <<if $activeSlave.vagina > -1>> diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw index 0f3418d41f4..31c3f2dfe10 100644 --- a/src/uncategorized/clinicReport.tw +++ b/src/uncategorized/clinicReport.tw @@ -143,7 +143,7 @@ <<set $slaves[_i].chem -= 5>> <<if $clinicUpgradePurge == 1>> <<set $slaves[_i].chem -= 50>> - <<set slaves[_i].chem = Math.clamp($slaves[_i].chem, 0, 10000)>> + <<set $slaves[_i].chem = Math.clamp($slaves[_i].chem, 0, 10000)>> <<if $slaves[_i].health > -50>> <<set $slaves[_i].health = -50>> <</if>> diff --git a/src/uncategorized/newGamePlus.tw b/src/uncategorized/newGamePlus.tw index 9790c97096a..56ae9d44b39 100644 --- a/src/uncategorized/newGamePlus.tw +++ b/src/uncategorized/newGamePlus.tw @@ -21,6 +21,8 @@ You have the funds to bring $slavesToImportMax slaves with you (or your equivale You lack the funds to bring more than $slavesToImportMax slaves with you (or your equivalent) to a new arcology. It would cost <<print 50000+($slavesToImportMax*10000)>>¤ to guarantee another's safe transfer. <</if>> +<br> + <<if $freshPC == 0>> <<if $retainCareer == 1 && $PC.career != "arcology owner">> <<if $week > 52>> @@ -43,6 +45,8 @@ You have the funds to bring $slavesToImportMax slaves with you (or your equivale [[Use existing player character.|New Game Plus][$freshPC = 0]] <</if>> +<br><br> + Select up to $slavesToImportMax slaves to be imported into a new game and then [[click here.|init][$saveImported to 1]] <br><br>''These slaves will be imported into the new game:'' diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index ed989ad4239..3ede07bc695 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -3915,7 +3915,7 @@ and ($slaves[$i].clothes != "a slutty qipao") and ($slaves[$i].clothes != "restr <<if $slaves[$i].bellySag > 0>> <<if $slaves[$i].preg < 10 && $slaves[$i].inflation == 0 && $slaves[$i].bellyImplant < 2000>> -<<if $slaves[$i].muscles >= 3>> +<<if $slaves[$i].muscles > 95>> <<if (random(1,100) > 1)>> $possessiveCap stretched, extreme muscles @@color:green;firm up readily@@ after $possessive pregnancy. <<set $slaves[$i].bellySag -= 0.5>> @@ -3923,7 +3923,7 @@ and ($slaves[$i].clothes != "a slutty qipao") and ($slaves[$i].clothes != "restr <<set $slaves[$i].bellySag = 0>> <</if>> <</if>> -<<elseif $slaves[$i].muscles > 1>> +<<elseif $slaves[$i].muscles >= 30>> <<if (random(1,100) > 20)>> $possessiveCap stretched, muscular belly @@color:green;firms up@@ after $possessive pregnancy. <<set $slaves[$i].bellySag -= 0.4>> @@ -3931,7 +3931,7 @@ and ($slaves[$i].clothes != "a slutty qipao") and ($slaves[$i].clothes != "restr <<set $slaves[$i].bellySag = 0>> <</if>> <</if>> -<<elseif $slaves[$i].muscles > 0>> +<<elseif $slaves[$i].muscles >= 5>> <<if (random(1,100) > 40)>> $possessiveCap stretched, toned belly @@color:green;firms up@@ after $possessive pregnancy. <<set $slaves[$i].bellySag -= 0.3>> @@ -3955,7 +3955,7 @@ and ($slaves[$i].clothes != "a slutty qipao") and ($slaves[$i].clothes != "restr <<if $slaves[$i].fuckdoll == 0>> <<if $slaves[$i].fetish != "mindbroken">> <<if ($slaves[$i].fetish == "none" || $slaves[$i].fetishStrength <= 10) && $slaves[$i].devotion > 20 && random(1,100) > 75>> - Having an implant simulating pregnancy drives her to begin @@color:lightcoral;begin fantasizing about being actually pregnant.@@ + Having an implant simulating pregnancy drives her to @@color:lightcoral;begin fantasizing about being actually pregnant.@@ <<set $slaves[$i].fetish = "pregnancy">> <</if>> <</if>> -- GitLab