Merge remote-tracking branch 'julzor/master'

locations/BelSex.qsrc

@@ -423,13 +423,7 @@ if $ARGS[0] = 'shower':
 			gs 'arousal', 'end'
 			gs 'stat'
 			
-			if return_residential = 0: 
-				act 'Leave': gt 'pavCommercial'
-			elseif return_residential = 1:
-				act 'Leave': gt 'pavResidential'
-			else
-				act 'Leave': gt 'pavIndustrial'
-			end	
+			act 'Leave': gt $loc
 		end
 	end
 end

locations/MBasement.qsrc

@@ -1,106 +1,110 @@
 # MBasement
 
-$location_type = 'private'
-$loc = 'MBasement'
-$metka = ''
-$menu_loc = 'MBasement'
-$menu_arg = ''
-menu_off = 0
-
-if rand (0,100) < 3:
-	menu_off = 1
-	'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/baserand1.mp4"></video></center>'
-	'You see a Mistress with two submissives, she is fucking one of them.'
-
-	gs 'basement', 'end'
-elseif rand (0,100) < 3:
-	menu_off = 1
-	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/sex/baserand2.jpg"></center>'
-	'You see a submissive, tied up and waiting for someone to play with.'
-
-	gs 'basement', 'end'
-elseif rand (0,100) < 3:
-	menu_off = 1
-	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/sex/baserand3.jpg"></center>'
-	'A submissive woman is tied up and displayed like an art exhibition, the sign tells people to use the whip on her.'
-
-	gs 'basement', 'end'
-elseif rand (0,100) < 3:
-	menu_off = 1
-	'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/baserand4.mp4"></video></center>'
-	'You see a Mistress with two submissives, she is fucking one of them.'
-
-	gs 'basement', 'end'
-elseif rand (0,100) < 3:
-	menu_off = 1
-	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/sex/baserand5.jpg"></center>'
-	'You see a submissive, tied up and waiting for someone to play with.'
-
-	gs 'basement', 'end'
-elseif rand (0,100) < 3:
-	menu_off = 1
-	'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/baserand6.mp4"></video></center>'
-	'You see a two submissives being used by 2 dommes.'
-
-	gs 'basement', 'end'
-elseif rand (0,100) < 3:
-	menu_off = 1
-	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/sex/baserand7.jpg"></center>'
-	'You see three submissives, tied up and hanging upside down.'
-
-	gs 'basement', 'end'
-elseif rand (0,100) < 3:
-	menu_off = 1
-	'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/baserand8.mp4"></video></center>'
-	'You see a submissive woman, tied and gagged and being fucked by a dominant man.'
-
-	gs 'basement', 'end'
-elseif rand (0,100) < 3:
-	menu_off = 1
-	'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/baserand9.mp4"></video></center>'
-	'You see a submissive woman, tied and being fucked by a dominant man. Their eyes are locked and they are oblivious to the crowd of people watching them.'
-
-	gs 'basement', 'end'
-elseif rand (0,100) < 3:
-	menu_off = 1
-	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/sex/subbyhubby.jpg"></center>'
-	'A dominate wife wearing a strap-on fucks her husband with another man.'
-
-	gs 'basement', 'end'
-elseif rand (0,100) < 3:
-	menu_off = 1
-	'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/3dom.mp4"></video></center>'
-	'Three dommes taking turn fucking their submissive male bent over a padded bench.'
-
-	gs 'basement', 'end'
-elseif rand (0,100) < 3:
-	menu_off = 1
-	'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/2domsub.mp4"></video></center>'
-	'Two dommes fuck their subs wearing ball gags roughly, in a contest to see how can make their sub orgasm first.'
-
-	gs 'basement', 'end'
-elseif rand (0,100) < 3:
-	menu_off = 1
-	'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/stacross.mp4"></video></center>'
-	'A woman is shackled to a Saint Andrews Cross while several dom''s take turns whipping her.'
-
-	gs 'basement', 'end'
-else
-	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/basement.jpg"></center>'
-	'Basement, for torture and whatnot'
-
-	act 'Go upstairs to the east wing hallway': gt 'MHall', 'east'
+if $ARGS[0] = 'start':
+	$location_type = 'private'
+	$loc = 'MBasement'
+	$metka = 'start'
+	$menu_loc = 'MBasement'
+	$menu_arg = 'start'
+
+	mbasement_rand = rand(0,100)
+
+	if mbasement_rand > 97:
+		*clr & cla
+		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/baserand1.mp4"></video></center>'
+		'You see a Mistress with two submissives, she is fucking one of them.'
+
+		gs 'Mbasement', 'end'
+	elseif mbasement_rand > 94:
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/sex/baserand2.jpg"></center>'
+		'You see a submissive, tied up and waiting for someone to play with.'
+
+		gs 'Mbasement', 'end'
+	elseif mbasement_rand > 91:
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/sex/baserand3.jpg"></center>'
+		'A submissive woman is tied up and displayed like an art exhibition, the sign tells people to use the whip on her.'
+
+		gs 'Mbasement', 'end'
+	elseif mbasement_rand > 88:
+		*clr & cla
+		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/baserand4.mp4"></video></center>'
+		'You see a Mistress with two submissives, she is fucking one of them.'
+
+		gs 'Mbasement', 'end'
+	elseif mbasement_rand > 85:
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/sex/baserand5.jpg"></center>'
+		'You see a submissive, tied up and waiting for someone to play with.'
+
+		gs 'Mbasement', 'end'
+	elseif mbasement_rand > 82:
+		*clr & cla
+		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/baserand6.mp4"></video></center>'
+		'You see a two submissives being used by 2 dommes.'
+
+		gs 'Mbasement', 'end'
+	elseif mbasement_rand > 79:
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/sex/baserand7.jpg"></center>'
+		'You see three submissives, tied up and hanging upside down.'
+
+		gs 'Mbasement', 'end'
+	elseif mbasement_rand > 76:
+		*clr & cla
+		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/baserand8.mp4"></video></center>'
+		'You see a submissive woman, tied and gagged and being fucked by a dominant man.'
+
+		gs 'Mbasement', 'end'
+	elseif mbasement_rand > 73:
+		*clr & cla
+		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/baserand9.mp4"></video></center>'
+		'You see a submissive woman, tied and being fucked by a dominant man. Their eyes are locked and they are oblivious to the crowd of people watching them.'
+
+		gs 'Mbasement', 'end'
+	elseif mbasement_rand > 70:
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/sex/subbyhubby.jpg"></center>'
+		'A dominate wife wearing a strap-on fucks her husband with another man.'
+
+		gs 'Mbasement', 'end'
+	elseif mbasement_rand > 67:
+		*clr & cla
+		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/3dom.mp4"></video></center>'
+		'Three dommes taking turn fucking their submissive male bent over a padded bench.'
+
+		gs 'Mbasement', 'end'
+	elseif mbasement_rand > 64:
+		*clr & cla
+		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/2domsub.mp4"></video></center>'
+		'Two dommes fuck their subs wearing ball gags roughly, in a contest to see how can make their sub orgasm first.'
+
+		gs 'Mbasement', 'end'
+	elseif mbasement_rand > 61:
+		*clr & cla
+		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/stacross.mp4"></video></center>'
+		'A woman is shackled to a Saint Andrews Cross while several dom''s take turns whipping her.'
+
+		gs 'Mbasement', 'end'
+	elseif mbasement_rand <= 61:
+		*clr & cla
+		menu_off = 0
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/basement.jpg"></center>'
+		'Basement, for torture and whatnot'
+
+		act 'Go upstairs to the east wing hallway': killvar 'mbasement_rand' & gt 'MHall', 'east'
+	end
 end
 
-
-
 if $ARGS[0] = 'end':
+	menu_off = 1
 	gs 'arousal', 'voyeur', 5
 	gs 'arousal', 'end'
 	gs 'stat'
 
-	act 'Return':gt 'MBasement'
+	act 'Continue': gt 'MBasement', 'start'
 end
-
+	
 --- MBasement ---------------------------------
 

locations/MHall.qsrc

@@ -70,7 +70,7 @@ if $ARGS[0] = 'east':
 	act 'Go to the kitchen':gt 'MKitchen', 'kitchen'
 	act 'Go to the laundry':gt 'MKitchen', 'laundry'
 	act 'Go upstairs to the west wing landing':gt 'MLanding', 'west'
-	act 'Go down to the basement':gt 'MBasement'
+	act 'Go down to the basement':gt 'MBasement', 'start'
 
 	if rand (0,100) < 3:
 		menu_off = 1

locations/belgang.qsrc

@@ -6,7 +6,7 @@ if $ARGS[0] = 'workofdebt':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
 	'The tinted window slides down and you find yourself staring directly into Vadim''s face. "Slut, get in. It''s time for you to work off your debts."'
-	' '
+	*nl
 	'You owe him: <<belgangPay>> <b>₽</b>'
 	if belgangPayWeek >= 0:
 		'This week you need to pay him: <<belgangPayWeek>> <b>₽</b>'
@@ -36,13 +36,7 @@ if $ARGS[0] = 'workofdebt':
 			end
 			'He signals his crew to get back in the jeep. You barely manage to dodge the spray of pebbles and dirt the spinning tires spew your way, as they drive off as fast as they can, probably on their way to another ''business appointment''.'
 			
-			if return_residential = 0: 
-				act 'Move on': gt 'pavCommercial'
-			elseif return_residential = 1: 
-				act 'Move on': gt 'pavResidential'
-			else
-				act 'Move on': gt 'pavIndustrial'
-			end
+			act 'Move on': gt $loc
 		end
 	end
 	
@@ -57,17 +51,11 @@ if $ARGS[0] = 'workofdebt':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/vadim/belymoney.jpg"></center>'
 			'You don''t get in, instead you hand him the payment for this week. "That''s it, everything for this week."'
 			'He takes a moment to count the money and nods approvingly. "Very good, it''s the full amount. See you next week, <<$pcs_nickname>>."'
-			' '
+			*nl
 			'You owe him: <<belgangPay>> <b>₽</b>'
 			'This week you need to pay him: <<belgangPayWeek>> <b>₽</b>'
 			
-			if return_residential = 0: 
-				act 'Move on': gt 'pavCommercial'
-			elseif return_residential = 1: 
-				act 'Move on': gt 'pavResidential'
-			else
-				act 'Move on': gt 'pavIndustrial'
-			end		
+			act 'Move on': gt $loc	
 		end
 	end
 	
@@ -99,7 +87,7 @@ elseif $ARGS[0] = 'payday':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
 	'Vadim Bely steps out, along with several of his henchmen. He gives you a smile that you know is 100% fake and behaves amicably while he says: "Long time no see, <<$pcs_nickname>>! How are you? I hope you bear good news?"'
-	' '
+	*nl
 	'You owe him: <<belgangPay>> <b>₽</b>'
 	if belgangPayWeek >= 0:
 		'This week you need to pay him: <<belgangPayWeek>> <b>₽</b>'
@@ -129,13 +117,7 @@ elseif $ARGS[0] = 'payday':
 			end
 			'He signals his crew to get back in the jeep. You barely manage to dodge the spray of pebbles and dirt the spinning tires spew your way, as they drive off as fast as they can, probably on their way to another ''business appointment''.'
 			
-			if return_residential = 0: 
-				act 'Move on': gt 'pavCommercial'
-			elseif return_residential = 1: 
-				act 'Move on': gt 'pavResidential'
-			else
-				act 'Move on': gt 'pavIndustrial'
-			end
+			act 'Move on': gt $loc
 		end
 	elseif money >= belgangPayWeek and money < belgangPay and belgangPayWeek > 0:
 		act 'Pay for this week (<<belgangPayWeek>> <b>₽</b>)':
@@ -162,17 +144,11 @@ elseif $ARGS[0] = 'payday':
 				end
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
 				'He gives you a fake smile. "See you next week, <<$pcs_nickname>>."'
-				' '
+				*nl
 				'You owe him: <<belgangPay>> <b>₽</b>'
 				'Next week you need to pay him: <<belgangPayWeek>> <b>₽</b>'
 				
-				if return_residential = 0: 
-					act 'Move on': gt 'pavCommercial'
-				elseif return_residential = 1: 
-					act 'Move on': gt 'pavResidential'
-				else
-					act 'Move on': gt 'pavIndustrial'
-				end
+				act 'Move on': gt $loc
 			end
 		end
 	elseif belgangPayWeek <= 0:
@@ -197,15 +173,11 @@ elseif $ARGS[0] = 'payday':
 			end
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
 			'He gives you a fake smile, gets back in his jeep and drives away.'
-			' '
+			*nl
 			'You owe him: <<belgangPay>> <b>₽</b>'
 			'Next week you need to pay him: <<belgangPayWeek>> <b>₽</b>'
 			
-			if return_residential = 0: 
-				act 'Move on': gt 'pavCommercial'
-			else
-				act 'Move on': gt 'pavResidential'
-			end	
+			act 'Move on': gt $loc
 		end
 	else 
 		act 'You don''t have the money':
@@ -229,15 +201,11 @@ elseif $ARGS[0] = 'payday':
 					SaunaWhore = 1
 					'"But since you are such an obedient whore, <<$pcs_nickname>>, I''ll help you out. If you need more money, go to the sauna in the city and tell them Mr. Bely sends you. There you will have plenty of opportunities to use your ''talents''."'
 				end
-				' '
+				*nl
 				'You owe him: <<belgangPay>> <b>₽</b>'
 				'Next week you need to pay him: <<belgangPayWeek>> <b>₽</b>'
 				
-				if return_residential = 0: 
-					act 'Thank him and leave': gt 'pavCommercial'
-				else
-					act 'Thank him and leave': gt 'pavResidential'
-				end
+				act 'Move on': gt $loc
 			elseif belgangPayextension = 1:	
 				belgangPayextension += 1
 				belgangPay += 5000
@@ -250,17 +218,11 @@ elseif $ARGS[0] = 'payday':
 					SaunaWhore = 1
 					'"But since you are such an obedient whore, <<$pcs_nickname>>, I''ll help you out. If you need more money, go to the sauna in the city and tell them Mr. Bely sends you. There you will have plenty of opportunities to use your ''talents''."'
 				end
-				' '
+				*nl
 				'You owe him: <<belgangPay>> <b>₽</b>'
 				'Next week you need to pay him: <<belgangPayWeek>> <b>₽</b>'
 				
-				if return_residential = 0: 
-					act 'Thank him and leave': gt 'pavCommercial'
-				elseif return_residential = 1: 
-					act 'Thank him and leave': gt 'pavResidential'
-				else
-					act 'Thank him and leave': gt 'pavIndustrial'
-				end
+				act 'Move on': gt $loc
 			else 
 				'He frowns, abruptly cutting you off. You can see the disapproval in his eyes when you glance up. "That is very unfortunate <<$pcs_nickname>>. I had such high hopes for you," he says. "I guess we will have to find an alternative way for you to pay off your debts."'
 				'He then directs his attention to two of his henchmen: "She''s coming with us."'

locations/belpicknick.qsrc

@@ -355,7 +355,7 @@ if $ARGS[0] = 'end':
 		belgangPay -= belsexpayment
 		belgangPayWeek -= belsexpayment
 		'"You''re getting there whore." Mr. Bely writes off <<belsexpayment>> <b>₽</b> from your debt. He looks at you probably planning what he could do next to you. "Run along now, I have business to take care off." he says as he''s escorting you to the door, as he''s closing the door you hear him say; "Don''t you ever forget who''s your master, <<$pcs_nickname>>."'
-		' '
+		*nl
 		'You owe him: <<belgangPay>> <b>₽</b>'
 		if belgangPayWeek >= 0:
 			'This week you need to pay him: <<belgangPayWeek>> <b>₽</b>'
@@ -364,7 +364,9 @@ if $ARGS[0] = 'end':
 			'You have reduced your next weeks payment by: <<-1*belgangPayWeek>> <b>₽</b>'
 		end
 	end
-	' '	
+	
+	*nl
+	
 	if rand(1,100) <= 70:
 		minut += 60
 		'Vadim looks at you again, and sees how dirty you are, "I don''t want cum stains on my car seats. Still, we can''t just leave her here... put her in the trunk." Two of the guys push you in the trunk a bit more forcefully than is needed; it''s not like you have any energy left to resist after what happened here. After a bumpy ride the car pulls to a stop on the outskirts of Pavlovsk, and Tatar got out of the car to open the trunk. He pulls you out of the trunk, throws down your clothes next to you and gets back in before they race off, leaving you to fend for yourself. Your body feels exhausted as you slowly get dressed, and make your way to town.'

locations/pavCommercial.qsrc

@@ -159,7 +159,7 @@ if npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23 and
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/vadim/belyjeep.jpg"></center>'
 	'As you walk through Pavlovsk, Vadim Belys Mitsubishi Pajero stops near you.'
 
-	act 'Go to the jeep': return_residential = 0 & gt 'belgang', 'payday'
+	act 'Go to the jeep': gt 'belgang', 'payday'
 elseif npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23 and week ! 7 and belgangPayWeek >= 300 and belgangProstitute = 1 and rand (0,2) = 0:
 	cla & *clr
 	daybelisex = daystart
@@ -168,7 +168,7 @@ elseif npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/vadim/belyjeep.jpg"></center>'
 	'You see the by now familiar old Mitsubishi Pajero driving through the streets with Vadim Bely and his gang. Your heart skips a beat as you notice one of them pointing at you, and soon they pull over.'
 
-	act 'Go to the jeep': return_residential = 0 & gt 'belgang', 'workofdebt'
+	act 'Go to the jeep': gt 'belgang', 'workofdebt'
 end
 
 --- pavCommercial ---------------------------------

locations/pavIndustrial.qsrc

@@ -103,7 +103,7 @@ if npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23 and
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/vadim/belyjeep.jpg"></center>'
 	'As you walk through Pavlovsk, Vadim Belys Mitsubishi Pajero stops near you.'
 
-	act 'Go to the jeep': return_residential = 2 & gt 'belgang', 'payday' 	
+	act 'Go to the jeep': gt 'belgang', 'payday' 	
 elseif npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23 and week ! 7 and belgangPayWeek >= 300 and belgangProstitute = 1 and rand (0,2) = 0:
 	menu_off = 1
 	cla & *clr
@@ -114,7 +114,7 @@ elseif npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/vadim/belyjeep.jpg"></center>'
 	'You see the by now familiar old Mitsubishi Pajero driving through the streets with Vadim Bely and his gang. Your heart skips a beat as you notice one of them pointing at you, and soon they pull over.'
 		
-	act 'Go to the jeep': return_residential = 2 & gt 'belgang', 'workofdebt' 	
+	act 'Go to the jeep': gt 'belgang', 'workofdebt' 	
 end
 
 --- pavIndustrial ---------------------------------

locations/pavResidential.qsrc

@@ -237,7 +237,7 @@ if npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23 and
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/vadim/belyjeep.jpg"></center>'
 	'As you walk through Pavlovsk, Vadim Belys Mitsubishi Pajero stops near you.'
 
-	act 'Go to the jeep': return_residential = 1 & gt 'belgang', 'payday' 	
+	act 'Go to the jeep': gt 'belgang', 'payday' 	
 elseif npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23 and week ! 7 and belgangPayWeek >= 300 and belgangProstitute = 1 and rand (0,2) = 0:
 	menu_off = 1
 	cla & *clr
@@ -248,7 +248,7 @@ elseif npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/vadim/belyjeep.jpg"></center>'
 	'You see the by now familiar old Mitsubishi Pajero driving through the streets with Vadim Bely and his gang. Your heart skips a beat as you notice one of them pointing at you, and soon they pull over.'
 		
-	act 'Go to the jeep': return_residential = 1 & gt 'belgang', 'workofdebt' 	
+	act 'Go to the jeep': gt 'belgang', 'workofdebt' 	
 end
 
 

locations/rolanbath.qsrc

@@ -30,7 +30,7 @@ if $ARGS[0] = 'start':
 		'The bathroom is in much better shape since you worked on it.'
 	end
 	
-!!	'A <a href="exec:gt ''mirror'',''start''">mirror</a>, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair hangs over the sink.'
+	'A <a href="exec:gt ''mirror'',''start''">mirror</a>, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair hangs over the sink.'
 	
 	if rolanworker = 2 and (RolanLoc[hour] = 9 or RolanLoc[hour] = 10):
 !	if rolanworker = 2 and RolanLoc[hour] = 9 or RolanLoc[hour] = 10: