Skip to content
Snippets Groups Projects
Commit 841cbb6a authored by Pregmodder's avatar Pregmodder
Browse files

Merge branch 'pregmod-dev' into 'pregmod-master' 

sanityCheck now can find <<< and fixed three cases of it

See merge request !427
parents 76a46510 b3f793b0
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
sanityCheck
+ 2
− 0
View file @ 841cbb6a
...@@ -47,6 +47,8 @@ $GREP -e "<<.*[(][^<>)]*[(][^<>)]*)\?[^<>)]*>>" -- "src/*" | myprint "MissingClo ...@@ -47,6 +47,8 @@ $GREP -e "<<.*[(][^<>)]*[(][^<>)]*)\?[^<>)]*>>" -- "src/*" | myprint "MissingClo
$GREP "<<[^<>]*[^,\"\[{"$'\r]\r'"\?$" -- 'src/*' | myprint "MissingClosingAngleBrackets" $GREP "<<[^<>]*[^,\"\[{"$'\r]\r'"\?$" -- 'src/*' | myprint "MissingClosingAngleBrackets"
# Check for too many >>>. e.g.: <</if>>> # Check for too many >>>. e.g.: <</if>>>
$GREP "<<[^<>]*[<>]\?[^<>]*>>>" -- "src/*.tw" | myprint "TooManyAngleBrackets" $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 # 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 -e "\$act" --and --not -e "\$\(activeSlave\|activeArcology\|activeStandard\|activeOrgan\|activeLimbs\)" -- "src/*" | myprint "WrongCapitilization"
$GREP "\(csae\|[a-z] She \|attepmts\|youreslf\|advnaces\)" -- 'src/*' | myprint "SpellCheck" $GREP "\(csae\|[a-z] She \|attepmts\|youreslf\|advnaces\)" -- 'src/*' | myprint "SpellCheck"
......
src/pregmod/widgets/pregmodWidgets.tw
+ 1
− 1
View file @ 841cbb6a
...@@ -659,7 +659,7 @@ $activeSlave.slaveName is up for review: ...@@ -659,7 +659,7 @@ $activeSlave.slaveName is up for review:
<<switch $activeSlave.nationality>> <<switch $activeSlave.nationality>>
<<case "Uzbek" "Kazakh" "Belarusian" "Armenian">> <<case "Uzbek" "Kazakh" "Belarusian" "Armenian">>
and, in keeping with her heritage, a Kalashnikov AK-74M assault rifle 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 and, in keeping with her heritage, an Izhmash AN-94 Abakan assault rifle
<<case "Ukrainian">> <<case "Ukrainian">>
and, in keeping with her heritage, a Fort-227 assault rifle and, in keeping with her heritage, a Fort-227 assault rifle
......
src/uncategorized/brothelAdvertisement.tw
+ 1
− 1
View file @ 841cbb6a
...@@ -35,7 +35,7 @@ ...@@ -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. $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">> <<case "Subjugationist">>
$brothelNameCaps is decorated to celebrate the degradation of $arcologies[0].FSSubjugationistRace whores. The whores greet customers in stereotypical $arcologies[0].FSSubjugationistRace accents. $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. $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">> <<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. $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.
......
src/uncategorized/saRelationships.tw
+ 1
− 1
View file @ 841cbb6a
...@@ -933,7 +933,7 @@ ...@@ -933,7 +933,7 @@
<<set _SlaveI.relationship++, _SlaveJ.relationship = _SlaveI.relationship>> <<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))>> <<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.@@ 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))>> <<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.@@ 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>> <<set _SlaveI.relationship++, _SlaveJ.relationship = _SlaveI.relationship>>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment