From b3f793b09caa016972dff4776fdf6e848ee89f8b Mon Sep 17 00:00:00 2001
From: pregmodfan <pregmodfan@cock.li>
Date: Thu, 15 Jun 2017 23:08:51 +0300
Subject: [PATCH] sanityCheck now can find <<< and fixed three cases of it
---
sanityCheck | 2 ++
src/pregmod/widgets/pregmodWidgets.tw | 2 +-
src/uncategorized/brothelAdvertisement.tw | 2 +-
src/uncategorized/saRelationships.tw | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/sanityCheck b/sanityCheck
index 4b5f3e59009..d743690cfc4 100755
--- a/sanityCheck
+++ b/sanityCheck
@@ -47,6 +47,8 @@ $GREP -e "<<.*[(][^<>)]*[(][^<>)]*)\?[^<>)]*>>" -- "src/*" | myprint "MissingClo
$GREP "<<[^<>]*[^,\"\[{"$'\r]\r'"\?$" -- 'src/*' | myprint "MissingClosingAngleBrackets"
# Check for too many >>>. e.g.: <</if>>>
$GREP "<<[^<>]*[<>]\?[^<>]*>>>" -- "src/*.tw" | myprint "TooManyAngleBrackets"
+# Check for too many <<<. e.g.: <<</if>>
+$GREP "<<<[^<>]*[<>]\?[^<>]*>>" -- "src/*.tw" | myprint "TooManyAngleBrackets"
# Check for wrong capitalization on 'activeslave' and other common typos
$GREP -e "\$act" --and --not -e "\$\(activeSlave\|activeArcology\|activeStandard\|activeOrgan\|activeLimbs\)" -- "src/*" | myprint "WrongCapitilization"
$GREP "\(csae\|[a-z] She \|attepmts\|youreslf\|advnaces\)" -- 'src/*' | myprint "SpellCheck"
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index ff34dbbacb8..3d539010424 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -659,7 +659,7 @@ $activeSlave.slaveName is up for review:
<<switch $activeSlave.nationality>>
<<case "Uzbek" "Kazakh" "Belarusian" "Armenian">>
and, in keeping with her heritage, a Kalashnikov AK-74M assault rifle
- <<<case "Russian">>
+ <<case "Russian">>
and, in keeping with her heritage, an Izhmash AN-94 Abakan assault rifle
<<case "Ukrainian">>
and, in keeping with her heritage, a Fort-227 assault rifle
diff --git a/src/uncategorized/brothelAdvertisement.tw b/src/uncategorized/brothelAdvertisement.tw
index 1c5b675ddf3..96a033e5fe6 100644
--- a/src/uncategorized/brothelAdvertisement.tw
+++ b/src/uncategorized/brothelAdvertisement.tw
@@ -35,7 +35,7 @@
$brothelNameCaps is decorated to look like a club. Loud music is playing, and the whores that aren't with customers are stripping on a stage. There is a distinct smell of sweat, and there is as much emphasis on the strippers' muscles as their breasts.
<<case "Subjugationist">>
$brothelNameCaps is decorated to celebrate the degradation of $arcologies[0].FSSubjugationistRace whores. The whores greet customers in stereotypical $arcologies[0].FSSubjugationistRace accents.
-<<<<case "Supremacist">>
+<<case "Supremacist">>
$brothelNameCaps is decorated like an old world gentleman's club. The pictures on the wall depict degradation of every race on earth, except $arcologies[0].FSSupremacistRace people.
<<case "Paternalist">>
$brothelNameCaps is decorated to look like a normal bar. Whores are encouraged to meet customers for a drink and get to know them a little before heading back into a private room.
diff --git a/src/uncategorized/saRelationships.tw b/src/uncategorized/saRelationships.tw
index 39a584a6f8a..b2ddbf17ba0 100644
--- a/src/uncategorized/saRelationships.tw
+++ b/src/uncategorized/saRelationships.tw
@@ -933,7 +933,7 @@
<<set _SlaveI.relationship++, _SlaveJ.relationship = _SlaveI.relationship>>
<<elseif $familyTesting == 1 && (_SlaveI.energy > 95) && (_SlaveI.mother == _SlaveJ.ID || _SlaveI.father == _SlaveJ.ID || _SlaveJ.mother == _SlaveI.ID || _SlaveJ.father == _SlaveI.ID || areSisters(_SlaveI, _SlaveJ) > 0) && (random(1,100) > (90-$seed))>>
Driven by nymphomania to attempt to have sex with everyone, _SlaveJ.slaveName successfully seduces _SlaveJ.slaveName and they become @@.lightgreen;friends with benefits.@@
- <<<set _SlaveI.relationship++, _SlaveJ.relationship = _SlaveI.relationship>>
+ <<set _SlaveI.relationship++, _SlaveJ.relationship = _SlaveI.relationship>>
<<elseif (_SlaveI.energy > 95) && (_SlaveI.relation != 0) && (_SlaveI.relationTarget == _SlaveI.relationshipTarget) && (random(1, 100) > (90 - $seed))>>
Driven by nymphomania to attempt to have sex with everyone, _SlaveI.slaveName successfully seduces _SlaveJ.slaveName and they become @@.lightgreen;friends with benefits.@@
<<set _SlaveI.relationship++, _SlaveJ.relationship = _SlaveI.relationship>>
--
GitLab