From eacc287f6fd8dc62cce2d26ee631c6b88bbfdc06 Mon Sep 17 00:00:00 2001 From: kopareigns <kopareigns@gmail.com> Date: Thu, 10 Jan 2019 19:44:27 -0500 Subject: [PATCH] Minor fixes and sanityCheck update --- sanityCheck | 4 ++-- src/gui/Encyclopedia/encyclopedia.tw | 8 ++++---- src/pregmod/fSlaveSelfImpreg.tw | 2 +- src/uncategorized/newSlaveIntro.tw | 4 ++-- src/utility/descriptionWidgetsFlesh.tw | 8 ++++---- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/sanityCheck b/sanityCheck index 387055bf566..efd3d13c7d5 100755 --- a/sanityCheck +++ b/sanityCheck @@ -94,8 +94,8 @@ $GREP 'if $ ' -- 'src/*' | myprint "missing ; before statement" $GREP 'elseif $ ' -- 'src/*' | myprint "missing ; before statement" # Check for a . inside a <<>> $GREP "<<[a-zA-Z]\([^\"'>]\|[^\"'>]>[^\"'>]\)*[a-zA-Z][.][^a-zA-Z]" | myprint "StrangeCharacterAfterDot" -# Check for @@. instead of .@@ TODO: get this to work -$GREP -e "@@(\.|,|;)\s" -- src/*.tw | myprint "WrongSelectorPunctuation" +# Check for @@. instead of .@@ +$GREP -E "@@(\.|,|;|:)\s" -- src/*.tw | myprint "WrongSelectorPunctuation" # Check that we do not have any variables that we use only once. e.g. $onlyUsedOnce # Ignore *Nationalities diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw index e928106cf1e..c05a40ff15a 100644 --- a/src/gui/Encyclopedia/encyclopedia.tw +++ b/src/gui/Encyclopedia/encyclopedia.tw @@ -403,7 +403,7 @@ SLAVES <<case "Trust">> ''Trust'' is a measure of a slave's expectations of the player character, and secondarily, how confident she is of her ability to do well. (Low trust is also referred to as fear.) Along with @@.hotpink;[[devotion|Encyclopedia][$encyclopedia = "From Rebellious to Devoted"]],@@ it is the main measure of a slave's mental state. A highly trusting slave is often more expensive to keep, but will do better in a leadership position and is more valuable. Slaves who are not intended for special assignments or resale can usually be kept terrified. - <br><br>This can become negative if a slave is not sufficiently @@.hotpink;[[devoted|Encyclopedia][$encyclopedia = "From Rebellious to Devoted"]]@@: in this case, she will not obey since she neither likes nor fears the player character. Many game mechanics can effect trust in some way: @@.mediumaquamarine;aquamarine text@@ text indicates a trust gain, while @@.gold;gold@@ indicates a trust loss. Maximized or minimized trust is somewhat sticky: lightly abusing a perfectly trusting slave will not damage trust, while minor confidence boosts will not affect an abjectly terrified slave. Extremely high trust will boost Devotion weekly, and any trust gains that push it over its maximum value will overflow into Devotion. If both are maximized, the slave's sex drive is increased. If she's already a nympho, Reputation is increased instead. + <br><br>This can become negative if a slave is not sufficiently @@.hotpink;[[devoted|Encyclopedia][$encyclopedia = "From Rebellious to Devoted"]]:@@ in this case, she will not obey since she neither likes nor fears the player character. Many game mechanics can effect trust in some way: @@.mediumaquamarine;aquamarine text@@ text indicates a trust gain, while @@.gold;gold@@ indicates a trust loss. Maximized or minimized trust is somewhat sticky: lightly abusing a perfectly trusting slave will not damage trust, while minor confidence boosts will not affect an abjectly terrified slave. Extremely high trust will boost Devotion weekly, and any trust gains that push it over its maximum value will overflow into Devotion. If both are maximized, the slave's sex drive is increased. If she's already a nympho, Reputation is increased instead. <<case "Drugs and Their Effects">> @@ -1941,7 +1941,7 @@ FUTURE SOCIETIES <<case "Edo Revivalism">> - ''Edo Revivalism'' is a future society model which approves of provision for the arcology's cultural development by providing a large number of public servants or club girls, which increases with @@.green;[[reputation|Encyclopedia][$encyclopedia = "Arcologies and Reputation"]]@@; disapproves of failure to do so. + ''Edo Revivalism'' is a future society model which approves of provision for the arcology's cultural development by providing a large number of public servants or club girls, which increases with @@.green;[[reputation|Encyclopedia][$encyclopedia = "Arcologies and Reputation"]];@@ disapproves of failure to do so. <br> Improves efficiency of public servants and club girls. <br> Greatly improves beauty of Japanese slaves. <br> Can be developed to greatly improve the efficiency of direct spending on future societies. @@ -1950,7 +1950,7 @@ FUTURE SOCIETIES <<case "Arabian Revivalism">> - ''Arabian Revivalism'' is a future society model which approves of keeping a large number of fucktoys and slaves in the master suite, which increases with @@.green;[[reputation|Encyclopedia][$encyclopedia = "Arcologies and Reputation"]]@@; disapproves of failure to do so. + ''Arabian Revivalism'' is a future society model which approves of keeping a large number of fucktoys and slaves in the master suite, which increases with @@.green;[[reputation|Encyclopedia][$encyclopedia = "Arcologies and Reputation"]];@@ disapproves of failure to do so. <br> Grants a bonus to the price received when selling slaves. <br> Can be developed to improve the efficiency of direct spending on future societies and moderately increase rents. <br> Provides demand for more @@.hotpink;[[devoted|Encyclopedia][$encyclopedia = "From Rebellious to Devoted"]]@@ slaves from [[the corporation|Encyclopedia][$encyclopedia = "The Corporation"]]. @@ -2887,7 +2887,7 @@ LORE: INTERVIEWS <dl> <dt>Childhood Fertility Induced NCS</dt> <dd> - This uses a designer retrograde virus to set the genetic markers for the Neotenic Complex Syndrome, a syndrome originally called Syndrome X discovered in the early 2000s. In layman's terms, it @@.gold;suppresses the growth and secondary sexual characteristics of slaves@@; both male and female. The original condition was usually fatal or dangerous. This modified version of the genetic flaw is not harmful (relatively speaking), and in addition to the growth blockage, it permits the slave to continue the @@.lime;development of gonads@@ at a slightly faster than normal pace. Secondary sexual characteristics are also reversed, though interestingly enough, pregnancy is still possible.Slaves put on this genetic engineered blend will be permanently changed and will no longer grow in stature or assets without severe chemical assistance, and even then at a reduced rate when compared to non-NCS-induced slaves, and should their ongoing growth treatments stop they will slowly regress back to the physicality of a child.<br><br> + This uses a designer retrograde virus to set the genetic markers for the Neotenic Complex Syndrome, a syndrome originally called Syndrome X discovered in the early 2000s. In layman's terms, it @@.gold;suppresses the growth and secondary sexual characteristics of slaves;@@ both male and female. The original condition was usually fatal or dangerous. This modified version of the genetic flaw is not harmful (relatively speaking), and in addition to the growth blockage, it permits the slave to continue the @@.lime;development of gonads@@ at a slightly faster than normal pace. Secondary sexual characteristics are also reversed, though interestingly enough, pregnancy is still possible.Slaves put on this genetic engineered blend will be permanently changed and will no longer grow in stature or assets without severe chemical assistance, and even then at a reduced rate when compared to non-NCS-induced slaves, and should their ongoing growth treatments stop they will slowly regress back to the physicality of a child.<br><br> @@.red;The genetic tampering is considered illegal,@@ but there is also a @@.yellow;moral question as this abrogates the rights of slaves to ever grow up.@@<br><br> Can only be purchased in [[The Black Market|Encyclopedia][$encyclopedia = "The Black Market"]]. </dd> diff --git a/src/pregmod/fSlaveSelfImpreg.tw b/src/pregmod/fSlaveSelfImpreg.tw index aa4a92fa6c7..04edc25a2eb 100644 --- a/src/pregmod/fSlaveSelfImpreg.tw +++ b/src/pregmod/fSlaveSelfImpreg.tw @@ -23,7 +23,7 @@ <<set _coop = false>> <<set $activeSlave.devotion -= 2>> <<elseif (_pfh)>> - but, despite the @@;indignity@@ of the situation, $his resistance seems strangely muted. It's fairly obvious that something about the idea of being impregnated is @@.hotpink;strangely appealing@@ to $him. + but, despite the @@.mediumorchid;indignity@@ of the situation, $his resistance seems strangely muted. It's fairly obvious that something about the idea of being impregnated is @@.hotpink;strangely appealing@@ to $him. <<set _coop = false>> <<set $activeSlave.devotion -= 4>> <<else>> diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw index 7f587894c54..b007d888629 100644 --- a/src/uncategorized/newSlaveIntro.tw +++ b/src/uncategorized/newSlaveIntro.tw @@ -268,11 +268,11 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' << <</if>> <<if ($PC.career == "escort")>> - $He recognizes you as a whore, leading $him to @@.mediumaquamarine;fear you less@@; however, $his views of you also leave $him less willing to @@.mediumorchid;listen to you.@@ + $He recognizes you as a whore, leading $him to @@.mediumaquamarine;fear you less;@@ however, $his views of you also leave $him less willing to @@.mediumorchid;listen to you.@@ <<set $activeSlave.devotion -= 10>> <<set $activeSlave.trust += 10>> <<elseif ($PC.career == "servant")>> - Seeing you in your <<if $PC.title == 0>>maid's dress<<else>>maid's outfit<</if>> @@.mediumaquamarine;calms $his fears@@; however, $he is unwilling to @@.mediumorchid;listen to a servant.@@ + Seeing you in your <<if $PC.title == 0>>maid's dress<<else>>maid's outfit<</if>> @@.mediumaquamarine;calms $his fears;@@ however, $he is unwilling to @@.mediumorchid;listen to a servant.@@ <<set $activeSlave.devotion -= 3>> <<set $activeSlave.trust += 10>> <<elseif ($PC.career == "gang")>> diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw index 9c5185ab085..ef33cea7713 100644 --- a/src/utility/descriptionWidgetsFlesh.tw +++ b/src/utility/descriptionWidgetsFlesh.tw @@ -16418,11 +16418,11 @@ $He has <<elseif $activeSlave.nationality == "Stateless">> $He has spent so much time in the Free Cities that their statelessness is effectively $his nationality; ethnically, $he's <<elseif $activeSlave.nationality == "Zimbabwean" && $activeSlave.race == "white">> - $He's originally @@.tan;Rhodesian@@; ethnically, $he's + $He's originally @@.tan;Rhodesian;@@ ethnically, $he's <<elseif $activeSlave.nationality == "Vatican">> - $He's originally @@.tan;from Vatican City@@; ethnically, $he's + $He's originally @@.tan;from Vatican City;@@ ethnically, $he's <<else>> - $He's originally @@.tan;<<print $activeSlave.nationality>>@@; ethnically, $he's + $He's originally @@.tan;<<print $activeSlave.nationality>>;@@ ethnically, $he's <</if>> @@.tan;<<print $activeSlave.race>>,@@ and $his skin is <<print $activeSlave.skin>><<if $activeSlave.markings == "freckles">> and lightly freckled<<if (($activeSlave.skin == "pale") || ($activeSlave.skin == "fair")) && ($activeSlave.hColor != "red")>>, an attractive combination<</if>><<elseif $activeSlave.markings == "heavily freckled">> and heavily freckled<<if (($activeSlave.skin == "pale") || ($activeSlave.skin == "fair")) && ($activeSlave.hColor != "red")>>, an attractive combination<</if>><</if>>. <<if $activeSlave.race != $activeSlave.origRace && $saleDescription != 1>> @@ -16894,7 +16894,7 @@ $He has <<elseif $activeSlave.fuckdoll > 0>> $activeSlave.slaveName is a @@.pink;quadruple amputee,@@ making $him a convenient torso-only sex toy. <<else>> - The most obvious thing about $activeSlave.slaveName is that $he is a @@.pink;quadruple amputee@@: $he has neither arms nor legs. + The most obvious thing about $activeSlave.slaveName is that $he is a @@.pink;quadruple amputee:@@ $he has neither arms nor legs. <</if>> <</if>> -- GitLab