From e9c36e894cd6177fd8c223a72772df9f314e56ee Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Wed, 21 Mar 2018 15:19:14 -0400
Subject: [PATCH] fixes and typos
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 6 ++++++
src/SecExp/secExpSmilingMan.tw | 2 +-
src/pregmod/csec.tw | 4 +++-
src/pregmod/eliteTakeOverResult.tw | 12 ++++++------
src/pregmod/widgets/pregmodWidgets.tw | 4 +++-
src/uncategorized/officeDescription.tw | 2 +-
src/uncategorized/randomNonindividualEvent.tw | 2 +-
src/uncategorized/reRecruit.tw | 12 +++++++-----
src/uncategorized/reputation.tw | 2 +-
src/uncategorized/saDiet.tw | 2 +-
10 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 8a198490471..30ba6fe3c63 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 c4d869b8e11..2c1f34985eb 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 7f0b834a853..9e261a5783b 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 0579fa894a7..785f30cfbbe 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 36be3568b6f..7a3211072bc 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 06575fa66fb..5f4e17f13fe 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 6bb237ccc05..f55b6c443ae 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 343729cecc9..8f1cccec2f7 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 e701ea3e30d..8bda45b0b3a 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 d358c21fdd7..e5d2b704f21 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>>
--
GitLab