Merge commit 'a668b19ebf2d3e55b6556ab2cec9d187969958c7'

locations/brother.qsrc

@@ -56,7 +56,7 @@ if $ARGS[0] = 'start':
 	if brotherSex >= 10 and npc_rel['A34'] >= 80:
 		'You and your brother are lovers.'
 	elseif brotherSex >= 10 and npc_rel['A34'] >= 60 and npc_rel['A34'] < 80:
-		'You and your brother are good friends with benefits.'	
+		'You and your brother are good friends with benefits.'
 	elseif brotherSex > 5 and npc_rel['A34'] >= 40 and npc_rel['A34'] < 60:
 		'You are siblings with benefits.'
 	elseif npc_rel['A34'] < 20:
@@ -70,9 +70,9 @@ if $ARGS[0] = 'start':
 	elseif npc_rel['A34'] >= 80:
 		'Your brother is practically one of your closest friends.'
 	end
-	
+
 	act 'Move away':gt $loc, $metka
-	
+
 	*nl
 	if hour >= 7 and hour < 23:
 		! WD: Fix old nude variable
@@ -295,8 +295,8 @@ if $ARGS[0] = 'start':
 			end
 		end
 	end
-	
-	if $loc = 'sitrPar' or ($loc = 'family' and $metka = 'sofa'):		
+
+	if $loc = 'sitrPar' or ($loc = 'family' and $metka = 'sofa'):
 		if hour >= 7 and hour < 23:
 			act'Chat with Kolka':gt'brother2','chat'
 			!!act'Banter with Kolka':gt'brother2','banter'
@@ -308,7 +308,7 @@ if $ARGS[0] = 'start':
 				end
 			end
 		end
-		
+
 		!if father_go = 1 and hour >= 7:
 		!	act'Play video games with him':gt'video_games','brother'
 		!end
@@ -1548,7 +1548,7 @@ if $ARGS[0] = 'pregreact':
 			end
 			exit
 		end
-	elseif brotherSex < 7 and kid > 0 and ($clothingworntype = 'nude' and pregchem > 2000) or ($clothingworntype ! 'nude' and pregchem > 3460):
+	elseif brotherSex < 7 and kid > 0 and (($clothingworntype = 'nude' and pregchem > 2000) or ($clothingworntype ! 'nude' and pregchem > 3460)):
 		'"You''re already pregnant again? This is starting to look like a new hobby," he laughs.'
 		'"You know what? Maybe it is," you joke back. "Some girls play sports; I get serially impregnated."'
 		'"Well, congratulations on taking home the gold in getting knocked up."'
@@ -1792,5 +1792,3 @@ if $ARGS[0] = 'brotherknows8':
 end
 
 --- brother ---------------------------------
-
-

locations/gLakeNude.qsrc

@@ -257,7 +257,8 @@ if temper >= 15 and month >= 5 and month <= 9:
 			act'Hide in the woods near the beach': gt'gLakeNudeForest'
 		end
 	end
-	act'Leave the secluded beach without changing':
+	$tmp_lakenude_leave = iif($clothingworntype = 'nude', ' without changing', '')
+	act'Leave the secluded beach<<$tmp_lakenude_leave>>':
 		if $clothingworntype ! 'nude' or ($clothingworntype = 'nude' and pcs_inhib >= 60):
 			cla
 			minut += 10
@@ -267,6 +268,7 @@ if temper >= 15 and month >= 5 and month <= 9:
 			gt'gLakeNude'
 		end
 	end
+	KILLVAR '$tmp_lakenude_leave'
 else
 	act'Leave the now abandoned beach':
 		cla

locations/gschool_lessonsev2.qsrc

@@ -241,8 +241,8 @@ if $ARGS[0] = 'geography':
 							npc_rel['A9'] += 3
 							npc_rel['A158'] += 3
 							grupvalue[4] += 3
-							'You quickly start wipping the cum off you giving them dirty looks, one of the girls from another grade gives you some tissues to help. You quickly clean yourself and clothes up as best you can. Mrs. Sokoloff notices you and asks "Miss. <<$pcs_lastname>> what are you doing?"'
-							'You glances up at her and then turn to clean up the rest of your shoulder while looking at the boys. "Something must have dripped on my from the ceiling and I was just cleaning it up." Mrs. Sokoloff looks up at the celing as if expecting something to fall from it for a few moments and then goes back to teaching class.'
+							'You quickly start wiping the cum off you giving them dirty looks, one of the girls from another grade gives you some tissues to help. You quickly clean yourself and your clothes up as best you can. Mrs. Sokoloff notices you and asks "Miss. <<$pcs_lastname>> what are you doing?"'
+							'You glances up at her and then turn to clean up the rest of your shoulder while looking at the boys. "Something must have dripped on me from the ceiling and I was just cleaning it up." Mrs. Sokoloff looks up at the celing as if expecting something to fall from it for a few moments and then goes back to teaching class.'
 							act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 						end
 					end
@@ -1080,4 +1080,3 @@ if $ARGS[0] = 'shop punishment':
 end
 
 --- gschool_lessonsev2 ---------------------------------
-