[fixed] attaching strapon to dildo in stol, wrong price for the strapon harness in pavtrain_market, wrong dildo variable in sexshop when buying strapon harness

[changed] strapnumber will be set for the first time to the correct dildo when buying a harness

locations/anushkaev1.qsrc

@@ -314,7 +314,6 @@ if $ARGS[0] = 'watch_nushrad':
 	*clr & cla
 	menu_off = 1
 	AnushkaLoc = 2
-	gs 'stat'
 	'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spyrad1.jpg"></center>'
 	'Anushka gets on the bed on all fours in her underwear and wiggles her ass around. "Damn you have one of the finest asses I have ever seen, you know that Nush." You can tell by the voice it is Radomir, he gives her butt a squeeze with his hand. Then he grabs her panties and pulls them down, jerking them off her roughly and tossing them aside, before he goes back to playing with her bare ass and rubbing her pussy with his fingers.'
 	gs 'arousal', 'voyeur', 5

locations/bedrPar.qsrc

@@ -67,7 +67,7 @@ end
 *nl
 'This is the small bedroom you share with your sister, Anya. On one side of the room is a <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> where you can choose outfits and organise your clothing.'
 *nl
-'Your <a href="exec:gt ''bed'', ''start''">bed</a> stands opposite the wardrobe, and your <a href="exec:gt ''stol'' ,''stolPar''">desk</a> is next to it. Your sister''s bed is in the other corner.'
+'Your <a href="exec:gt ''bed'', ''start''">bed</a> stands opposite the wardrobe, and your <a href="exec:gt ''stol'' ,''stolPar''">desk</a> is next to it'+iif(strapon = 1, '. You keep your strapon inside it.', '')+'. Your sister''s bed is in the other corner.'
 *nl
 if popugai2 = 1:
 	'<a href="exec:gt ''popu'',''start2''"><<$namepopu2>></a> is sitting in his cage'

locations/pavtrain_market.qsrc

@@ -516,21 +516,44 @@ if ARGS[0] = 4:
 				act 'Buy something else':gt 'pavtrain_market', 4
 			end
 		end
-		if money >= 500 and strapon = 0:
-			act 'Buy strap-on harness (500 <b>₽</b>)':
-				cla
-				minut += 5
-				strapon = 1
-				money -= 1000
-				pcs_horny += 10
-				TimesBuyPorno += 1
-				if pcs_horny >= 50 and pav_slut < 75:
-					'You buy a strap-on harness and hastily hide it, while your face blushes with embarrassment.'
-				else
-					'You buy a strap-on harness and calmly hide it.'
+		if dildo = 1:
+			if money >= 500 and strapon = 0:
+				act 'Buy strap-on harness (500 <b>₽</b>)':
+					cla
+					minut += 5
+					strapon = 1
+					strapnumber = 1
+					money -= 500
+					pcs_horny += 10
+					TimesBuyPorno += 1
+					if pcs_horny >= 50 and pav_slut < 75:
+						'You buy a strap-on harness and hastily hide it, while your face blushes with embarrassment.'
+					else
+						'You buy a strap-on harness and calmly hide it.'
+					end
+					act 'Leave':gt 'pavtrain_market', 'start'
+					act 'Buy something else':gt 'pavtrain_market', 4
+				end
+			end
+		else
+			if money >= 1200 and strapon = 0:
+				act 'Buy strap-on harness with a dildo (1200 <b>₽</b>)':
+					cla
+					minut += 5
+					strapon = 1
+					dildo = 1
+					strapnumber = 1
+					money -= 1200
+					pcs_horny += 10
+					TimesBuyPorno += 1
+					if pcs_horny >= 50 and pav_slut < 75:
+						'You buy a strap-on harness and hastily hide it, while your face blushes with embarrassment.'
+					else
+						'You buy a strap-on harness and calmly hide it.'
+					end
+					act 'Leave':gt 'pavtrain_market', 'start'
+					act 'Buy something else':gt 'pavtrain_market', 4
 				end
-				act 'Leave':gt 'pavtrain_market', 'start'
-				act 'Buy something else':gt 'pavtrain_market', 4
 			end
 		end
 	end

locations/sexshop.qsrc

@@ -489,7 +489,8 @@ if $ARGS[0] = 'start':
 					menu_off = 1
 					minut += 5
 					strapon = 1
-					dildo = 1
+					middildo = 1
+					strapnumber = 2
 					money -= 1200
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
@@ -504,7 +505,8 @@ if $ARGS[0] = 'start':
 					menu_off = 1
 					minut += 5
 					strapon = 1
-					dildo = 1
+					middildo = 1
+					strapnumber = 2
 					karta -= 1200
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
@@ -523,7 +525,7 @@ if $ARGS[0] = 'start':
 					money -= 500
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
-					'You bought a strap-on and paid the cashier.'
+					'You bought a strap-on and paid the cashier. You have to attach one of your dildos to it.'
 
 					act 'Move away from the counter':gt 'sexshop', 'start'
 				end
@@ -537,7 +539,7 @@ if $ARGS[0] = 'start':
 					karta -= 500
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
-					'You bought a strap-on and paid the cashier.'
+					'You bought a strap-on and paid the cashier. You have to attach one of your dildos to it.'
 
 					act 'Move away from the counter':gt 'sexshop', 'start'
 				end

locations/stol.qsrc

@@ -28,6 +28,8 @@ if $ARGS[0] = 'start':
 	
 	act 'Check birth control': gt 'stol', 'bc'
 	
+	gs 'stol', 'strapon'
+	
 	if siga > 0:
         act 'Hide some cigarettes in your drawer':
             cla
@@ -138,50 +140,9 @@ if $ARGS[0] = 'stolPar':
 			act 'Continue':gt 'stol', 'stolPar'
 		end
 	end
+
+	gs 'stol', 'strapon'
 	
-!{	
-	!! use gs 'boyStat', 'D<<strapnumber>>' to recall which dildo is attached?
-	if strapon = 1:
-		if dildo + middildo + largedildo + bigdildo + extradildo + superdildo + maddildo > 1:
-			act 'Check out your strapon harness':
-				*clr
-				'<center><h1>Desk</h1></center>'
-				'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol.jpg"></center>'
-				*nl
-				if strapnumber = 0:
-					'Your strapon harness doesn''t have a dildo attached to it.'
-				elseif strapnumber = 1:
-					'Your 10cm dildo is attached to your strapon harness.'
-				elseif strapnumber = 2:
-					'Your 15cm dildo is attached to your strapon harness.'
-				elseif strapnumber = 3:
-					'Your 20cm dildo is attached to your strapon harness.'
-				elseif strapnumber = 4:
-					'Your 25cm dildo is attached to your strapon harness.'
-				elseif strapnumber = 5:
-					'Your 30cm dildo is attached to your strapon harness.'
-				elseif strapnumber = 6:
-					'Your 35cm dildo is attached to your strapon harness.'
-				elseif strapnumber = 7:
-					'Your 40cm dildo is attached to your strapon harness.'
-				end
-				*nl
-				if dildo = 1: '<a href="exec:strapnumber = 1 & gt ''stol'', ''stolPar''">Attach</a> your 10cm long dildo.'
-				if middildo = 1: '<a href="exec:strapnumber = 2 & gt ''stol'', ''stolPar''">Attach</a> your 15cm long dildo.'
-				if largedildo = 1: '<a href="exec:strapnumber = 3 & gt ''stol'', ''stolPar''">Attach</a> your 20cm long dildo.'
-				if bigdildo = 1: '<a href="exec:strapnumber = 4 & gt ''stol'', ''stolPar''">Attach</a> your 25cm long dildo.'
-				if extradildo = 1: '<a href="exec:strapnumber = 5 & gt ''stol'', ''stolPar''">Attach</a> your 30cm long dildo.'
-				if superdildo = 1: '<a href="exec:strapnumber = 6 & gt ''stol'', ''stolPar''">Attach</a> your 35cm long dildo.'
-				if maddildo = 1: '<a href="exec:strapnumber = 7 & gt ''stol'', ''stolPar''">Attach</a> your 40cm long dildo.'
-			end
-		else
-			act 'Check out your strapon harness':
-				'You don''t have any dildos to attach to your strapon harness'
-				act 'Put the harness back': gt 'stol', 'stolPar'
-			end
-		end
-	end
-}
 	if siga > 0:
         act 'Hide some cigarettes in your drawer':
             cla
@@ -248,6 +209,47 @@ if $ARGS[0] = 'stolPar':
 	end
 end
 
+if $ARGS[0] = 'strapon':
+!! use gs 'boyStat', 'D<<strapnumber>>' to recall which dildo is attached?
+	if strapon = 1:
+		if dildo + middildo + largedildo + bigdildo + extradildo + superdildo + maddildo > 0:
+			act 'Check out your strapon harness':
+				*clr
+				'<center><h1>Desk</h1></center>'
+				'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol.jpg"></center>'
+				*nl
+				if strapnumber = 0:
+					'Your strapon harness doesn''t have a dildo attached to it.'
+				elseif strapnumber = 1:
+					'Your 10cm dildo is attached to your strapon harness.'
+				elseif strapnumber = 2:
+					'Your 15cm dildo is attached to your strapon harness.'
+				elseif strapnumber = 3:
+					'Your 20cm dildo is attached to your strapon harness.'
+				elseif strapnumber = 4:
+					'Your 25cm dildo is attached to your strapon harness.'
+				elseif strapnumber = 5:
+					'Your 30cm dildo is attached to your strapon harness.'
+				elseif strapnumber = 6:
+					'Your 35cm dildo is attached to your strapon harness.'
+				elseif strapnumber = 7:
+					'Your 40cm dildo is attached to your strapon harness.'
+				end
+				*nl
+				if dildo = 1: '<a href="exec:strapnumber = 1 & gt ''stol'', ''stolPar''">Attach</a> your 10cm long dildo.'
+				if middildo = 1: '<a href="exec:strapnumber = 2 & gt ''stol'', ''stolPar''">Attach</a> your 15cm long dildo.'
+				if largedildo = 1: '<a href="exec:strapnumber = 3 & gt ''stol'', ''stolPar''">Attach</a> your 20cm long dildo.'
+				if bigdildo = 1: '<a href="exec:strapnumber = 4 & gt ''stol'', ''stolPar''">Attach</a> your 25cm long dildo.'
+				if extradildo = 1: '<a href="exec:strapnumber = 5 & gt ''stol'', ''stolPar''">Attach</a> your 30cm long dildo.'
+				if superdildo = 1: '<a href="exec:strapnumber = 6 & gt ''stol'', ''stolPar''">Attach</a> your 35cm long dildo.'
+				if maddildo = 1: '<a href="exec:strapnumber = 7 & gt ''stol'', ''stolPar''">Attach</a> your 40cm long dildo.'
+			end
+		else
+			act 'Check out your strapon harness': '<br>You don''t have any dildos to attach to your strapon harness'
+		end
+	end
+end
+
 if $ARGS[0] = 'bc':
 	*clr & cla
 	'<center><h1>Desk</h1></center>'