Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife

locations/city_musicstore.qsrc

@@ -115,13 +115,13 @@ if $ARGS[0] = 'firstvisit':
 				act 'You have to think about it':
 					ml_didntbuyguitarthefirstvisit = 1
 					'You hesitate for a moment, unsure whether to buy it or not and finally decide to not do it, at least not now. "I will have to talk to my mum first" you say to Jimmy. '
-					'He just nods "Don''t worry <<$pcs_firstname>>. You know what, I will put it aside for you for a bit in case you change your mind". He scribbles something on a post-it note, and sticks it on the guitar "I will try to keep the price the same, 3,400 rubels."'
+					'He just nods "Don''t worry <<$pcs_firstname>>. You know what, I will put it aside for you for a bit in case you change your mind". He scribbles something on a post-it note, and sticks it on the guitar "I will try to keep the price the same, 3,400 <b>₽</b>."'
 					act 'Leave': gt 'torgcentr'
 				end
 			else
 				ml_didntbuyguitarthefirstvisit = 1
 				'While the guitar is not the best sounding one it''s comfortable. Unfortunately while it''s cheaper than the rest, it still costs more than you have. With a sigh you hand it back to Jimmy "I''m sorry, but, I can''t buy it now."'
-				'He just nods "Don''t worry, I tell you what, I will put it aside for you if you change your mind." He scribbles something on a post-it note, and sticks it on the guitar "I will try to keep the price the same, 3,400 rubels."'
+				'He just nods "Don''t worry, I tell you what, I will put it aside for you if you change your mind." He scribbles something on a post-it note, and sticks it on the guitar "I will try to keep the price the same, 3,400 <b>₽</b>."'
 				act 'Leave': gt 'torgcentr'
 			end				
 		end

locations/music_guitarlesson.qsrc

@@ -15,7 +15,7 @@ if $ARGS[0] = 'enquiry':
 	*nl
 	'You shift on your feet "I''m <<$pcs_firstname>>, and yes, I think. Can you please tell me a bit more?"'
 	' "Sure. I assume you are a beginner..." he looks at you, and you nod "Then obviously we would start at the basics. The instrument, chords, some basic theory. We would meet once a week, here. 
-	If you have a guitar, that''s great, if not, you can use mine. But you will really need to get a guitar to practice at home. The lessons cost 500 rubels, but if you are under 18' +iif(vidage < 18, ', which I assume you are,', '')+ ' then it''s only 300 rubels."'
+	If you have a guitar, that''s great, if not, you can use mine. But you will really need to get a guitar to practice at home. The lessons cost 500 <b>₽</b>, but if you are under 18' +iif(vidage < 18, ', which I assume you are,', '')+ ' then it''s only 300 <b>₽</b>."'
 	*nl
 	'He looks at you "So, <<$pcs_firstname>>, do you think you would be interested in taking lessons?"'	
 	npc_rel['ML1'] = 45

locations/music_onlinemusic.qsrc

@@ -23,11 +23,11 @@ if $ARGS[0] = 'live_stream':
 		if mc_inventory['tech_computer'] = 1 and mc_inventory['tech_webcam'] = 1 and $location_type = 'private':
 			'<center><img <<$set_imgh>> src="images/pc/activities/music/gomixer_hero.jpg"/></center>'
 			'You set up your webcamera and start the streaming app on your computer. After settling down comfortably, you start to stream.'			
-			'Your fans tipped you <<ml_superchats>> rubels for your performance.'
+			'Your fans tipped you <<ml_superchats>> <b>₽</b> for your performance.'
 		else		
 			'<center><img <<$set_imgh>> src="images/pc/activities/music/gomixer_hero.jpg"/></center>'
 			'You set up your phone on a little tri-pod and log into your account. After settling down comfortably, you start to stream.'			
-			'Your fans tipped you <<ml_superchats>> rubels for your performance.'
+			'Your fans tipped you <<ml_superchats>> <b>₽</b> for your performance.'
 		end	
 	else
 		!! How many minutes did the stream last.
@@ -38,10 +38,10 @@ if $ARGS[0] = 'live_stream':
 	
 	if bankAccount = 0:			
 		*nl
-		'You have earned <b><<ml_streaming[''unclaimed_earnings'']>></b> rubels so far, but you need to open a bank account before you can receive the money.'
+		'You have earned <b><<ml_streaming[''unclaimed_earnings'']>></b> <b>₽</b> so far, but you need to open a bank account before you can receive the money.'
 	else		
 		*nl
-		'You have <b><<ml_streaming[''unclaimed_earnings'']>></b> rubels on your account.'
+		'You have <b><<ml_streaming[''unclaimed_earnings'']>></b> <b>₽</b> on your account.'
 
 		act 'Stop the stream and transfer the money to your bank account':				
 			karta += ml_streaming['unclaimed_earnings']

locations/pav_disco_sex.qsrc

@@ -2262,7 +2262,7 @@ if $ARGS[0] = 'drugs':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/sex/hotel/snort1.jpg"></center>'
 	'He''s planted a tiny nagging seed in your thoughts, and now you''re too curious to refuse. You give him a nod and walk closer.'
-	'He cuts up a line and tells you to close one of your nostrils with a finger while you snort it in with the other, using a rolled-up Rubel.'
+	'He cuts up a line and tells you to close one of your nostrils with a finger while you snort it in with the other, using a rolled-up Ruble.'
 	'You hunch over the powder, line yourself and snort it. The tingling and dry itching sensation is almost too much, and you suddenly feel like your nostril is on fire.'
 	'You don''t really feel anything different for a while. "I think you got scammed with this stuff. I don''t feel a thing... " you complain, slightly disappointed. Then, suddenly, you feel your heartbeat speeding up, your nipples getting hard, and your pussy getting wet. In fact, it feels like your pussy is soaked more than ever, and you''re feeling extremely horny. You desperately want, no... you need to fuck something as soon as you can.'
 	'<<$npc_firstname[$npclastsaved]>> looks at you and smirks as he notices the powder kicking in. "Feels great, right? Ready for some real fun?"'

locations/prostitution_functions.qsrc

@@ -494,18 +494,22 @@ end
 !!---------- Chaging outfits in public locations ------------------------------------------------------------------------
 !!------ Changing clothes --------------------------
 if $ARGS[0] = 'change_to_work':
-	cla
-	*clr
+	cla & *clr
 	minut += 10
 	if $ARGS[1] = 'car':
 		!! TODO: Video / image and some text describing the cloth change in the car
-		''+iif($loc_desc = $loc_desc, 'You quickly change into your working outfit in your car.', $loc_desc)
+		''+iif($loc_desc = '', 'You quickly change into your working outfit in your car.', $loc_desc)
 	end
 
 	if $ARGS[1] = 'restroom':
 		!! TODO: Video / image and some text describing the cloth change in the men''s restroom
 		!! Is there a way to know if it''s a men''s or women''s restroom?
-		''+iif($loc_desc = $loc_desc,  'You slip into a stall and quickly change into your working outfit, trying to avoid your clothes touching the floor or, really, anything before you place them safely in your bag.', $loc_desc)
+		''+iif($loc_desc = '',  'You slip into a stall and quickly change into your working outfit, trying to avoid your clothes touching the floor or, really, anything before you place them safely in your bag.', $loc_desc)
+	end
+
+	if $ARGS[1] = 'road_side':
+		!! TODO: Video / image and some text describing the cloth change next to a road
+		''+iif($loc_desc = '', 'You quickly change into your working outfit behind some bushes by the road.', $loc_desc)
 	end
 
 	gs 'prostitution_functions', 'change_into_prostitute_outfit', 'work'
@@ -513,23 +517,29 @@ if $ARGS[0] = 'change_to_work':
 end
 
 if $ARGS[0] = 'change_back':
-	cla
-	*clr
+	cla & *clr
 	minut += 10
 	if $ARGS[1] = 'car':
 		!! TODO: Video / image and some text describing the cloth change in the car
-		'You quickly change into your working outfit in your car.'
+		'You quickly change into your working everyday clothes in your car.'
 	end
 
 	if $ARGS[1] = 'restroom':
 		!! TODO: Video / image and some text describing the cloth change in the men''s restroom
-		'You quickly change into your working in the men''s restroom..'
+		'You quickly change into your everyday clothes in the men''s restroom..'
 	end
 
 	if $loc_arg = 'restroom_women':
 		!! TODO: Video / image and some text describing the cloth change in the women''s restroom
-		'You quickly change into your working outfit in the women''s restroom.'
+		'You quickly change into your everyday clothes in the women''s restroom.'
+	end
+
+	if $ARGS[1] = 'road_side':
+		!! TODO: Video / image and some text describing the cloth change next to a road
+		'You quickly change into your everyday clothes behind some bushes by the road.'
 	end
+
+
 	gs 'prostitution_functions', 'change_into_regular_clothes'
 	act 'Finish': gt $loc, $loc_arg
 end

locations/qwBarEncounters.qsrc

@@ -180,7 +180,7 @@ if $ARGS[0] = '':
 				'"Well, it''s not really worth much when you ''almost'' win the lottery or ''almost'' had an orgasm," you say with a grin.'
 				'"True," he laughs. "How about you give me a chance to restore my honor? A rematch? And now that we know what we''re up against, we could make it more interesting by playing for money."'
 				'"How much were you thinking?", you ask.'
-				'"I don''t know... 2,500 rubels?"'
+				'"I don''t know... 2,500 <b>₽</b>?"'
 
 				act 'Decline':
 					cla

locations/road.qsrc

@@ -152,27 +152,43 @@ if $ARGS[0] = '':
 		'A <a href="exec:minut += 5 & gt ''furi''">lorry</a> is parked next to the road. The driver is currently taking a break and is having a cigarette. He could probably bring you to Pavlovsk or St. Petersburg, for a price...'
 		if npc_QW['A60'] > 15: 'Mira <a href="exec:gt ''gadprostitutes'', ''start''">prostitutes</a> herself around here.'
 		if hour >= 16 and hour <= 23 and prostitute['gadukino'] = 1:
-				if car > 0 and cardrive = 22 and ncarroad = nroad:'You parked <a href="exec:gs ''carF'', ''start''">your <<$car>></a> in a quieter spot on the side road to Gadukin.'
-				if PCloStyle = 4: 
-					act 'You can work as a prostitute here': gt 'gadprostitutes', 'start'
-					if car > 0 and cardrive = 22 and ncarroad = nroad and prostitute['changed_for_work']: 
-						act 'You can change into your regular clothes in your car': gt 'prostitution_functions', 'change_back', 'car'
-					end
-				elseif car > 0 and cardrive = 22 and ncarroad = nroad AND prostitute['outfit_is_set']:
-					$loc_desc = 'You change into some more appropriate clothing in your car, then walk down the road a little to catch the attention of passing cars.'
-					gs 'prostitution_functions', 'change_to_work', 'car'
-					killvar '$loc_desc' 
+			if car > 0 and cardrive = 22 and ncarroad = nroad:'You parked <a href="exec:gs ''carF'', ''start''">your <<$car>></a> in a quieter spot on the side road to Gadukin.'
+			
+			gs 'prostitution_functions', 'work_clothes'
+			if prostitute['work_clothes']: 
+				act 'You can work as a prostitute here': gt 'gadprostitutes', 'start'
+				if car > 0 and cardrive = 22 and ncarroad = nroad and prostitute['changed_for_work']: 
+					act 'Change into your regular clothes': gt 'prostitution_functions', 'change_back', 'car'
+				elseif prostitute['changed_for_work']:
+					act 'Change into your regular clothes': gt 'prostitution_functions', 'change_back', 'road_side'
+				end
+			end
+			if  prostitute['work_clothes'] = 0 and prostitute['outfit_is_set']: 
+				if car > 0 and cardrive = 22 and ncarroad = nroad: 
+					act 'Change to work as a prostitute': gt 'prostitution_functions', 'change_to_work', 'car'
+				else
+					act 'Change to work as a prostitute': gt 'prostitution_functions', 'change_to_work', 'road_side'
 				end
+			end
 		elseif prostitute['road'] = 1 and ((prostitute['wl_block'] = 0 and prostitute['full_block'] = 0) or (prostitute['wl_block'] = 1 and prostitute['payment_method'] = 1)):
 			if car > 0 and cardrive = 22 and ncarroad = nroad:'You parked <a href="exec:gs ''carF'', ''start''">your <<$car>></a> in a quieter spot on the side road to Gadukin.'
+			
 			gs 'prostitution_functions', 'work_clothes'
 			if  prostitute['work_clothes'] = 0 and prostitute['outfit_is_set']: 
+				if car > 0 and cardrive = 22 and ncarroad = nroad: 
 					$loc_desc = 'You change into some more appropriate clothing in your car, then walk down the road a little to catch the attention of passing cars.'
-					gs 'prostitution_functions', 'change_to_work', 'car'
-					killvar '$loc_desc' 
+					act 'Change to work as a prostitute': gt 'prostitution_functions', 'change_to_work', 'car'
+				else
+					$loc_desc = 'You change into some more appropriate clothing behind the bushes, then walk down the road a little to catch the attention of passing cars.'
+					act 'Change to work as a prostitute': gt 'prostitution_functions', 'change_to_work', 'road_side'
+				end
 			elseif prostitute['work_clothes']:
-				act 'Start to work': gt 'road_prostitution', 'work'
-				if prostitute['changed_for_work']: act 'Change into your regular clothes': gt 'prostitution_functions', 'change_back', 'car'
+				act 'Work as a prostitute': gt 'road_prostitution', 'work'
+				if car > 0 and cardrive = 22 and ncarroad = nroad and prostitute['changed_for_work']: 
+					act 'Change into your regular clothes': gt 'prostitution_functions', 'change_back', 'car'
+				elseif prostitute['changed_for_work']:
+					act 'Change into your regular clothes': gt 'prostitution_functions', 'change_back', 'road_side'
+				end
 			end
 		else
 			if car > 0 and cardrive = 22 and ncarroad = nroad and nroad ! 10:'You parked <a href="exec:gs ''carF'', ''start''">your <<$car>></a> next to the road.'
@@ -220,12 +236,20 @@ if $ARGS[0] = '':
 	if prostitute['road'] = 1 and nroad ! 10 and nroad ! 20 and ((prostitute['wl_block'] = 0 and prostitute['full_block'] = 0) or (prostitute['wl_block'] = 1 and prostitute['payment_method'] = 1)):
 		gs 'prostitution_functions', 'work_clothes'
 		if  prostitute['work_clothes'] = 0 and prostitute['outfit_is_set']: 
-			$loc_desc = 'You change into some more appropriate clothing in your car, then walk down the road a little to catch the attention of passing cars.'
-			gs 'prostitution_functions', 'change_into_prostitute_outfit', 'work'
-			killvar '$loc_desc' 
+			if car > 0 and cardrive = 22 and ncarroad = nroad: 
+				$loc_desc = 'You change into some more appropriate clothing in your car, then walk down the road a little to catch the attention of passing cars.'
+				act 'Change to work as a prostitute': gt 'prostitution_functions', 'change_to_work', 'car'
+			else
+				$loc_desc = 'You change into some more appropriate clothing behind the bushes, then walk down the road a little to catch the attention of passing cars.'
+				act 'Change to work as a prostitute': gt 'prostitution_functions', 'change_to_work', 'road_side'
+			end
 		elseif prostitute['work_clothes']:
-			act 'Start to work': gt 'road_prostitution', 'work'
-			if prostitute['changed_for_work']: act 'Change into your regular clothes': gt 'road', 'change_back'
+			act 'Work as a prostitute': gt 'road_prostitution', 'work'
+			if car > 0 and cardrive = 22 and ncarroad = nroad and prostitute['changed_for_work']: 
+				act 'Change into your regular clothes': gt 'prostitution_functions', 'change_back', 'car'
+			elseif prostitute['changed_for_work']:
+				act 'Change into your regular clothes': gt 'prostitution_functions', 'change_back', 'road_side'
+			end
 		end
 	end
 end

locations/sleep_events.qsrc

@@ -148,7 +148,7 @@ end
 	!!=====================================!!
 
 if $ARGS[0] = 'vibr_orgasm':
-	gt 'sleep_events', 'vibr_orgams2'
+	gt 'sleep_events', 'vibr_orgasm2'
 end
 
 if $ARGS[0] = 'wake_horny':
@@ -177,8 +177,6 @@ if $ARGS[0] = 'vibr_orgasm2':
 		'Maybe trying to sleep with a vibrator in your pussy wasn''t such a good idea.'
 		gs 'sleep_events', 'event_end', 'wake'
 	end
-
-	exit
 end
 
 

locations/sleep_simple.qsrc

@@ -33,7 +33,7 @@ if $ARGS[0] = 'simple':
 		sleepVars['stime'] += 1
 		sleepVars['time_now'] += 1
 		sleepVars['minutes_to_wakeup'] -= 1
-		sleepVars['time_to_full']
+		sleepVars['time_to_full'] -= 1
 
 		if recuperation = 0: pcs_health += 5
 

locations/stripclub.qsrc

@@ -203,7 +203,9 @@ if $ARGS[0] = 'manager_stripper':
 			'"Come back when you can dance on stage without me worrying you''ll fall off, and I''ll give you another chance."'
 			act 'Leave':gt 'stripclub', 'work_leave'
 		end
-	!!elseif stripbarwork = 1 or stripbarwork1 = 1:
+!! For when bar work as a job is available will need to be moved so it is checked for first
+!!{
+	elseif stripbarwork = 1 or stripbarwork1 = 1:
 		'You enter the manager''s office and he greets you with a smile. "Hey there <<$pcs_nickname>>, how can I help you?"'
 		'You return the smile. "Hi, I was wondering if I could get a job as a stripper?"'
 		'The manager chuckles. "Bored of watching the action and wanting to get in on it?"'
@@ -272,7 +274,7 @@ if $ARGS[0] = 'manager_stripper':
 			'"Come back when you can dance on stage without me worrying you''ll fall off, and I''ll give you another chance."'
 			act 'Leave':gt 'stripclub', 'work_leave'
 		end
-
+}
 	else
 		'"Nearly..." you say dejectedly.'
 		'"Right. You need to leave, but be sure to come back when you''re old enough," he replies.'

locations/therapist_hotel.qsrc

@@ -165,7 +165,7 @@ if $ARGS[0] = 'event2':
 	minut += 2
 	gs 'stat'
 
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/arrive2.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/hotel_arrive2.jpg"></center>'
 	'Once more, it''s Saturday night, and you find yourself entering a hotel room that you have a key to, with the goal of locating the person staying here so that you can return the key to them. However, you find yourself looking directly at him, someone you know, naked and hard while looking you over. Before you can do anything, your mind goes blank and you are in the black room of your hypnotized state, leaving you at his mercy.'
 	'"My wife, you''ve returned to me. Come, remove your clothes and sit next to me and we''ll talk" he says to you, and as if your legs move on their own, you remove your clothes before sitting down beside him.'
 
@@ -252,7 +252,7 @@ if $ARGS[0] = 'event2_shower':
 				*clr & cla
 				therapistQW['hotel_visits'] = 2
 				gs 'sleep_simple', 'simple'
-				if hour < 7: 
+				if hour < 7:
 					hour = 7
 					gs 'stat'
 					pcs_sleep = max(pcs_sleep, 100)
@@ -265,7 +265,7 @@ if $ARGS[0] = 'event2_shower':
 				gs 'bras', 'wear', $lastwornbratype['therapist'], lastwornbranumber['therapist']
 				gs 'stat'
 
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/creampy2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/hotel_creampy2.jpg"></center>'
 				'You wake up the next morning feeling like a million dollars. You sit up and feel something squirt out of your pussy. You were filled up by whomever you slept. Your subconscious mind makes your body want to keep it inside you. You get up, shower, dress and head back to town.'
 				act 'Continue': gt 'pav_market'
 			end
@@ -403,7 +403,7 @@ if $ARGS[0] = 'event4':
 		minut += 2
 		gs 'stat'
 
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/arrive4.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/hotel_arrive4.jpg"></center>'
 		'"Ah, my wife, how are you today." He says while getting up and walking over to kiss you on the lips. You return the kiss as if it was natural. "There is something I want you to do for me today" he says and snaps his fingers. "You will stay in here naked and ready for me. I''m leaving to go get us something to eat." He whispers and snaps his fingers again and you wake up. "I''ll be back in a few minutes," he explains and pulls your towel off as he leaves the room, leaving you naked and alone.'
 
 		act 'Submit':