Ver Fonte

Merge remote-tracking branch 'Spackled_Lanturn/minor-fixes'

KevinSmarts há 3 anos atrás
pai
commit
5855b1d178

+ 3 - 1
locations/IvanEv.qsrc

@@ -143,10 +143,12 @@ if $ARGS[0] = 'School Chat':
 				else
 					act 'Tell Ivan you''re bored':gt 'gdksport', 'Ivan_bored'
 				end
+			!! Since Ivan is only asking about the current day, not indefinitely, might be good to use a
+			!! daystart variable here and in the scene in gdksport IvanShowerYes guards
+			!! (like IvanShowerDayStart or something)
 			elseif IvanShowerYes = 0 and IvanShowerQW = 11 and ShowerIvan < 3:
 				'When you''re about to head for your next class, Ivan suddenly stops you and asks: "<<$pcs_nickname>>, want to meet up with me in the showers after school?"'
 				act 'Decline':
-					IvanShowerYes = 2
 					cla
 					'You give it some thought, but have to decline. You shake your head apologetically and say: "Sorry Ivan, I can''t make it today."'
 					act 'Continue': gt 'gschool_lessons', 'short_break'

+ 3 - 1
locations/VoltrenerSexShower.qsrc

@@ -60,6 +60,9 @@ if $ARGS[0] = '1':
 	end
 end
 
+!! Note, this scene does not increase VoltrenerVoyeur unlike the other VoltrenerSexShower scenes.
+!! This is intentional. The way to raise VoltrenerVoyeur from 2 to 3 is to talk to the coach about
+!! him spying on the player in the shower.
 if $ARGS[0] = '2':
 	cls
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenersexshower1.jpg"></center>'
@@ -74,7 +77,6 @@ if $ARGS[0] = '2':
 	if (pcs_horny >= 70 or pav_slut > 50) and will_cost <= pcs_willpwr:
 		act 'Masturbate (<<will_cost>> Willpower)':
 			gs 'willpower', 'pay', 'self'
-			if IvanShowerYes = 2: VoltrenerVoyeur += 1
 			npc_rel['A69'] += 1
 			trenerlust += 4
 			minut += 10

+ 13 - 7
locations/gdksport.qsrc

@@ -591,7 +591,7 @@ if $ARGS[0] = 'shower':
 	if IvanShowerYes = 1 and rand(0,3) = 1 and ShowerIvan < 3:
 		if ShowerIvan = 1: ShowerIvan = 2
 		'You enter the women''s shower, and turning the water on, you begin to lather up your body with a washcloth. Suddenly, you hear the door creak open and you remember that you agreed not to lock it for Ivan.'
-		'You look around and see Ivan standing there looking at you. "Hello <<$pcs_nickname>>. The men''s shower is full, so I thought I would join you instead." he smiles.'
+		'You look around and see Ivan standing there looking at you. "Hello <<$pcs_nickname>>. The men''s shower is full, so I thought I would join you instead." He smiles.'
 		act 'Shower with Ivan': gt 'gdksport', 'ShowerWithIvan'
 		gs 'willpower', 'bj', 'resist'
 		if will_cost <= pcs_willpwr:
@@ -609,15 +609,22 @@ if $ARGS[0] = 'shower':
 		else
 			act 'Not today (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
-	elseif kotovVSprohorov = 1 and ShowerIvan < 3:
-		kotovVSprohorov = 2
+	!! We only set IvanShowerQW = 1 if the player showers with Ivan because the scene that uses this
+	!! variable where the player talks to Ivan about the shower at school assumes the player did
+	!! not run away or kick out Ivan before anything happened. This scene was initially a one-off,
+	!! but was changed to make it repeatable because showering with Ivan here is non-obviously an
+	!! intermediate step in becoming a starter on the volleyball team. If avoiding needing this
+	!! scene to be repeatable is desired, someone with a better sense of Ivan as a character than
+	!! me could add one at some point. If this is done, this scene can be made non-repeatable by
+	!! removing the (kotovVSprohorov = 2 and IvanShowerQW = 0 and rand(0,3) = 1) part
+	elseif (kotovVSprohorov = 1 or (kotovVSprohorov = 2 and IvanShowerQW = 0 and rand(0,3) = 1)) and ShowerIvan < 3:
 		'You enter the women''s shower and turning the water on, begin to lather your body with a washcloth. Suddenly, you hear the door creak open and you remember that you forgot to lock it.'
-		'You look around and see Ivan standing in the doorway looking at you. "Hi <<$pcs_nickname>>. Can I join you? The men''s shower is full." he smiles.'
+		'You look around and see Ivan standing in the doorway looking at you. "Hi <<$pcs_nickname>>. Can I join you? The men''s shower is full' + iif(kotovVSprohorov = 2, ' again', '') + '." He smiles.'
+		kotovVSprohorov = 2
 		gs 'willpower', 'bj', 'resist'
 		if will_cost <= pcs_willpwr:
 			act 'Throw Ivan out (<<will_cost>> Willpower)':
 				*clr & cla
-				IvanShowerQW = 1
 				gs 'willpower', 'bj', 'resist'
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
@@ -640,7 +647,6 @@ if $ARGS[0] = 'shower':
 			if will_cost <= pcs_willpwr:
 				act 'Escape from the shower (<<will_cost>> Willpower)':
 					*clr & cla
-					IvanShowerQW = 1
 					gs 'willpower', 'bj', 'resist', 'hard'
 					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
@@ -652,6 +658,7 @@ if $ARGS[0] = 'shower':
 				act 'Escape from the shower (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			act 'Wash together':
+				IvanShowerQW = 1
 				IvanShowerYes = 0
 				if ShowerIvan = 0: ShowerIvan = 1
 				gt 'gdksport', 'ShowerWithIvan'
@@ -736,7 +743,6 @@ if $ARGS[0] = 'ShowerWithIvan':
 				else
 					act 'Turn around and bend over':
 						*clr & cla
-						IvanShowerQW = 1
 						lubonus = 2
 						spafinloc = 3
 						gs 'Cum_Manage'

+ 2 - 1
locations/gschool_chats1.qsrc

@@ -1339,10 +1339,11 @@ if $ARGS[0] = 'ivan':
 		else
 			act 'Tell Ivan you''re bored':gt 'gdksport', 'Ivan_bored'
 		end
+	!! Since Ivan is only asking about the current day, not indefinitely, might be good to use a daystart
+	!! variable here and in the scene in gdksport IvanShowerYes guards (IvanShowerDayStart or something)
 	elseif IvanShowerYes = 0 and IvanShowerQW = 11 and ShowerIvan < 3:
 		'When you''re about to head for your next class, Ivan suddenly stops you and asks: "<<$pcs_nickname>>, want to meet up with me in the showers after school?"'
 		act 'Decline':
-			IvanShowerYes = 2
 			cla
 			'You give it some thought, but have to decline. You shake your head apologetically and say "Sorry Ivan, I can''t make it today."'
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'

+ 57 - 71
locations/road.qsrc

@@ -45,7 +45,7 @@ if $ARGS[0] = '':
 			if gorand<=60:
 				'<center><B>Main road between St. Petersburg and Pavlovsk</B></center>'
 				'<center><img <<$set_imgh>> src="images/locations/highway/autostop (<<picrand>>).jpg" ></center>'
-				'You try to catch the attention of people driving towards Pavlovsk but everyone just rushes by, ignoring you completely.'
+				'You try to catch the attention of people driving towards Pavlovsk, but everyone just rushes by, ignoring you completely.'
 				act 'Continue':gt $curloc
 			elseif gorand>60:
 				gs 'road', 'autostop_d'
@@ -70,7 +70,7 @@ if $ARGS[0] = '':
 			if gorand<=60:
 				'<center><B>Main road between St. Petersburg and Pavlovsk</B></center>'
 				'<center><img <<$set_imgh>> src="images/locations/highway/autostop (<<picrand>>).jpg" ></center>'
-				'You try to catch the attention of people driving towards St. Petersburg but everyone just rushes by, ignoring you completely.'
+				'You try to catch the attention of people driving towards St. Petersburg, but everyone just rushes by, ignoring you completely.'
 				act 'Continue':gt $curloc
 			elseif gorand>60:
 				gs 'road', 'autostop_d'
@@ -89,18 +89,18 @@ if $ARGS[0] = '':
 	end
 
 	if nroad = 0:
-		'You''re on the outskirts of St. Petersburg. You see a number of crudely made huts near the trees, a bunch of homeless people must have sought shelter here.'
-		'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 Gadukino or Pavlovsk, for a price...'
+		'You''re on the outskirts of St. Petersburg. You see a number of crudely made huts near the trees. A bunch of homeless people must have sought shelter here.'
+		'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 Gadukino or Pavlovsk, for a price...'
 	elseif nroad = 1:
 		'You''re not very far from St. Petersburg. You see a bunch of <a href="exec:minut += 15 & gt ''city_suburbs'',''start''">luxury houses</a> not far from the road. That settlement looks like it''s very expensive to live in.'
 	elseif nroad = 2:
 		''
 	elseif nroad = 3:
-		'You see a sign pointing towards a <a href="exec:minut += 15 & gt ''graveyard''">cemetery</a>, hidden between lots of trees. You think it''ll be a 15 minute walk, from here.'
+		'You see a sign pointing towards a <a href="exec:minut += 15 & gt ''graveyard''">cemetery</a>, hidden between lots of trees. You think it''d be a 15 minute walk from here.'
 	elseif nroad = 4:
 		''
 	elseif nroad = 5:
-		'You see a <a href="exec:gt ''train'', ''communal''">railway platform</a> not far from the road. A bit further away, someone built <a href="exec:minut += 15 & gt ''dachi''">a bunch of cottages</a>. Some of them are for sale. This must be a nice place to stay at, in the summer!'
+		'You see a <a href="exec:gt ''train'', ''communal''">railway platform</a> not far from the road. A bit further away, someone built <a href="exec:minut += 15 & gt ''dachi''">a bunch of cottages</a>. Some of them are for sale. This must be a nice place to stay at in the summer!'
 	elseif nroad = 6:
 		''
 	elseif nroad = 7:
@@ -113,7 +113,7 @@ if $ARGS[0] = '':
 		display_bb = 1
 		gs 'stat'
 		'You see a <a href="exec:gt ''train'', ''village''">railway platform</a> not far from the road. In the same direction, a dirt road leads to the village of <a href="exec:minut += 15 & gt ''gadukino''">Gadukino</a>.'
-		'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...'
+		'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 and gadriver_gang = 2:
 		!	'You and Mira can both <a href="exec:gt ''gadprostitutes'', ''start''">prostitute</a> yourselves around here.'
 		!elseif npc_QW['A60'] > 15:
@@ -125,7 +125,7 @@ if $ARGS[0] = '':
 	elseif nroad = 11:
 		''
 	elseif nroad = 12:
-		'You see a <a href="exec:minut += 15 & gt ''motel''">trucker motel</a> near the road. You have no business there, you''re no trucker!'
+		'You see a <a href="exec:minut += 15 & gt ''motel''">trucker motel</a> near the road. You have no business there. You''re no trucker!'
 	elseif nroad = 13:
 		''
 	elseif nroad = 14:
@@ -139,20 +139,18 @@ if $ARGS[0] = '':
 	elseif nroad = 18:
 		''
 	elseif nroad = 19:
-		'You are on the outskirts of the <a href="exec:minut += 15 & gt ''liam''">old town</a> district of Pavlovsk about a five minutes down a cobblestone road is the old town center. It''s a fairly popular for tourists to explore with much of its old architecture still intact.'
+		'You are on the outskirts of the <a href="exec:minut += 15 & gt ''liam''">old town</a> district of Pavlovsk. About five minutes down a cobblestone road is the old town center. It''s a fairly popular place for tourists to explore with much of its old architecture still intact.'
 	elseif nroad = 20:
 		'The main road ends at the provincial town of Pavlovsk. You can see the castle in the distance.'
-		'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 Gadukino or St. Petersburg, for a price...'
+		'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 Gadukino or St. Petersburg, for a price...'
 		'A small road leads to an almost hidden old <a href="exec:gt ''brothel'', ''lobby''">hotel</a>. Usually tourists use it when passing by or when visiting the old town of Pavlovsk.'
 		if hour >= 7 and hour <= 17:
-			'You can see a bunch of trucks around the <a href="exec:gt ''NikoSlut'', ''Diner Exterior''">Boris diner</a>. Which is a diner that is frequently visited by both truckers and bikers.'
+			'You can see a bunch of trucks around the <a href="exec:gt ''NikoSlut'', ''Diner Exterior''">Boris diner</a>, which is a diner that is frequently visited by both truckers and bikers.'
 		else
-			'You can see a bunch of motorcycles around the <a href="exec:gt ''NikoSlut'', ''Diner Exterior''">Boris diner</a>. Which is a diner that is frequently visited by both truckers and bikers.'
+			'You can see a bunch of motorcycles around the <a href="exec:gt ''NikoSlut'', ''Diner Exterior''">Boris diner</a>, which is a diner that is frequently visited by both truckers and bikers.'
 		end
-		if hour = 22 and NikoEv < 21 and Yurik_Diner_Daystart ! daystart:
-			'You can see a <a href="exec:gt ''NikoSlut'', ''Yurik Out''">drunk man</a> stumbling along the highway with a beer bottle in his hand.'
-		elseif hour = 22 and NikoEv < 21 and Yurik_Diner_Daystart = daystart:
-			'He still seems to be stumbling along the highway with a beer bottle in his hand.'
+		if hour = 22 and NikoEv < 21:
+			'You can see <a href="exec:gt ''NikoSlut'', ''Yurik Out''">' + iif(YurikEv['Name'] = 'Yurik', 'Yurik', 'a big burly man') + '</a>, clearly drunk, stumbling along the highway with a beer bottle in his hand.'
 		end		
 	end
 end
@@ -180,16 +178,16 @@ if $ARGS[0] = 'drive_sex1':
 	end
 	'<center><B>Main road between St. Petersburg and Pavlovsk</B></center>'
 	'<center><video autoplay loop src="images/locations/highway/sex/bj (1).mp4" width="1000" height="562"></video></center>'
-	'When you get in the car, you immediately reach for his pants and take out his semi-erect cock. That''s what you promised him, after all. You feel it slowly hardening between your fingers as the man drives off.'
+	'When you get in the car, you immediately reach for his pants and take out his semi-erect cock. That''s what you promised him after all. You feel it slowly hardening between your fingers as the man drives off.'
 	if pcs_throat < dick: pcs_throat += 1
 	if dick >= 14 and dick < 16: $raod_text_sex = 'a normal size'
 	if dick >= 16 and dick < 18: $raod_text_sex = 'a bit larger than average'
 	if dick >= 18 and dick < 20: $raod_text_sex = 'quite large'
 	if dick >= 20: $raod_text_sex = 'huge'
-	'You gentle massage his cock between your fingers while the man gets comfortable. It''s <<$raod_text_sex>>, roughly <<dick>> centimetres long and quite girthy. You manage to massage him to a full erection in no time at all, and lower your head to take it between your lips.'
-	'As you lick the tip of his cock with your tongue and begin to suck him off, you have to admit: this is kinda hot! The man is well groomed, and has a pleasant masculine smell to him.'
-	'You eagerly bob your head up and down while he drives, totally forgetting about your earlier doubts and do your best to get him off.'
-	'With success: in no time at all, the man groans and his cock erupts inside your mouth, shooting gobs of his hot sperm onto your tongue while you keep your lips closed around his cock to not make a mess.'
+	'You gently massage his cock between your fingers while the man gets comfortable. It''s <<$raod_text_sex>>, roughly <<dick>> centimeters long and quite girthy. You manage to massage him to a full erection in no time at all, and lower your head to take it between your lips.'
+	'As you lick the tip of his cock with your tongue and begin to suck him off, you have to admit: this is kinda hot! The man is well groomed and has a pleasant masculine smell to him.'
+	'You eagerly bob your head up and down while he drives, totally forgetting about your earlier doubts, and do your best to get him off.'
+	'With success: in no time at all, the man groans, and his cock erupts inside your mouth, shooting gobs of his hot sperm onto your tongue while you keep your lips closed to not make a mess.'
 	'Realizing you can''t spit it out anywhere, you have no option but to swallow his load while he keeps driving.'
 	
 	gs 'arousal', 'hj', 15, 'prostitution'
@@ -198,7 +196,7 @@ if $ARGS[0] = 'drive_sex1':
 	gs 'arousal', 'end'
 	gs 'stat'
 	
-	act'To go further': gt 'road', 'autospot_drive'
+	act'Continue': gt 'road', 'autospot_drive'
 end
 
 if $ARGS[0] = 'drive_sex2':
@@ -223,13 +221,13 @@ if $ARGS[0] = 'drive_sex2':
 	end
 	'<center><B>Main road between St. Petersburg and Pavlovsk</B></center>'
 	'<center><video autoplay loop src="images/locations/highway/sex/hj (1).mp4" width="800" height="448"></video></center>'
-	'When you get in the car, you immediately reach for his pants and take out his semi-erect cock. That''s what you promised him, after all. You feel it slowly hardening between your fingers as the man drives off.'
+	'When you get in the car, you immediately reach for his pants and take out his semi-erect cock. That''s what you promised him after all. You feel it slowly hardening between your fingers as the man drives off.'
 	if dick >= 14 and dick < 16: $raod_text_sex = 'a normal size'
 	if dick >= 16 and dick < 18: $raod_text_sex = 'a bit larger than average'
 	if dick >= 18 and dick < 20: $raod_text_sex = 'quite large'
 	if dick >= 20: $raod_text_sex = 'huge'
-	'You gentle massage his cock between your fingers while the man gets comfortable. It''s <<$raod_text_sex>>, roughly <<dick>> centimetres long and quite girthy. You manage to massage him to a full erection in no time at all, and begin to jerk him off while he drives, rubbing your fingertips over his glans.'
-	'Even though you feel a bit awkward for having to service this man to get where you need to be, you''re serious about what you promised him and jerk him off diligently. In no time at all, your soft touch brings him to an orgasm. Unfortunately his cock was pointing straight at you when it happened, and most of his sperm ends up on your clothes.'
+	'You gently massage his cock between your fingers while the man gets comfortable. It''s <<$raod_text_sex>>, roughly <<dick>> centimeters long and quite girthy. You manage to massage him to a full erection in no time at all, and begin to jerk him off while he drives, rubbing your fingertips over his glans.'
+	'Even though you feel a bit awkward for having to service this man to get where you need to be, you''re serious about what you promised him and jerk him off diligently. In no time at all, your soft touch brings him to an orgasm. Unfortunately, his cock is pointing straight at you when it happens, and most of his sperm ends up on your clothes.'
 	
 	gs 'arousal', 'hj', 15, 'prostitution'
 	gs 'arousal', 'end'
@@ -255,22 +253,14 @@ if $ARGS[0] = 'autospot_drive':
 		nroad = 0
 	end
 	picrand = RAND(1,2)
+	'<center><B>Main road between St. Petersburg and Pavlovsk</B></center>'
 	if truck_drive = 1:
-		'<center><B>Main road between St. Petersburg and Pavlovsk</B></center>'
 		'<center><img <<$set_imgh>> src="images/locations/highway/truck_drive (<<picrand>>).jpg" ></center>'
-		'You try to start a conversation once or twice, but the man doesn''t really seem to be interested in chatting while he drives. You give up and just look out the window, while he drives you to your destination.'
-		'Fifteen minutes later you arrive, and the man pulls over. "Alright, we''re here. Take care, girl!"'
-	elseif bandit_drive = 1:
-		'<center><B>Main road between St. Petersburg and Pavlovsk</B></center>'
-		'<center><img <<$set_imgh>> src="images/locations/highway/drive (<<picrand>>).jpg" ></center>'
-		'You try to start a conversation once or twice, but the man doesn''t really seem to be interested in chatting while he drives. You give up and just look out the window, while he drives you to your destination.'
-		'Fifteen minutes later you arrive, and the man pulls over. "Alright, we''re here. Take care, girl!"'
 	else
-		'<center><B>Main road between St. Petersburg and Pavlovsk</B></center>'
 		'<center><img <<$set_imgh>> src="images/locations/highway/drive (<<picrand>>).jpg" ></center>'
-		'You try to start a conversation once or twice, but the man doesn''t really seem to be interested in chatting while he drives. You give up and just look out the window, while he drives you to your destination.'
-		'Fifteen minutes later you arrive, and the man pulls over. "Alright, we''re here. Take care, girl!"'
 	end
+	'You try to start a conversation once or twice, but the man doesn''t really seem to be interested in chatting while he drives. You give up and just look out the window, while he drives you to your destination.'
+	'Fifteen minutes later, you arrive, and the man pulls over. "Alright, we''re here. Take care, girl!"'
 	act'Get out of the car':gt $curloc
 end
 
@@ -284,50 +274,48 @@ if $ARGS[0] = 'autostpo_money':
 	if textrand = 1:$road_textrand4 = 'I''ll take you there for <<autostop_price*100>> <b>₽</b>.'
 	if textrand = 2:$road_textrand4 = '<<autostop_price*100>> <b>₽</b>. Take it or leave it.'
 	if textrand = 3:$road_textrand4 = '<<autostop_price*100>> <b>₽</b>.'
+	'<center><B>Main road between St. Petersburg and Pavlovsk</B></center>'
 	if truck_drive = 1:
-		'<center><B>Main road between St. Petersburg and Pavlovsk</B></center>'
 		'<center><img <<$set_imgh>> src="images/locations/highway/truck_guy (<<picrand>>).jpg" ></center>'
 	elseif bandit_drive = 1:
-		'<center><B>Main road between St. Petersburg and Pavlovsk</B></center>'
 		'<center><img <<$set_imgh>> src="images/locations/highway/guy (1).jpg" ></center>'
 	else
-		'<center><B>Main road between St. Petersburg and Pavlovsk</B></center>'
 		'<center><img <<$set_imgh>> src="images/locations/highway/guy (<<picrand>>).jpg" ></center>'
 	end
-	'You approach the driver and say: "Hello, sir! I need a ride to <<$road_textrand0>>, can you help me?"'
+	'You approach the driver and say, "Hello, sir! I need a ride to <<$road_textrand0>>, can you help me?"'
 	'The driver gives you another appraising look.'
 	vnerand = RAND(0,1200) 
 	if vnerand <= pcs_apprnc:
 		cla
-		'"I can take you there for free, but only if you do something for me in return", the guy smiles.'
+		'"I can take you there for free, but only if you do something for me in return," the guy smiles.'
 		'"Uhh... like what?" you ask him, even though you''re pretty sure you know where this is going.'
-		'The man laughs and shifts a bit in his seat. He says: "You''re a grown-up girl with a nice body! Surely you can think of something?"'
+		'The man laughs and shifts a bit in his seat. He says, "You''re a grown-up girl with a nice body! Surely you can think of something?"'
 		act'Offer a blowjob':
 			cla
 			drive_sex[1] = 1
-			'You bite your lip for a second, quickly going through your options. Then you say: "I really do need this ride, sir! Would a blowjob be okay?"'
-			'The guy grins greedily and says: "Excellent, I knew we would find a way to help each other out! Get in."'
+			'You bite your lip for a second, quickly going through your options. Then you say, "I really do need this ride, sir! Would a blowjob be okay?"'
+			'The guy grins greedily and says, "Excellent, I knew we would find a way to help each other out! Get in."'
 			act'Get in the car':gt 'road', 'drive_sex1'
 		end
 		act'Offer a handjob':
 			cla
 			drive_sex[2] = 1
-			'You bite your lip for a second, quickly going through your options. Then you say: "I really do need this ride, sir! Would a handjob be okay?"'
-			'The guy gives you a slightly disappointed look and frowns: "What? Only a handjob?"'
-			'You really don''t want to go further than that! Your cheeks turn a deep red and you begin to stumble: "I''m sorry. I don''t normally do this..."'
-			'After some hesitation, he responds: "Oh, alright then. Getting a handjob from a cute girl such as yourself sounds like a fair deal. Get in."'
+			'You bite your lip for a second, quickly going through your options. Then you say, "I really do need this ride, sir! Would a handjob be okay?"'
+			'The guy gives you a slightly disappointed look and frowns, "What? Only a handjob?"'
+			'You really don''t want to go further than that! Your cheeks turn a deep red and you begin to stumble, "I''m sorry. I don''t normally do this..."'
+			'After some hesitation, he responds, "Oh, alright then. Getting a handjob from a cute girl such as yourself sounds like a fair deal. Get in."'
 			act'Get in the car':gt 'road', 'drive_sex2'
 		end
 		exit
 	else 
-		'He ponders for a second, and then says: "<<$road_textrand4>>"'
+		'He ponders for a second and then says, "<<$road_textrand4>>"'
 	end
 	if money > autostop_price*100:
 		act'Agree to pay him': gt 'road', 'autospot_drive'
 	end
 	act'Decline his offer':
 		cla
-		'"I''m sorry, sir. I can''t afford that", you apologize, and step away from the car. The man shrugs and drives off.'
+		'"I''m sorry, sir. I can''t afford that," you apologize and step away from the car. The man shrugs and drives off.'
 		act 'Continue':gt $curloc
 	end
 	act'Ask for a lower price':
@@ -337,33 +325,33 @@ if $ARGS[0] = 'autostpo_money':
 		if textrand = 2:$road_textrand5 = 'Maybe we can work something out?'
 		if textrand = 3:$road_textrand5 = 'Oh no, I don''t have that much! Could you lower your price? Maybe a bit, just for me?'
 		'You twirl your hair between your fingers and give the man a cute look, hoping he will have pity on you and lower the price. "<<$road_textrand5>>" you ask him sweetly.'
-		'The man seems a bit reluctant, and looks at you once more.'
+		'The man seems a bit reluctant and looks at you once more.'
 		vnerand = RAND(0,400)
 		if vnerand <= pcs_apprnc:
 			cla
 			'"I can take you there for free, but only if you do something for me in return", the guy smiles.'
 			'"Uhh... like what?" you ask him, even though you''re pretty sure you know where this is going.'
-			'The man laughs and shifts a bit in his seat. He says: "You''re a grown-up girl with a nice body! Surely you can think of something?"'
+			'The man laughs and shifts a bit in his seat. He says, "You''re a grown-up girl with a nice body! Surely you can think of something?"'
 			act'Offer a blowjob':
 				cla
 				drive_sex[1] = 1
-				'You bite your lip for a second, quickly going through your options. Then you say: "I really do need this ride, sir! Would a blowjob be okay?"'
-				'The guy grins greedily and says: "Excellent, I knew we would find a way to help each other out! Get in."'
+				'You bite your lip for a second, quickly going through your options. Then you say, "I really do need this ride, sir! Would a blowjob be okay?"'
+				'The guy grins greedily and says, "Excellent, I knew we would find a way to help each other out! Get in."'
 				act'Get in the car':gt 'road', 'drive_sex1'
 			end
 			act'Offer a handjob':
 				cla
 				drive_sex[2] = 1
-				'You bite your lip for a second, quickly going through your options. Then you say: "I really do need this ride, sir! Would a handjob be okay?"'
-				'The guy gives you a slightly disappointed look and says: "What? Only a handjob?"'
-				'You really don''t want to go further than that! Your cheeks turn a deep red and you begin to stumble: "I''m sorry. I don''t normally do this..."'
-				'After some hesitation, he responds: "Oh, alright then. Getting a handjob from a cute girl such as yourself sounds like a fair deal. Get in."'
+				'You bite your lip for a second, quickly going through your options. Then you say, "I really do need this ride, sir! Would a handjob be okay?"'
+				'The guy gives you a slightly disappointed look and says, "What? Only a handjob?"'
+				'You really don''t want to go further than that! Your cheeks turn a deep red and you begin to stumble, "I''m sorry. I don''t normally do this..."'
+				'After some hesitation, he responds, "Oh, alright then. Getting a handjob from a cute girl such as yourself sounds like a fair deal. Get in."'
 				act'Get in the car':gt 'road', 'drive_sex2'
 			end
 		else 
 			ivrand = RAND(1,2)
 			autostop_price -= ivrand
-			'The man sighs exasperatedly, but yields: "Okay, fine. I''ll make it <<ivrand*100>> <b>₽</b> less, because you seem like a nice girl and I want to help you out. I''ll take you there for <<autostop_price*100>> <b>₽</b>, but I can''t go any lower than that!"'
+			'The man sighs exasperatedly, but yields, "Okay, fine. I''ll make it <<ivrand*100>> <b>₽</b> less, because you seem like a nice girl and I want to help you out. I''ll take you there for <<autostop_price*100>> <b>₽</b>, but I can''t go any lower than that!"'
 			
 			if money > autostop_price*100:
 				act'Agree to pay him':
@@ -373,15 +361,15 @@ if $ARGS[0] = 'autostpo_money':
 			end
 			act'Decline his offer':
 				cla
-				'"I''m sorry, sir. I still can''t afford that", you apologize, and step away from the car. The man shrugs and drives off.'
+				'"I''m sorry, sir. I still can''t afford that," you apologize and step away from the car. The man shrugs and drives off.'
 				act 'Continue':gt $curloc
 			end
 			act'Offer him a blowjob instead':
 				cla
 				drive_sex[1] = 1
-				'You bite your lip, as if you are ashamed for what you''re about to say next. In a weak voice, you offer: "I can''t pay you money, sir. But... I could give you a blowjob? Would that be okay?"'
+				'You bite your lip, as if you are ashamed of what you''re about to say next. In a weak voice, you offer, "I can''t pay you money, sir. But... I could give you a blowjob? Would that be okay?"'
 				'You lick your lips seductively and offer him a weak smile, hoping that maybe he''ll feel bad for you and just take you with him for free.'
-				'The man grins from ear to ear, and says: "You know what, girl? I was kinda hoping you''d say that. Get in."'
+				'The man grins from ear to ear, and says, "You know what, girl? I was kinda hoping you''d say that. Get in."'
 				act'Get in the car':gt 'road', 'drive_sex1'
 			end
 		end
@@ -416,31 +404,29 @@ if $ARGS[0] = 'autostop_d':
 	if textrand = 5:$road_textrand3 = 'grey'
 	!wagon and sedan
 	ivrand = RAND(1,2)
+	'<center><B>Main road between St. Petersburg and Pavlovsk</B></center>'
 	if ivrand = 1:
 		!gangsters or not
 		ivrand = RAND(1,4)
 		if ivrand > 1:
 			picrand = RAND(2,4)
 			bandit_drive = 1
-			'<center><B>Main road between St. Petersburg and Pavlovsk</B></center>'
 			'<center><img <<$set_imgh>> src="images/locations/highway/guy (<<picrand>>).jpg" ></center>'
 			'After a few minutes of you trying to get someone to pull over, a <<$road_textrand3>>, <<$road_textrand2>> car stops near you. The driver rolls down his window and looks at you for a second, probably making sure you wouldn''t ruin his seats with dirty clothes or something.'
-			if pcs_apprnc < 60:'Then he shrugs and says: "Where do you need to go, lady?"'
-			if pcs_apprnc >= 60:'Then he gives you a friendly smile and says: "<<$road_textrand1>>"'
-		elseif ivrand = 1:
-			'<center><B>Main road between St. Petersburg and Pavlovsk</B></center>'
+			if pcs_apprnc < 60:'Then he shrugs and says, "Where do you need to go, lady?"'
+			if pcs_apprnc >= 60:'Then he gives you a friendly smile and says, "<<$road_textrand1>>"'
+		else
 			'<center><img <<$set_imgh>> src="images/locations/highway/guy (1).jpg" ></center>'
 			'After a few minutes of you trying to get someone to pull over, a black car with tinted windows stops near you. Two guys wearing leather jackets are clearly appraising your body.'
-			'One says to the other: "Nice, we clearly drove to the right place!"'
+			'One says to the other, "Nice, we clearly drove to the right place!"'
 		end
 	elseif ivrand = 2:
 		picrand = RAND(1,3)
 		truck_drive = 1
-		'<center><B>Main road between St. Petersburg and Pavlovsk</B></center>'
 		'<center><img <<$set_imgh>> src="images/locations/highway/truck_guy (<<picrand>>).jpg" ></center>'
 		'After a few minutes of you trying to get someone to pull over, a huge <<$road_textrand3>>, <<$road_textrand2>> truck stops near you. The truck driver looks at you intently for a second, probably making sure you wouldn''t ruin his seats with dirty clothes or something.'
-		if pcs_apprnc < 60:'Then he shrugs and says: "Where do you need to go, lady?"'
-		if pcs_apprnc >= 60:'Then he gives you a friendly smile and says: "<<$road_textrand1>>"'
+		if pcs_apprnc < 60:'Then he shrugs and says, "Where do you need to go, lady?"'
+		if pcs_apprnc >= 60:'Then he gives you a friendly smile and says, "<<$road_textrand1>>"'
 	end
 end