diff --git a/sanityCheck b/sanityCheck index 4b5f3e59009361e33338d84d0dbb3e2797b747ff..d743690cfc41807e956605591636171a4bf67336 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 ff34dbbacb8e9b52f1d29c16ad9772d171fe6e9e..3d53901042404c539a830d8a27f5a01f7e1a5768 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 1c5b675ddf3ff58119ea77f7ab9cad28927c43f0..96a033e5fe69384a40d5afcf3b102cc18325cade 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 39a584a6f8ad64e83f829afaf70b054d5caf73c4..b2ddbf17ba05671a16155bfc8dd94c211eb439f9 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>>