diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 8a1984904719b96a4b4104d92d3ef300d8933165..30ba6fe3c6342e4378955f11668671045a86c139 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -2,6 +2,12 @@ 0.10.7.0/1 +3/21/2018 + + 404 + -numerous reported bugs fixed + -also a few typos + 3/20/2018 403.1 diff --git a/src/SecExp/secExpSmilingMan.tw b/src/SecExp/secExpSmilingMan.tw index c4d869b8e11dbbb5d136313264b7d587a0889313..2c1f34985eb8e05c2b40266cc9ea7d31c650f31b 100644 --- a/src/SecExp/secExpSmilingMan.tw +++ b/src/SecExp/secExpSmilingMan.tw @@ -63,7 +63,7 @@ <<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event">> <br> - You just reached your penthouse, when your faithful assistant appears in front of you, evidently exited. + You just reached your penthouse, when your faithful assistant appears in front of you, evidently excited. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, I have just received news of a new attack by the Smiling Man. It appears just a few hours ago he infiltrated another arcology and caused a catastrophic failure of its power plant. Between old debts and the loss of value for his shares, the owner went bankrupt in minutes. It seems the Smiling Man managed to keep a small auxiliary generator functioning enough to project a giant holographic picture of his symbol on the arcology's walls. You can say whatever you want about him, but he has style... Anyway this opens up a great opportunity to gain control of the structure for ourselves." diff --git a/src/pregmod/csec.tw b/src/pregmod/csec.tw index 7f0b834a853f2f7ab0f504b20c9d67a774cd6d14..9e261a5783b517218e073f7564d363e28a2df5b6 100644 --- a/src/pregmod/csec.tw +++ b/src/pregmod/csec.tw @@ -64,7 +64,7 @@ /* ------------------------------------------------ */ -Performing a cesarean section is trivial for the remote surgery for the remote surgery to carry out. $activeSlave.slaveName is sedated, her child<<if _curBabies > 1>>ren<</if>> extracted, and taken to a bed to recover. By the time she comes to, +Performing a cesarean section is trivial for the remote surgery to carry out. $activeSlave.slaveName is sedated, her child<<if _curBabies > 1>>ren<</if>> extracted, and taken to a bed to recover. By the time she comes to, <<if _curBabies >0 >> <<if $activeSlave.pregSource == -1>> your @@ -222,6 +222,8 @@ Performing a cesarean section is trivial for the remote surgery for the remote s <<set $nextButton = "Back">><<UpdateNextButton>> /* unlock Continue button */ <</link>> //Will cost <<print cashFormat(500)>> weekly// + <<else>> + <<set $nextButton = "Back">><<UpdateNextButton>> /* unlock Continue button */ <</if>> </span> <</if>> diff --git a/src/pregmod/eliteTakeOverResult.tw b/src/pregmod/eliteTakeOverResult.tw index 0579fa894a779a3a07e51cc20e21d773516c92cf..785f30cfbbefe4d73b3475ee4216b4462cfd1840 100644 --- a/src/pregmod/eliteTakeOverResult.tw +++ b/src/pregmod/eliteTakeOverResult.tw @@ -115,11 +115,11 @@ <<else>> <<include "Generate XY Slave">> <</if>> - <<set _origin = "She was a member of the SocialElite, captured in their failed attempt at expressing their displeasure">> + <<set _origin = "She was a member of the Societal Elite, captured in their failed attempt at expressing their displeasure">> <<set $activeSlave.origin = _origin>> - <<set $activeSlave.career = "member of the SocialElite">> + <<set $activeSlave.career = "a member of the Societal Elite">> <<set $activeSlave.prestige = either(2,2,3)>> /* 33% chance of getting level 3 prestige */ - <<set $activeSlave.prestigeDesc = "She was a member of the SocialElite.">> + <<set $activeSlave.prestigeDesc = "She was a member of the Societal Elite.">> <<set $activeSlave.face = random(25,76)>> <<set $activeSlave.devotion = random(-10,-20)>> <<set $activeSlave.trust = random(-20,-30)>> @@ -150,11 +150,11 @@ <<else>> <<include "Generate XY Slave">> <</if>> - <<set _origin = "She was a member of the SocialElite, captured in their failed attempt at expressing their displeasure">> + <<set _origin = "She was a member of the Societal Elite, captured in their failed attempt at expressing their displeasure">> <<set $activeSlave.origin = _origin>> - <<set $activeSlave.career = "member of the SocialElite">> + <<set $activeSlave.career = "amember of the Societal Elite">> <<set $activeSlave.prestige = either(2,2,3)>> - <<set $activeSlave.prestigeDesc = "She was a member of the SocialElite.">> + <<set $activeSlave.prestigeDesc = "She was a member of the Societal Elite.">> <<set $activeSlave.face = random(25,76)>> <<set $activeSlave.devotion = random(-10,-20)>> <<set $activeSlave.trust = random(-20,-30)>> diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw index 36be3568b6fe213390b8f273468dac9344126725..7a3211072bc95e71207bd527792c3adcbd67f7be 100644 --- a/src/pregmod/widgets/pregmodWidgets.tw +++ b/src/pregmod/widgets/pregmodWidgets.tw @@ -1916,7 +1916,9 @@ Of $possessive $slaves[$i].pregType child<<if $slaves[$i].pregType > 1>>ren<</if Call as <<HSM>> %/ <<widget "HSM">> - <<if $PC.hacking <= -100>> + <<if ndef $PC.hacking>> + <<set $PC.hacking = 1, $HackingSkillMultiplier = 1>> + <<elseif $PC.hacking <= -100>> <<set $HackingSkillMultiplier = 1.5>> <<elseif $PC.hacking <= -75>> <<set $HackingSkillMultiplier = 1.35>> diff --git a/src/uncategorized/officeDescription.tw b/src/uncategorized/officeDescription.tw index 06575fa66fb5ec67b5173aafa1d7d9c4fd9053c1..5f4e17f13fe41dfdbba4308a26b9a6211c3f65d5 100644 --- a/src/uncategorized/officeDescription.tw +++ b/src/uncategorized/officeDescription.tw @@ -125,7 +125,7 @@ <<case "chinese revivalist">> she's depicted wearing colorful silk robes; she's pulled them open to flash her lovely body. <<case "chattel religionist">> - she's depicted striking a sexy pose, chosen specifically to draw attention to the symbols of your relgion that adorn her nipples. + she's depicted striking a sexy pose, chosen specifically to draw attention to the symbols of your religion that adorn her nipples. <<case "repopulation focus">> she's depicted strinking a sexy pose made to draw the eye to her pregnant belly. <<case "eugenics">> diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw index 6bb237ccc05d38e199fdde5b56a7905553be8a7d..f55b6c443ae90052b24c2477f5f4105a3e3f4653 100644 --- a/src/uncategorized/randomNonindividualEvent.tw +++ b/src/uncategorized/randomNonindividualEvent.tw @@ -542,7 +542,7 @@ <<if $PC.hacking >= 50 && random(0,100) < $PC.hacking>> <<set $recruit.push("held POW")>> <</if>> -<<if($pedo_mode == 1 || $minimumSlaveAge <= 13) && $PC.hacking >= 100 && random(0,100) > 95 && $cash >= 500000>> +<<if($pedo_mode == 1 || $minimumSlaveAge <= 13) && $PC.hacking >= 100 && random(0,100) > 95 && $cash >= 100000>> <<set $recruit.push("rogue cyborg")>> <</if>> <<if $arcologyUpgrade.drones == 1>> diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw index 343729cecc97b519d6f1d923ff8a1e54734cf784..8f1cccec2f7cbc3ec19f4c5d21d78ed7ceb60b47 100644 --- a/src/uncategorized/reRecruit.tw +++ b/src/uncategorized/reRecruit.tw @@ -1852,9 +1852,9 @@ Your desk flags a video message as having potential. It's a rather homely farmer <<include "Generate XX Slave">> <<set $activeSlave.origin = "Her womb held a baby you desired.">> <<set $activeSlave.face = 100>> - <<set $activeSlave.intelligence = 3> + <<set $activeSlave.intelligence = 3>> <<if $activeSlave.vagina < 1>> - <<set $activeSlave.vagina = 1> + <<set $activeSlave.vagina = 1>> <</if>> <<set $activeSlave.preg = 20>> <<set $activeSlave.pregWeek = 20>> @@ -1929,7 +1929,6 @@ Your desk flags a video message as having potential. It's a rather homely farmer <</switch>> /* END SLAVE GENERATION AND INTRODUCTION */ -<<slaveCost $activeSlave>> <<switch $recruit>> <<case "female SD" "male SD" "female SD 2">> <<set $contractCost = 6000>> @@ -1946,14 +1945,17 @@ Your desk flags a video message as having potential. It's a rather homely farmer <<case "racer winner" "captured teen" "paternalist swan song" "embryo appropriation">> <<set $contractCost = 10000>> <<case "rogue cyborg">> - <<set $contractCost = 500000>> - <<set $slaveCost += 800000>> + <<set $contractCost = 100000>> <<case "repo housekeeper" "repo nanny" "farm cow" "farm bull" "school sale" "school trap">> <<set $contractCost = 2500>> <<default>> <<set $contractCost = 1000>> <</switch>> +<<slaveCost $activeSlave>> <<set $slaveCost -= $contractCost>> +<<if $recruit == "rogue cyborg">> + <<set $slaveCost += 300000>> +<</if>> <br><br> diff --git a/src/uncategorized/reputation.tw b/src/uncategorized/reputation.tw index e701ea3e30d547649908854b264ba4425f123c7c..8bda45b0b3a99de9252dab488c74d22fd07fe825 100644 --- a/src/uncategorized/reputation.tw +++ b/src/uncategorized/reputation.tw @@ -319,7 +319,7 @@ On formal occasions, you are announced as $PCTitle. <</if>> <</if>> -<<if ($PC.belly >= 1500) || ($PC.career == "escort" && $PC.belly >= 500)>> +<<if (($PC.belly >= 1500) || ($PC.career == "escort" && $PC.belly >= 500)) && $PC.preg > 0>> <<if $arcologies[0].FSRestart != "unset">> <<if $arcologies[0].FSRestartDecoration == 100>> <<if $PC.pregSource != -1>> diff --git a/src/uncategorized/saDiet.tw b/src/uncategorized/saDiet.tw index d358c21fdd742ddd250d0828ff34774ecdfb8bbf..e5d2b704f217c19416e159e9a752de4d0b56f502 100644 --- a/src/uncategorized/saDiet.tw +++ b/src/uncategorized/saDiet.tw @@ -449,7 +449,7 @@ Hormonal changes encourage her body to @@.lime;grow softer.@@ <<set $slaves[$i].weight += 1>> <</if>> - <<if (($slaves[$i].boobs < 500)>> + <<if ($slaves[$i].boobs < 500)>> Her breasts @@.lime;grow slightly@@ from the estrogen. <<set $slaves[$i].boobs += 10>> <</if>>