Merge remote-tracking branch 'upstream/master'

locations/NewCloShop.qsrc

@@ -149,12 +149,11 @@ if $ARGS[0] = 'dressingclothes':
 		gt 'NewCloShop', 'changingroom'
 	end
 
-	i = Clothingstock +1
-
-	if Clothingstock - 12 > 0:i -= 12
-
 	clothingfilter['qualitycheck'] = 7
 	:loopquality
+		i = Clothingstock +1
+
+		if Clothingstock - 12 > 0:i -= 12
 
 		:loopexpensive2
 			if expensive[i] = 0:

locations/budgetclothes.qsrc

@@ -109,19 +109,18 @@ if $ARGS[0] = 'clothes':
 		gt 'budgetclothes', 'start'
 	end
 
-	i = Clothingstock + 1
-
-	if Clothingstock - 18 > 0:
-		i -= 18
-	elseif Clothingstock - 12 > 0:
-		i -= 12
-	elseif Clothingstock - 6 > 0:
-		i -= 6
-	end
-
 	clothingfilter['qualitycheck'] = 7
 	:loopquality
-	
+		i = Clothingstock + 1
+
+		if Clothingstock - 18 > 0:
+			i -= 18
+		elseif Clothingstock - 12 > 0:
+			i -= 12
+		elseif Clothingstock - 6 > 0:
+			i -= 6
+		end
+		
 		:loopcheap
 			if cheap[i] = 0:
 				gs 'clothing_attributes', 'cheap', i
@@ -172,17 +171,16 @@ if $ARGS[0] = 'office':
 		gt 'budgetclothes', 'start'
 	end
 
-	if Clothingstock > 15:
-		i = 3
-	elseif Clothingstock > 7:
-		i = 2
-	else
-		i = 1
-	end
-
 	clothingfilter['qualitycheck'] = 7
 	:loopquality2
-	
+		if Clothingstock > 15:
+			i = 3
+		elseif Clothingstock > 7:
+			i = 2
+		else
+			i = 1
+		end
+
 		:loopoffice
 			if office[i] = 0:
 				gs 'clothing_attributes', 'office', i
@@ -228,17 +226,16 @@ if $ARGS[0] = 'uniform':
 		gt 'budgetclothes', 'start'
 	end
 
-	if Clothingstock > 15:
-		i = 1
-	elseif Clothingstock > 7:
-		i = 2
-	else
-		i = 3
-	end
-
 	clothingfilter['qualitycheck'] = 7
 	:loopquality3
-	
+		if Clothingstock > 15:
+			i = 1
+		elseif Clothingstock > 7:
+			i = 2
+		else
+			i = 3
+		end
+
 		:loopuniform
 			if uniform[i] = 0:
 				gs 'clothing_attributes', 'uniform', i
@@ -284,17 +281,16 @@ if $ARGS[0] = 'school':
 		gt 'budgetclothes', 'start'
 	end
 
-	if Clothingstock > 15:
-		i = 1
-	elseif Clothingstock > 7:
-		i = 2
-	else
-		i = 3
-	end
-
 	clothingfilter['qualitycheck'] = 7
 	:loopquality4
-	
+		if Clothingstock > 15:
+			i = 1
+		elseif Clothingstock > 7:
+			i = 2
+		else
+			i = 3
+		end
+
 		:loopschool
 			if school[i] = 0:
 				gs 'clothing_attributes', 'school', i

locations/dimalina.qsrc

@@ -454,12 +454,12 @@ if $ARGS[0] = 'watch3':
 		'"Hmm... I think... That... Hm?" She stands and then stumbles a bit before falling back onto the bed. Dimka sees his chance and gently guides her to lay down. She tries to fight back, but it only results in her being positioned onto her stomach by him. Smiling, he puts his hands under her skirt and slides her panties down to her thighs. Lina lets out a breathy moan as she looks back at him in confusion and arousal.' 
 		'"I know how to make you behave..." Dimka whispers to her before he begins to unzip the front of his jeans. You close your eyes for a moment...'
 		act 'Dream of Lina':
-			gs 'stat'
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/linased/F3.jpg"></center>'
 			'You can hear Lina''s cries of pleasure and a sudden image of her comes to mind. She is on all fours moaning as you massage lube into her tight little ass. She looks at you with concern, but you know what to do, You are going to fill that cute hole with the beads. Your fingers were only the beginning. You lick the beads and spread her cheeks. When you begin to push, she gasps, cries and clenches her teeth as she adjusts to the toy and slowly starts to enjoy the feeling. You smile knowing that by the end of this, she''ll be the perfect anal slut for you.' 
 			'Just as you begin to thrust the beads in and out of her ass a bit, you''re pulled back to reality by the sound of grunting from Dimka'
-			*clr & cla
 			pcs_horny += 10
+			gs 'stat'
 			act 'Lina is defiled...': gt 'dimalina', 'linadefiled'
 		end
 		act 'Dream of Dimka':
@@ -473,6 +473,7 @@ if $ARGS[0] = 'watch3':
 			act 'Lina is defiled...': gt 'dimalina', 'linadefiled'
 		end
 		act 'Continue to watch them':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/linased/D12.jpg"></center>'
 			'Pulling out his cock, he grabs Lina''s hair and holds her in place as he slaps his cock against her face. The mask of shyness and awkwardness is gone, and his true face resurfaces. "From now on, you are no longer Lina. You are Litte Slut. Understood?!"'
 			'"No... I..."'
@@ -830,6 +831,7 @@ end
 
 if $ARGS[0] = 'hooksex':
 	*clr & cla
+	gs 'boyStat', 'A1'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/linased/D17.jpg"></center>'
 	'You feel the shaft of his <<dick>>cm <<$dick_girth>> cock pushing your vaginal lips slightly apart.'
 	if pcs_vag < 10:
@@ -881,6 +883,7 @@ if $ARGS[0] = 'helplina':
 	gs 'stat'
 	act 'Dimka joins in':
 		*clr & cla
+		gs 'boyStat', 'A1'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/linased/D26.jpg"></center>'
 		'While you and Lina were busy with each other, Dimka stripped himself of his clothes and climbs onto the bed to separate the two of you.'
 		'"Playtime is over for you two sluts!"'
@@ -1099,6 +1102,7 @@ if $ARGS[0] = 'succubuslina':
 		'She gives you a timid smile that soon grows as your lesbian show turns hotter. Horny as hell, she practically rips apart those clothes she''s still wearing. Looking at Dimka, you see that he paces nervously from feet to feet. You can'' wait to drain the little shit. So... What next?'
 		act '"Time for the main dish... Master"':
 			*clr & cla
+			gs 'boyStat', 'A1'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/linased/D30.jpg"></center>'
 			'Dimka jumps on the bed and crawls towards Lina. He probably thinks that he is in control of her. Hehehe. Poor stupid kid. She lays on her back, observing him with a mix of lust and hate. They are slaves to their desires and you are the one who whispers the lust in their ears.'
 			'"Master... Take your Litte Slut. I have her ready for you."'

locations/dolls.qsrc

@@ -78,16 +78,15 @@ if $ARGS[0] = 'clothing':
 		gt 'dolls', 'start'
 	end
 
-	if Clothingstock > 15:
-		i = 1
-	elseif Clothingstock > 7:
-		i = 3
-	else
-		i = 2
-	end
-
 	clothingfilter['qualitycheck'] = 7
 	:loopquality
+		if Clothingstock > 15:
+			i = 1
+		elseif Clothingstock > 7:
+			i = 3
+		else
+			i = 2
+		end
 
 		:loopalt
 			if alternative[i] = 0:

locations/exhibitionistshop.qsrc

@@ -59,18 +59,17 @@ if $ARGS[0] = 'clo':
 		gt 'exhibitionistshop', 'start'
 	end
 
-	if Clothingstock >= 18:
-		i = 1
-	elseif Clothingstock >= 12:
-		i = 2
-	elseif Clothingstock >= 6:
-		i = 3
-	else
-		i = 4
-	end
-
 	clothingfilter['qualitycheck'] = 7
 	:loopquality
+		if Clothingstock >= 18:
+			i = 1
+		elseif Clothingstock >= 12:
+			i = 2
+		elseif Clothingstock >= 6:
+			i = 3
+		else
+			i = 4
+		end
 
 		:loopexhibit
 			if exhibit[i] = 0:

locations/moncheri.qsrc

@@ -79,14 +79,13 @@ if $ARGS[0] = 'clothes':
 
 	act 'Return': minut += 1 & gt 'moncheri', 'start'
 
-	if Clothingstock > 11:
-		i = 1
-	else
-		i = 2
-	end
-
 	clothingfilter['qualitycheck'] = 7
 	:loopquality
+		if Clothingstock > 11:
+			i = 1
+		else
+			i = 2
+		end
 
 		:loopformal
 			if formal[i] = 0:

locations/pussykats_clothes.qsrc

@@ -16,13 +16,12 @@ if $ARGS[0] = 'start':
 		gt 'pussykats', 'start'
 	end
 
+	clothingfilter['qualitycheck'] = 7
+	:loopquality
 		i = Clothingstock + 1
 
 		if Clothingstock - 12 >= 0:i -= 12
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
-
 		:loopaverage
 			if average[i] = 0:
 				gs 'clothing_attributes', 'average', i

locations/scandalicious.qsrc

@@ -44,18 +44,17 @@ if $ARGS[0] = 'swim':
 		gt 'scandalicious', 'start'
 	end
 
-	if Clothingstock > 18:
-		i = 1
-	elseif Clothingstock > 12:
-		i = 2
-	elseif Clothingstock > 6:
-		i = 3
-	else
-		i = 4
-	end
-
 	clothingfilter['qualitycheck'] = 7
 	:loopquality
+		if Clothingstock > 18:
+			i = 1
+		elseif Clothingstock > 12:
+			i = 2
+		elseif Clothingstock > 6:
+			i = 3
+		else
+			i = 4
+		end
 
 		:loopbeach
 			if beach[i] = 0:

locations/sexshop.qsrc

@@ -648,22 +648,21 @@ if $ARGS[0] = 'clo':
 
 	act 'Return': minut += 1 & gt 'sexshop', 'start'
 
-	i = Clothingstock + 1
-
-	if Clothingstock > 20:
-		i -= 20
-	elseif Clothingstock > 16:
-		i -= 16
-	elseif Clothingstock > 12:
-		i -= 12
-	elseif Clothingstock > 8:
-		i -= 8
-	elseif Clothingstock > 4:
-		i -= 4
-	end
-
 	clothingfilter['qualitycheck'] = 7
 	:loopquality
+		i = Clothingstock + 1
+
+		if Clothingstock > 20:
+			i -= 20
+		elseif Clothingstock > 16:
+			i -= 16
+		elseif Clothingstock > 12:
+			i -= 12
+		elseif Clothingstock > 8:
+			i -= 8
+		elseif Clothingstock > 4:
+			i -= 4
+		end
 
 		:loopfetish
 			if fetish[i] = 0:

locations/sportShop.qsrc

@@ -121,16 +121,15 @@ if $ARGS[0] = 'clo':
 		gt 'sportshop', 'start'
 	end
 
-	if Clothingstock > 16:
-		i = 1
-	elseif Clothingstock > 8:
-		i = 2
-	else
-		i = 3
-	end
-
 	clothingfilter['qualitycheck'] = 7
 	:loopquality2
+		if Clothingstock > 16:
+			i = 1
+		elseif Clothingstock > 8:
+			i = 2
+		else
+			i = 3
+		end
 
 		:loopexercise
 			if exercise[i] = 0:
@@ -186,19 +185,18 @@ if $ARGS[0] = 'swim':
 		gt 'sportshop', 'start'
 	end
 
-!!4 is in he supermarket, so skipped
-	if Clothingstock > 18:
-		i = 1
-	elseif Clothingstock > 12:
-		i = 2
-	elseif Clothingstock > 6:
-		i = 3
-	else
-		i = 8
-	end
-
 	clothingfilter['qualitycheck'] = 7
 	:loopquality
+	!!4 is in he supermarket, so skipped
+		if Clothingstock > 18:
+			i = 1
+		elseif Clothingstock > 12:
+			i = 2
+		elseif Clothingstock > 6:
+			i = 3
+		else
+			i = 8
+		end
 
 		:loopswim
 			if swimwear[i] = 0:

locations/version.qsrc

@@ -2,6 +2,7 @@
 
 act 'Return': gt 'start'
 '0.8.1'
+'- Albina rework by vengeance11 and Philo'
 '- Reminder for work at salon in stat window from hornguy6'
 '- Rework of the runner race structure from THX'
 '- Shower dildos! And new virginity lose to them with reactions thanks to hornguy6'