Merge branch 'wordMatching' into 'pregmod-master'

wordmatching algorithm

Closes #748

See merge request pregmodfan/fc-pregmod!4594

devTools/dictionary_phrases.txt

+# Define phrases that should be searched in src/ on every call of the java based
+# sanityCheck here.
+# Phrases will be found whenever that exact phrase appears, regardless of
+# surroundings or overlapping.
+# Format is: searchPhrase#errorMessage
+# Output is: Found searchPhrase; Error: errorMessage
+cash +=#Should be cashX()
+cash -=#Should be cashX()
+rep +=#Should be repX()
+rep -=#Should be repX()
+cash+=#Should be cashX()
+cash-=#Should be cashX()
+rep+=#Should be repX()
+rep-=#Should be repX()
+attepmts#attempts
+youreslf#yourself
+advnaces#advances
+canAcheive#canAchieve
+setBellySize#SetBellySize
+SetbellySize#SetBellySize
+setbellySize#SetBellySize
+bellypreg#bellyPreg
+bellyimplant#bellyImplant
+bellyfluid#bellyFluid
+carress#caress
+hormonebalance#hormoneBalance
+fetishknown#fetishKnown
+recieve#receive
+recieves#receives
+$slave[#Should be $slaves[
+can not#cannot
+Coca Cola#Coca-Cola
+dosen't#doesn't

sanityCheck.sh

@@ -61,9 +61,11 @@ fi
 $GREP "<<[^<>]*[<>]\?[^<>]*>>>" -- "src/*.tw" | myprint "TooManyAngleBrackets"
 # Check for wrong capitalization on 'activeslave' and other common typos
 $GREP -e "\$act" --and --not -e "\$\(activeSlave\|activeChild\|activeArcology\|activeStandard\|activeOrgan\|activeLimbs\|activeUnits\|activeCanine\|activeHooved\|activeFeline\)" -- "src/*" | myprint "WrongCapitilization"
-$GREP  "\(csae\|[a-z] She \|attepmts\|youreslf\|advnaces\|canAcheive\|setBellySize\|SetbellySize\|setbellySize\|bellypreg\|pregBelly\|bellyimplant\|bellyfluid\|pronounCaps\|carress\|hormonebalance\|fetishknown\)" -- 'src/*' | myprint "SpellCheck"
-$GREP  "\(recieve\|recieves\)" -- 'src/*' | myprint "PregmodderCannotSpellReceive"
-$GREP "\$slave\[" -- 'src/*' | myprint "ShouldBeSlaves"
+if [[ ! "$java" ]]; then
+	$GREP  "\(csae\|[a-z] She \|attepmts\|youreslf\|advnaces\|canAcheive\|setBellySize\|SetbellySize\|setbellySize\|bellypreg\|pregBelly\|bellyimplant\|bellyfluid\|pronounCaps\|carress\|hormonebalance\|fetishknown\)" -- 'src/*' | myprint "SpellCheck"
+	$GREP  "\(recieve\|recieves\)" -- 'src/*' | myprint "PregmodderCannotSpellReceive"
+	$GREP "\$slave\[" -- 'src/*' | myprint "ShouldBeSlaves"
+fi
 # Check for strange spaces e.g.  $slaves[$i]. lips
 $GREP "\$slaves\[\$i\]\. " -- 'src/*' | myprint "MissingPropertyAfterSlaves"
 # Check using refreshmentType instead of refreshment

src/events/intro/extremeIntro.tw

@@ -5,4 +5,4 @@ The early Free Cities were wild places where the writ of law did not run. In som
 [[They drew back from them.|Gender Intro][$seeExtreme = 0]] //Extreme content such as amputation and castration will not appear.//
 [[They reveled in them.|Gender Intro][$seeExtreme = 1]] //Extreme content will appear.//
 [[They reveled in them and were particularly inventive.|Gender Intro][$seeExtreme = 1,$seeHyperPreg = 1]] //Extreme content will appear, including hyper-pregnancy related content//
-[[They drew back from them, but remained creative.|Gender Intro][$seeExtreme = 0,$seeHyperPreg = 1]] //Extreme content will not appear, but hyper-pregnancy related content might appear.//
\ No newline at end of file
+[[They drew back from them, but remained creative.|Gender Intro][$seeExtreme = 0,$seeHyperPreg = 1]] //Extreme content will not appear, but hyper-pregnancy related content might appear.//

src/npc/familyPanic.tw

@@ -22,4 +22,4 @@
 	<</for>>
 <</for>>
 
-//Family relations flushed and rebuilt.//
\ No newline at end of file
+//Family relations flushed and rebuilt.//