Merge branch 'bug-fixes' into 'master'

Bug fixes

See merge request !904

game/base-combat/stalk/stalk.twee

@@ -277,17 +277,17 @@
             <</if>>
             <br>
         <<else>><<fameexhibitionism 5>>
-            <<if random(1, 2) is 2 and ($loveInterest.primary is "robin" or $loveInterest.secondary is "robin")>>
+            <<if (random(1,3) is 1 and $loveInterest.primary is "Robin") or (random(1,3) is 2 and $loveInterest.secondary is "Robin")>>
                 "Isn't that Robin's <<girlfriend>>?" asks one <<if $pronoun is "m">>boy<<else>>girl<</if>>.
                 <br>
                 "Who'd have thought Robin would be into perverts," says another.
                 <br>
-            <<elseif random(1, 2) is 2 and ($loveInterest.primary is "whitney" or $loveInterest.secondary is "whitney")>>
+            <<elseif (random(1,3) is 1 and $loveInterest.primary is "Whitney") or (random(1,3) is 2 and $loveInterest.secondary is "Whitney")>>
                 "That's the <<girl>> Whitney always bullies," says one <<if $pronoun is "m">>boy<<else>>girl<</if>>.
                 <br>
                 "I bet this is Whitney's fault," replies another."
                 <br>
-            <<elseif random(1, 2) is 2 and ($loveInterest.primary is "kylar" or $loveInterest.secondary is "kylar")>>
+            <<elseif (random(1,3) is 1 and $loveInterest.primary is "Kylar") or (random(1,3) is 2 and $loveInterest.secondary is "Kylar")>>
                 "That's the <<girl>> Kylar hangs out with," says one <<if $pronoun is "m">>boy<<else>>girl<</if>>.
                 <br>
                 "Figures <<pshe>>'d be a pervert," replies another.
@@ -739,4 +739,4 @@
     <</if>>
     </div>
 <</if>>
-<</widget>>
\ No newline at end of file
+<</widget>>

game/overworld-town/special-kylar/main.twee

@@ -4239,6 +4239,7 @@ The two of you continue walking.
 <<elseif $phase is 2>>
 	You shake Kylar off of you. <<He>> looks stunned for a moment, before putting <<his>> face to <<his>> hands in shame. "I'm sorry, I don't know what came over me."
 <<else>>
+	<<set $kylarFountainKiss to 0>>
 	<<if $submissive gte 1150>>
 		You slowly bring your face closer to <<his>>, and plant a kiss on <<his>> lips.
 	<<elseif $submissive lte 850>>