From 6fbf58fe01e0048b361c07e9c3287d8241e415f0 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Sat, 23 Sep 2017 00:22:28 -0400 Subject: [PATCH] Fixes --- src/pregmod/widgets/slaveSummaryWidgets.tw | 2 +- src/uncategorized/SFMBarracks.tw | 2 +- src/uncategorized/securityForceProposal.tw | 14 +++++++------- src/utility/miscWidgets.tw | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/pregmod/widgets/slaveSummaryWidgets.tw b/src/pregmod/widgets/slaveSummaryWidgets.tw index 163a3c30b1f..e44c77edaf3 100644 --- a/src/pregmod/widgets/slaveSummaryWidgets.tw +++ b/src/pregmod/widgets/slaveSummaryWidgets.tw @@ -2407,7 +2407,7 @@ _Slave.faceShape face. <<set _relationshipHandled = 1>> <</if>> <</if>> - <<elseif _Slave.father == -1>> + <<elseif _Slave.father == -1 && _Slave.mother != -1>> Your daughter <<if _Slave.relationship == -3>> & wife diff --git a/src/uncategorized/SFMBarracks.tw b/src/uncategorized/SFMBarracks.tw index aa33692dc9e..52cd39e6f7a 100644 --- a/src/uncategorized/SFMBarracks.tw +++ b/src/uncategorized/SFMBarracks.tw @@ -548,7 +548,7 @@ Increase crew comfort and life support systems to increase operational time. <</if>> <<if $securityForceAircraftCarrier < 1 && $securityForceUpgradeToken == 0 && $terrain == "oceanic">> - <<link "Ask The Colonel to 'borrow' a aircraft carrier">> + <<link "Ask The Colonel to 'borrow' an aircraft carrier">> <<replace "#result2">> "Sure, boss." she says, nodding. "A aircraft carrier would help a lot." She laughs. "The scum out there don't seem to like it when we have things that their shit equipment can't damage." She picks up a tablet and taps a few commands on it. "I'll get right on it." <<set $securityForceUpgradeToken = 1>> diff --git a/src/uncategorized/securityForceProposal.tw b/src/uncategorized/securityForceProposal.tw index 088f3deeb3e..c0dc66b3898 100644 --- a/src/uncategorized/securityForceProposal.tw +++ b/src/uncategorized/securityForceProposal.tw @@ -17,18 +17,18 @@ Such a force would solve many problems. More soldiers would mean more control, w ''This is a unique and very important opportunity'', and is possible only because of your recent victory over the Daughters. If you do not seize it, the memories and fears of your citizens will fade, and you will not be able to raise the matter again. -------------------- <<set $securityForceEventSeen = 1>> +<<if ($PC.warfare >= 100)>> + <<set _price = 10000>> +<<elseif ($PC.warfare >= 50) || ($PC.career == "arcology owner")>> + <<set _price = 15000>> +<<else>> + <<set _price = 20000>> +<</if>> <span id="result"> <<link "Prepare for an announcement">> <<replace "#result">> You instruct $assistantName to announce to the arcology's citizenry that you will be making an important announcement in the near future regarding the security situation. Given the damage still present from the Daughters' attack, everyone will be turning in. You also instruct your assistant to begin quietly investigating potential leadership figures for the force itself. <<set $securityForceCreate = 1>> - <<if ($PC.warfare >= 100)>> - <<set _price = 10000>> - <<elseif ($PC.warfare >= 50) || ($PC.career == "arcology owner")>> - <<set _price = 15000>> - <<else>> - <<set _price = 20000>> - <</if>> <<set $cash -= _price>> <<set $nextButton = "Continue">> <</replace>> diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw index c718f3f8f95..6f1ca22b881 100644 --- a/src/utility/miscWidgets.tw +++ b/src/utility/miscWidgets.tw @@ -1624,7 +1624,7 @@ <<set $SEnunciate = "S">> <<set $ssEnunciate = "ss">> <<set $cEnunciate = "c">> - <<set $cEnunciate = "cc">> + <<set $ccEnunciate = "cc">> <<set $zEnunciate = "z">> <</if>> <</widget>> -- GitLab