Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

# Conflicts:
#	locations/Voltrener.qsrc

locations/Voltrener.qsrc

@@ -151,6 +151,7 @@ if $ARGS[0] = 'talk':
 			'Coach looked at you "Ah, <<$pcs_lastname>>. You have the makings of an athlete, though I''m not sure if you are up to a professional level yet."'
 			act 'Ask to join the team':
 				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/mikhail/volleytrener6.jpg"></center>'
 				gs 'stat'
 				if pav_slut <= 25:
 					if trenerSex = 1:
@@ -174,11 +175,12 @@ if $ARGS[0] = 'talk':
 					'You ask the coach about joining the team. The coach thinks for a minute, "Hey <<$pcs_lastname>>, I hear loads of rumours about you. Such as you being a <<$gnikname>>. Is this true?"'
 					act 'It''s all lies':
 						*clr & cla
-						gs 'stat'
-						
-						act 'Leave': gt 'gdksport', 'start'
-						
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/mikhail/volleytrener6.jpg"></center>'
+						'You tell him its not true and that some of the kids have been spreading false rumours about you.'
+						'He doesn''t appear to be convinced the only options are to go aggressive or leave it.'
 						gs 'willpower', 'misc', 'self', 'hard'
+						gs 'stat'
+						act 'Leave it': gt 'gdksport', 'start'
 						if will_cost <= pcs_willpwr:
 							act 'Persuade him to let you join the team (<<will_cost>> Willpower)':
 								*clr & cla
@@ -198,7 +200,11 @@ if $ARGS[0] = 'talk':
 							act 'Persuade him to let you join the team (<font color="red"><will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to persuade him to join the team.'
 						end
 					end
-					act 'Okay, it''s true, I am a <<$gnikname>>': gt'Voltrener', 'gorslut'
+					act 'Okay, it''s true, I am a <<$gnikname>>':
+						*clr & cla
+						gs 'stat'
+						gt'Voltrener', 'gorslut'
+					end
 				else
 					'You ask the coach about joining the team, the coach thinks for a minute. "I have a spot for a substitute, but I do not know if you have what it takes."'
 					gs 'willpower', 'misc', 'self'

locations/Voltrenersex.qsrc

@@ -29,10 +29,8 @@ if $ARGS[0] = 'start':
 			end
 		else
 			act 'Don''t resist (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to stop resisting.</font>'
-		end
-	end
-	
-	gs 'willpower', 'misc', 'self'		
+		end	
+		gs 'willpower', 'misc', 'self'		
 	elseif trenerSex = 0:
 		if  will_cost <= pcs_willpwr:
 			act 'Look at the coach (<<will_cost>> Willpower)':
@@ -44,7 +42,8 @@ if $ARGS[0] = 'start':
 		else
 			act 'Look at the coach (<font color="red"><<will_cost>> Willpower)': '<br><font color="red">You don''t have enough willpower to look at the coach.</font>'
 		end
-	end	
+	end
+end
 	
 if $ARGS[0] = 'talk':
 	if Voltrenersee = 1:

locations/gschool_break.qsrc

@@ -752,7 +752,13 @@ if $ARGS[0] = 'boys_restroom_events':
 						*clr & cla
 						gs 'boyStat', 'A3'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/ivan4.jpg"></center>'
-						'You get up and turn around, bending over. Once you do, he spits on your anus and rubs the spit into your ass to help lube it up. Then he lines up his dick, you feel the head of his cock press against your puckered asshole. The pressure builds up until the head pops in, he pauses a moment as you tense up and then gentle slides his dick in your ass. He pauses when you tense up to let you get use to his <<dick>>cm <<$dick_girth>> dick, pushing it''s way into your ass. He slowly starts fucking your ass gently, going just a little deeper slowly. It doesn''t hurt too much.'
+						if analplugin = 1:
+							analplugin = 0
+							'You get up and turn around, bending over. Ivan twists your buttplug, "Now there''s a good girl." He gently eases it out and places next to the basin.'
+							'He spits on your anus and rubs the spit into your ass to help lube it up. Then he lines up his dick, you feel the head of his cock press against your puckered asshole. The pressure builds up until the head pops in, he pauses a moment as you tense up and then gentle slides his dick in your ass. He pauses when you tense up to let you get use to his <<dick>>cm <<$dick_girth>> dick, pushing it''s way into your ass. He slowly starts fucking your ass gently, going just a little deeper slowly. It doesn''t hurt too much.'
+						else
+							'You get up and turn around, bending over. Once you do, he spits on your anus and rubs the spit into your ass to help lube it up. Then he lines up his dick, you feel the head of his cock press against your puckered asshole. The pressure builds up until the head pops in, he pauses a moment as you tense up and then gentle slides his dick in your ass. He pauses when you tense up to let you get use to his <<dick>>cm <<$dick_girth>> dick, pushing it''s way into your ass. He slowly starts fucking your ass gently, going just a little deeper slowly. It doesn''t hurt too much.'
+						end
 						gs 'arousal', 'anal', 5, 'sub'
 						gs 'pain', 1, 'asshole', 'stretch'
 						gs 'stat'

locations/shop.qsrc

@@ -22,7 +22,13 @@ if $shoplocation = 'main':
 	if hour < 8 or hour > 20:
 		'The supermarket is currently closed.'
 
-		if $loc = 'shop': $loc = $loc_bak
+		if $loc = 'shop':
+			if $loc_bak = 'shop':
+				$loc = torgpred
+			else
+				$loc = $loc_bak
+			end
+		end
 		act 'Leave the store':minut += 3 & gt $loc
 		exit
 	end