Merge branch 'fixes' into 'pregmod-master'

Small things

See merge request pregmodfan/fc-pregmod!2077

src/uncategorized/rename.tw

@@ -34,9 +34,6 @@
 	Since $activeSlave.slaveName has already had a new name <<if $activeSlave.devotion > 20>>given to<<else>>forced on<</if>> her before, the mere fact of having it changed again doesn't really affect her.
 <</if>>
 
-/* Rude name reaction */
-/* Disabled until a fix for the .toLowerCase and .indexOf */
-/*
 <<set _insultingName = 0>>
 <<if $oldName != $activeSlave.slaveName>>
 	<<set _toSearch = $activeSlave.slaveName>>
@@ -44,6 +41,7 @@
 	<<for $i = 0; $i < setup.badWords.length; $i++>>
 	<<if _toSearch.indexOf(setup.badWords[$i]) != -1>>
 		<<set _insultingName = 1>>
+		<<break>>
 	<</if>>
 	<</for>>
 <</if>>
@@ -54,6 +52,7 @@
 	<<for $i = 0; $i < setup.badWords.length; $i++>>
 	<<if _toSearch.indexOf(setup.badWords[$i]) != -1>>
 		<<set _insultingName = 1>>
+		<<break>>
 	<</if>>
 	<</for>>
 <</if>>
@@ -69,7 +68,6 @@
 	<<set $activeSlave.trust -= 5>>
 <</if>>
 <</if>>
-*/
 
 /* Wife's surname reaction */
 <<if $oldSurname != $activeSlave.slaveSurname>>

src/uncategorized/seRaidingAssault.tw

@@ -113,7 +113,7 @@ You make your selection and direct your $mercenariesTitle to attack the target.
 	<</if>>
 <<case "classical dancer">>
 	<<if $targetEscape >= _MercCapture>>
-		Though they are excellent soldiers, the $mercenariesTitle are crude and uncultured. They are unable to blend into the audience and are soon discovered, giving the dance troupe the warning need to make an escape from the theater.
+		Though they are excellent soldiers, the $mercenariesTitle are crude and uncultured. They are unable to blend into the audience and are soon discovered, giving the dance troupe the warning needed to make an escape from the theater.
 	<<elseif _raidescape == 1>>
 		As your $mercenariesTitle close in on the stage and reveal their concealed weapons, the darling star of the dance troupe loses her footing in shock and tumbles off the stage. The sharp crack as she hits the ground drives the crowd and remaining members of the troupe hysterical, while your $mercenariesTitle exit the theater as chaos surges around them.
 	<<else>>
@@ -133,7 +133,7 @@ You make your selection and direct your $mercenariesTitle to attack the target.
 	<</if>>
 <<case "classical musician">>
 	<<if $targetEscape >= _MercCapture>>
-		Though they are excellent soldiers, the $mercenariesTitle are crude and uncultured. They are unable to blend into the audience and are soon discovered, giving the orchestra the warning need to make an escape from the concert hall.
+		Though they are excellent soldiers, the $mercenariesTitle are crude and uncultured. They are unable to blend into the audience and are soon discovered, giving the orchestra the warning needed to make an escape from the concert hall.
 	<<elseif _raidescape == 1>>
 		As your $mercenariesTitle close in on the stage and reveal their concealed weapons, the crown jewel of the orchestra loses her footing in shock and tumbles off the stage. The sharp crack as she hits the ground drives the crowd and remaining members of the orchestra hysterical, while your $mercenariesTitle exit the concert hall as chaos surges around them.
 	<<else>>