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

Random fixes

See merge request !1138

src/uncategorized/hgApplication.tw

@@ -160,13 +160,17 @@ She helps $activeSlave.slaveName however she can. The tender care has @@.green;i
 <<if $HGtraining == "obedience">>
 
 <<set _effectiveness -= $activeSlave.intelligence*15>>
-<<set $activeSlave.trust -= Math.ceil(_effectiveness/4)>>
-<<if $activeSlave.devotion < -50>>
-	She helps watch and restrain the rebellious $activeSlave.slaveName, helping wear her down, @@.gold;breaking $activeSlave.slaveName's rebelliousness.@@
-<<elseif $activeSlave.devotion < -20>>
-	She keeps $activeSlave.slaveName constantly aware of her slavery, @@.gold;breaking $activeSlave.slaveName's resistance.@@
+<<if _effectiveness <= 0>>
+	She fails at training $activeSlave.slaveName because she is too intelligent.
 <<else>>
-	She acts as another pair of eyes watching $activeSlave.slaveName and metes out punishments, @@.gold;improving $activeSlave.slaveName's servitude.@@
+	<<set $activeSlave.devotion += Math.ceil(_effectiveness/4)>>
+	<<if $activeSlave.devotion < -50>>
+		She helps watch and restrain the rebellious $activeSlave.slaveName, helping wear her down, @@.gold;breaking $activeSlave.slaveName's rebelliousness.@@
+	<<elseif $activeSlave.devotion < -20>>
+		She keeps $activeSlave.slaveName constantly aware of her slavery, @@.gold;breaking $activeSlave.slaveName's resistance.@@
+	<<else>>
+		She acts as another pair of eyes watching $activeSlave.slaveName and metes out punishments, @@.gold;improving $activeSlave.slaveName's servitude.@@
+	<</if>>
 <</if>>
 
 <<elseif $HGtraining == "paraphilia">>