Browse Source

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

KevinSmarts 3 years ago
parent
commit
226eac5966

+ 21 - 21
locations/StasQW.qsrc

@@ -3,27 +3,27 @@ gs 'stat'
 
 if StasKafe = 2:
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/kafe2.jpg"></center>'
-	'After the dance, Stas took you by the hand to the table. Sitting down in a chair, he grabs you by the waist and pulls you into his lap. He immediately began to kiss you and you felt his hand slide up your skirt between your legs and began to caress your clitoris. Stas whispered in your ear, "Come to you or can have fun in the toilet?"'
+	'After the dance, Stas takes you by the hand to the table. Sitting down in a chair, he grabs you by the waist and pulls you into his lap. He immediately begins to kiss you, and you feel his hand slide up your skirt between your legs and begin to caress your clitoris. Stas whispers in your ear, "Come to you or can have fun in the toilet?"'
 
 	act 'Let''s go!':
 		cls
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/kafe2.jpg"></center>'
-		'With a sweeping gesture, Stas threw the money to the waitress, and then stood up, taking you by the hand. Leaning on his arm the two of you leave the cafe and walk down the streets in the direction of your home.'
+		'With a sweeping gesture, Stas throws the money to the waitress and then stands up, taking you by the hand. Leaning on his arm, the two of you leave the cafe and walk down the street in the direction of your home.'
 
 		act 'Home':
 			cls
 			minut += 5
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/city/stas/go.jpg"></center>'
-			'A bit tipsy you are unsteady on your feet. You stumble and nearly fall, but Stas gallantly caught and picked you up. He carried you in his arms the rest of the way to your house, while you wrapped your arms around his neck and nuzzled his ear. He ends up carrying you inside.'
+			'A bit tipsy, you are unsteady on your feet. You stumble and nearly fall, but Stas gallantly catches you and picks you up. He carries you in his arms the rest of the way to your house while you wrap your arms around his neck and nuzzle his ear. He ends up carrying you inside.'
 
 			act 'Further':SStip = 0 & gt 'StasSex'
 		end
 	end
 elseif StasKafe = 1:
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/kafe.jpg"></center>'
-	'After the dance, you sat down again at the table, the waitress brought the bill over. You took a look at the bill and are slightly stunned, by the total. Five thousand! Stas took the bill out of your hands and said "Do not worry, I''ll pay."'
+	'After the dance, you sit down again at the table. The waitress brings the bill over. You take a look at the bill and are slightly stunned by the total. Five thousand! Stas takes the bill out of your hands and says, "Do not worry, I''ll pay."'
 
 	if money >= 5000:
 		act 'No thank you, I''ll pay':
@@ -31,14 +31,14 @@ elseif StasKafe = 1:
 			money -= 5000
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/kafe.jpg"></center>'
-			'You shook your head. "That is sweet, but I can pay my share." You got out the money and paid the waitress. Stas stood up and gave you a hand. Leaning on his arm you walked together with Stas, arm and arm as you left the cafe.'
+			'You shake your head. "That is sweet, but I can pay my share." You get out the money and pay the waitress. Stas stands up and gives you a hand. Leaning on his arm, you walk together with Stas, arm and arm as you leave the cafe.'
 
 			act 'Home':
 				cls
 				minut += 5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/city/stas/go.jpg"></center>'
-				'A bit tipsy you are unsteady on your feet. You stumble and nearly fall, but Stas gallantly caught and helps steady you. Making sure you are alright, he helps support you the rest of the walk home. Once you get to your home, he waits at the door expectantly, he clearly expects you to invite him in.'
+				'A bit tipsy, you are unsteady on your feet. You stumble and nearly fall, but Stas gallantly catches you and helps steady you. Making sure you are alright, he helps support you the rest of the walk home. Once you get to your home, he waits at the door expectantly. He clearly expects you to invite him in.'
 
 				gs 'willpower', 'sex', 'self', 'easy'
 				if will_cost <= pcs_willpwr:
@@ -55,7 +55,7 @@ elseif StasKafe = 1:
 				act 'Say goodbye':
 					cls
 					gs 'stat'
-					'You said goodbye to Stas and kissed him on the cheek. He was obviously disappointed that you did not invite him in, but he didn''t protest and left.'
+					'You say goodbye to Stas and kiss him on the cheek. He is obviously disappointed that you did not invite him in, but he doesn''t protest and leaves.'
 
 					act 'Close the door':gt 'korr'
 				end
@@ -63,18 +63,18 @@ elseif StasKafe = 1:
 		end
 	end
 
-	act 'Oh it''s so cute!':
+	act 'Oh that''s so cute!':
 		cls
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/kafe.jpg"></center>'
-		'You are glad that you will not have to pay for the cafe and Stas made a sweeping gesture and threw the money to the waitress. Then stood up and gave you a hand. Leaning on his arm you walk out of the cafe arm and arm.'
+		'You are glad that you will not have to pay for the cafe. Stas makes a sweeping gesture and throws the money to the waitress, then stands up and gives you a hand. Leaning on him, you walk out of the cafe arm and arm.'
 
 		act 'Home':
 			cls
 			minut += 5
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/city/stas/go.jpg"></center>'
-			'A bit tipsy you are unsteady on your feet. You stumble and nearly fall, but Stas gallantly caught and helps steady you. Making sure you are alright, he helps support you the rest of the walk home. Once you get to your home, he waits at the door expectantly, he clearly expects you to invite him in. You debate inviting him in but feel it would snub him, after what he just spent and you are feeling a little indebted to him, he found you a job, he forked over the cafe, you smile and open the door wide to let him in.'
+			'A bit tipsy, you are unsteady on your feet. You stumble and nearly fall, but Stas gallantly catches you and helps steady you. Making sure you are alright, he helps support you the rest of the walk home. Once you get to your home, he waits at the door expectantly. He clearly expects you to invite him in. You debate inviting him in but feel it would snub him after what he just spent, and you are feeling a little indebted to him, especially since he already found you a job. You smile and open the door wide to let him in.'
 
 			act 'Invite him in':SStip = 0 & gt 'StasSex'
 		end
@@ -82,7 +82,7 @@ elseif StasKafe = 1:
 elseif StasKafe = 0:
 	'<center><b><font color="maroon">Cafe</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/kafe.jpg"></center>'
-	'You sat on a chair across the table from Stas, he waved over a waitress. When the waitress arrived, he ordered champagne and fruit. Order was brought over to your table quickly, Stas poured champagne in glasses and handed you one. "A toast to friendship."'
+	'You sit on a chair across the table from Stas. He waves over a waitress. When the waitress arrives, he orders champagne and fruit. The order is brought over to your table quickly. Stas pours champagne in glasses and hands you one. "A toast to friendship."'
 
 	act 'Drink for friendship':
 		cls
@@ -90,7 +90,7 @@ elseif StasKafe = 0:
 		pcs_horny += 5
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/kafe.jpg"></center>'
-		'You drink champagne and Stas started telling funny stories, while he kept refilling the glasses with champagne.'
+		'You drink champagne, and Stas starts telling funny stories, while he keeps refilling the glasses with champagne.'
 
 		act 'Drink and chat':
 			cls
@@ -101,7 +101,7 @@ elseif StasKafe = 0:
 			fat += 4
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/kafe.jpg"></center>'
-			'You feel relaxed in Stas companing, drinking champagne you listen Stas regale you with tales. You were so caught up in the moment, you do not even notice Stas ordered another bottle. Finally you realize that you are already well on your way to being drunk. The music starts up in the cafe and Stas rises from his chair and gallantly offered you a hand.'
+			'You feel relaxed in Stas company. Drinking champagne, you listen to Stas regale you with tales. You are so caught up in the moment, you do not even notice Stas order another bottle. Finally, you realize that you are already well on your way to being drunk. The music starts up in the cafe, and Stas rises from his chair and gallantly offers you a hand.'
 
 			act 'Dance':
 				cls
@@ -109,7 +109,7 @@ elseif StasKafe = 0:
 				pcs_horny += 10
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/pc/activities/dance.jpg"></center>'
-				'You took his hand and he lead you to the dance floor. One hand on the small of your back and another grabbing you around the back of your thigh just below you butt. Slowly his hands creep down till he is squeezing your butt.'
+				'You take his hand, and he leads you to the dance floor, one hand on the small of your back and another grabbing you around the back of your thigh just below you butt. Slowly, his hands creep down till he is squeezing your butt.'
 
 				if pcs_horny < 100:
 					act 'Raise his hands up':
@@ -121,13 +121,13 @@ elseif StasKafe = 0:
 						'You reach down and pull both his hands up till they are on the small of your back as you dance with him.'
 
 						if pcs_horny < 100:
-							act 'Again raise his hands above':
+							act 'Again raise his hands up':
 								cls
 								minut += 1
 								pcs_horny += 10
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/pc/activities/dance.jpg"></center>'
-								'Once again you reach down and pull both his hands up till they are on the small of your back as you dance with him. Stas apparently is feeling a bit randy. With his hands on your back he began to gently stroking gently down your back to your ass again. Finally the dance is over.'
+								'Once again, you reach down and pull both his hands up till they are on the small of your back as you dance with him. Stas apparently is feeling a bit randy. With his hands on your back, he begins to gently stroke down your back to your ass again. Finally, the dance is over.'
 
 								act 'Sit at the table':StasKafe = 1 & gt $curloc
 							end
@@ -140,7 +140,7 @@ elseif StasKafe = 0:
 							gs 'stat'
 							
 							'<center><img <<$set_imgh>> src="images/characters/city/stas/event/dance2.jpg"></center>'
-							'You continued to dance and let him squeeze your butt. Soon one of his hands slips around in front of your thigh and between your legs. He raises his hand up and starts rubbing your clit. Suddenly, the dance was over and Stas leads you back to your table.'
+							'You continue to dance and let him squeeze your butt. Soon, one of his hands slips around in front of your thigh and between your legs. He raises his hand up and starts rubbing your clit. Suddenly, the dance is over, and Stas leads you back to your table.'
 
 							act 'Sit at the table':StasKafe = 2 & gt $curloc
 						end
@@ -154,16 +154,16 @@ elseif StasKafe = 0:
 					gs 'stat'
 					
 					'<center><img <<$set_imgh>> src="images/characters/city/stas/event/dance2.jpg"></center>'
-					'You continued to dance and let him squeeze your butt. Soon one of his hands slips around in front of your thigh and between your legs. He raises his hand up and starts rubbing your clit. Suddenly, the dance was over and Stas leads you back to your table.'
+					'You continue to dance and let him squeeze your butt. Soon, one of his hands slips around in front of your thigh and between your legs. He raises his hand up and starts rubbing your clit.'
 
 					if pcs_horny < 100:
-						act 'Raise his hands above':
+						act 'Raise his hands up':
 							cls
 							minut += 1
 							pcs_horny += 10
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/pc/activities/dance.jpg"></center>'
-							'Once again you reach down and pull both his hands up till they are on the small of your back as you dance with him. Stas apparently is feeling a bit randy. With his hands on your back he began to gently stroking gently down your back to your ass again. Finally the dance is over.'
+							'You reach down and pull both his hands up till they are on the small of your back as you dance with him. Stas apparently is feeling a bit randy. With his hands on your back, he begins to gently stroke down your back to your ass again. Finally, the dance is over.'
 
 							act 'Sit at the table':StasKafe = 2 & gt $curloc
 						end
@@ -176,7 +176,7 @@ elseif StasKafe = 0:
 						gs 'stat'
 						
 						'<center><img <<$set_imgh>> src="images/characters/city/stas/event/dance2.jpg"></center>'
-						'You continued to dance and let him squeeze your butt. Soon one of his hands slips around in front of your thigh and between your legs. He raises his hand up and starts rubbing your clit, after a moment he slips his hands inside of your panties and slips a finger inside of you. You moan gentle into his ear as he finger bangs you right out on the dance floor. Suddenly, the dance was over and Stas leads you back to your table.'
+						'You continue to dance and let him rub your clit. After a moment, he slips his hands inside of your panties and slips a finger inside of you. You moan gently into his ear as he finger bangs you right out on the dance floor. Suddenly, the dance is over, and Stas leads you back to your table.'
 
 						act 'Sit at the table':StasKafe = 2 & gt $curloc
 					end

+ 7 - 7
locations/StasSex.qsrc

@@ -1,7 +1,7 @@
 # StasSex
 if SStip = 0:
 	'<center><img <<$set_imgh>> src="images/characters/city/stas/sex/stas.jpg"></center>'
-	'You entered your apartment and immediately the two of you started kissing. He pulled down your top to expose your breasts, he began to fondle them as the two of you continued to kiss. He slowly pulled you into the bedroom as you continued to kiss.'
+	'You enter your apartment and immediately the two of you start kissing. He pulls down your top to expose your breasts, beginning to fondle them as the two of you continue to kiss, and slowly pulls you into the bedroom.'
 	gs 'boyStat', 'A50'
 
 	gs 'arousal', 'kiss', 5
@@ -10,20 +10,20 @@ if SStip = 0:
 	act 'Go into the bedroom':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/city/stas/sex/pov.jpg"></center>'
-		'On the way to the bedroom he manage to take off most of your clothes, he pushes you down on the bed and begins to undress himself while he keeps kissing you.'
+		'On the way to the bedroom, he manages to take off most of your clothes. He pushes you down on the bed and begins to undress himself while he keeps kissing you.'
 		gs 'stat'
 
 		act 'Next':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/city/stas/sex/sex.jpg"></center>'
-			'During the kissing he manages to get all your clothes off, as well as his own. He pushes your legs up, till your knees are pulled up against your chest. He rubs the tip of his dick against your pussy, which is already wet with desire. You moan in desire and try and lift yourself up to take him inside of you, but he keeps teasing you by just rubbing the tip against your pussy.'
+			'During the kissing, he manages to get all your clothes off, as well as his own. He pushes your legs up till your knees are pulled up against your chest. He rubs the tip of his dick against your pussy, which is already wet with desire. You moan and try to lift yourself up to take him inside of you, but he keeps teasing you by just rubbing the tip against your pussy.'
 			gs 'shortgs','undress'
 			npc_sex[$boy] += 1
 
-			'You feel like you almost can''t take the teasing anymore when he fully pushing himself inside of you, his <<dick>>cm <<$dick_girth>> dick fills your pussy up. He gentle fucks you, slowly working himself deeper into you, while he continues to kiss you and kneed your breasts, you moan in deep pleasure as the two of you make love.'
+			'You feel like you almost can''t take the teasing anymore when he fully pushes himself inside of you, his <<dick>>cm <<$dick_girth>> dick filling your pussy up. He gently fucks you, slowly working himself deeper into you while he continues to kiss you and kneed your breasts. You moan in deep pleasure as the two of you make love.'
 			gs 'dinsex','vaginal_sex',15,'sub'
 			$orgasm_or = 'yes'
-			$orgasm_txt = '<<$boydesc>> groans and you feel a jet of sperm spurt inside of your body, followed by several more.'
+			$orgasm_txt = '<<$boydesc>> groans, and you feel a jet of sperm spurt inside of your body, followed by several more.'
 			gs 'cum_call','',$boy,1
 			gs 'cuminsidereact',$boydesc
 			gs 'stat'
@@ -31,12 +31,12 @@ if SStip = 0:
 				*clr & cla
 				minut += 5
 				'<center><img <<$set_imgh>> src="images/characters/city/stas/sex/aftersex.jpg"></center>'
-				'Stas rolls off you, you roll onto your side to rest your head on his chest. You can feel his sperm leaking out of your pussy. He gives you a one armed hug, while his other hand strokes your hair, while he looks deep into your eyes with love in his.  Stas say apologetically, "I''m sorry, I came inside of you, couldn''t resist." Then he rolled out of bed, getting up and starting to get dressed. "Well, I gotta go <<$pcs_nickname>>. I''ll see you later, ok." With that he gathers the rest of his stuff and heads out, you follow him to the door to see him out.'
+				'Stas rolls off you, and you roll onto your side to rest your head on his chest. You can feel his sperm leaking out of your pussy. He gives you a one armed hug while his other hand strokes your hair, and he looks deep into your eyes with love in his.  Stas say apologetically, "I''m sorry, I came inside of you, couldn''t resist." Then he rolls out of bed, getting up and starting to get dressed. "Well, I gotta go <<$pcs_nickname>>. I''ll see you later, ok." With that, he gathers the rest of his stuff and heads out. You follow him to the door to see him out.'
 
 				gs 'arousal', 'end'
 				gs 'stat'
 				
-				act 'Hold up the door':gt 'korr'
+				act 'Close the door':gt 'korr'
 			end
 		end
 	end

+ 157 - 99
locations/Vika.qsrc

@@ -2,24 +2,66 @@
 !2020/10/16/Gwen
 
 if $ARGS[0] = '':
-	vikaAge = age + 1
 	gs'stat'
-	'<center><B><font color=maroon>Vika Kirilova</font></B></center>'
 	if vika_sleep = 1:
-		gs 'Vika', 'asleep'
+		gs 'Vika', 'text', 'asleep'
+		gs 'Vika', 'actions', 'asleep'
+	else
+		if npc_rel['A220'] >= 60 and birthday = day and birthmonth = month and vikaslut = 1 and b_vika_present_Day ! daystart:
+			b_vika_present_Day = daystart
+			gs 'Vika', 'text', 'awake', 'birthday'
+			gs 'Vika', 'actions', 'awake', 'birthday'
+		else
+			gs 'Vika', 'text', 'awake'
+			gs 'Vika', 'actions', 'awake'
+		end
+	end
+end
+
+if $ARGS[0] = 'text':
+	*clr
+	gs'stat'
+	'<center><B><font color=maroon>Vika Kirilova</font></B></center>'
+	if $ARGS[1] = 'asleep':
+		gs 'Vika', 'asleep_text'
+	elseif $ARGS[1] = 'awake':
+		gs 'Vika', 'awake_text', $ARGS[2]
+	end
+end
+
+if $ARGS[0] = 'actions':
+	cla
+	gs'stat'
+	if $ARGS[1] = 'asleep':
+		gs 'Vika', 'asleep_actions'
+	elseif $ARGS[1] = 'awake':
+		gs 'Vika', 'awake_actions', $ARGS[2]
+	end
+end
+
+if $ARGS[0] = 'asleep_text':
+	minut += 5
+	if vikaslut = 1:
+		'<center><img <<$set_imgh>> src="images/characters/city/university/girl/vika/vika_sleep_b.jpg" ></center>'
+		'Vika is sleeping in her bed, naked. You wonder what she did in the brothel tonight to pay for her tuition.'
 	else
-		gs 'Vika', 'awake'
+		'<center><img <<$set_imgh>> src="images/characters/city/university/girl/vika/vika_sleep.jpg" ></center>'
+		'Vika is sleeping in her bed after a night of adventures. While watching her, you wonder what all she got up to tonight.'
 	end
 end
 
-if $ARGS[0] = 'awake':
+if $ARGS[0] = 'asleep_actions':
+	act '<B>Move away</B>':gt $loc, $loc_arg
+end
+
+if $ARGS[0] = 'awake_text':
 	!! Display different image during birthday event.
-	if npc_rel['A220'] >= 60 and birthday = day and birthmonth = month and vikaslut = 1 and b_vika_present_Day ! daystart:
+	if $ARGS[1] = 'birthday':
 		'<center><img <<$set_imgh>> src="images/characters/city/university/girl/vika/vika1.jpg" ></center>'
 	else
 		'<center><img <<$set_imgh>> src="images/characters/shared/photos/big220.jpg" ></center>'
 	end
-	'Your university roommate is Vika Kirilova. She is <<vikaAge>> years old. She comes from a town much further away than yours, and like you, she comes from a poor family.'
+	'Your university roommate is Vika Kirilova. She is <<age + 1>> years old. She comes from a town much further away than yours, and like you, she comes from a poor family.'
 	if vikaslut = 1:
 		'You know Vika works as a whore in a brothel in the red light district.'
 	else
@@ -39,87 +81,117 @@ if $ARGS[0] = 'awake':
 	end
 	''
 
-	if npc_rel['A220'] >= 60 and birthday = day and birthmonth = month and vikaslut = 1 and b_vika_present_Day ! daystart:
-		gs 'Vika', 'birthday'
-	else
-		gs 'Vika', 'normal_day'
+	if $ARGS[1] = 'birthday':
+		'You don''t have time to say a word before Vika practically pounces on you.'
+		'"There is my favorite birthday girl, happy birthday!" she screeches as she hugs and kisses you on the cheek.'
+		'"Wow! This is so unexpected," you reply.'
+		'"Here''s a present for you." Vika gives you a box. Inside is a silk pale blue sheer teddy.'
+		'"Oh, Vika, this is too much. It''s way too expensive of a gift." You are flattered she would give you such a nice gift.'
+		'"Relax and put it on, come on. The least you could do is model it for me," Vika says in a commanding voice, winking at you.'
+		'You''re a little embarrassed, but you quickly strip off your clothes until you are naked and put the teddy on. It looks even more sheer on your body. It hides absolutely nothing, your nipples, even your pussy lips are clearly visible. You turn and model it for Vika, a nice gift but definitely not for everyday life gift.'
+		'"You look great, it fits nice, good! I was worried it wouldn''t fit as I had to guess your size. Here put this on. We need to go to your other present." Vika throws you a bathrobe and grabs you by the arm and drags you out of the room as you struggle to get the robe on in time.'
 	end
-end
 
-if $ARGS[0] = 'asleep':
-	minut += 5
-	if vikaslut = 1:
-		'<center><img <<$set_imgh>> src="images/characters/city/university/girl/vika/vika_sleep_b.jpg" ></center>'
-		'Vika is sleeping in her bed, naked. You wonder what she did in the brothel tonight to pay for her tuition.'
-	else
-		'<center><img <<$set_imgh>> src="images/characters/city/university/girl/vika/vika_sleep.jpg" ></center>'
-		'Vika is sleeping in her bed after a night of adventures. While watching her, you wonder what all she got up to tonight.'
-	end
-	act '<B>Move away</B>':gt $loc, $loc_arg
+	gs 'Vika', 'leave_for_night'
 end
 
-if $ARGS[0] = 'normal_day':
-	act '<B>Move away</B>':gt $loc, $loc_arg
+if $ARGS[0] = 'awake_actions':
+	if $ARGS[1] = 'birthday':
+		act 'Where are we heading?': gt 'univer_din', 'b_vika_present_start'
+	else
+		act '<B>Move away</B>':gt $loc, $loc_arg
 
-	if hour < 20:
-		act 'Chat with Vika (00:15)':
-			cla
-			minut += 15
-			if vikachatday ! daystart: npc_rel['A220'] += 3
-			vikachatday = daystart
-			talkrand = RAND(0,10)
-			if talkrand = 0:
-				'You start talking with Vika. She tells you about the boys she''s met, about parties, about cosmetics.'
-			elseif talkrand = 1:
-				'Vika says she was in this cafe and got invited to dance by a guy who then paid her bill.'
-			elseif talkrand = 2:
-				'Vika says that working as a stripper in the strip club is a rather profitable job for students, although clients are very grabby.'
-			elseif talkrand = 3:
-				'Vika tells you that a few girls from the track team at the university go to the European level sports competitions and earn big money, though of course Vika admits that she is too lazy to put in the effort to make the team.'
-			elseif talkrand = 4:
-				'Vika says that one of her friends who''s a guy did not pull out in time and came inside of her. But Vika is smarter than that. She buys birth control pills at the pharmacy control. Then it doesn''t matter if the guy pulls out or wears a condom.'
-			elseif talkrand = 5:
-				'Vika says in the park, she accidentally went to an area and was offered money for sex.'
-			elseif talkrand = 6:
-				'Vika tells how she did a nude photo shoot at the photography studio, but it is bad for your reputation to do.'
-			elseif talkrand = 7:
-				'Vika tells a horror story about how a nice girl did not wash or shave, then she began to smell so terrible and got a vaginal infection.'
-			elseif talkrand = 8:
-				'Vika says that she buys tampons and always keeps a reserve of them even if she is on the birth control shot.'
-			elseif talkrand = 9:
-				'Vika tells how one of her guys likes anal sex, but she didn''t have any lube, but let him fuck her anyways. She tells you how it hurt a lot at first but then she started to like it anyways.'
+		if func('bordel', 'is_open') = 0:
+			if $ARGS[1] = 'chat':
+				act 'Continue chatting (0:15)':gs 'Vika', 'talk', 'chat'
 			else
-				'Vika tells how she was sunbathing in the summer on the beach and that she needed to buy a new swimsuit. Having one is useful in winter too for using the pool, which is a great way to keep yourself in good shape.'
+				act 'Chat with Vika (0:15)':gs 'Vika', 'talk', 'chat'
 			end
 
-			act 'Finish': gt 'Vika'
-		end
-		act 'Study with Vika (1:00)':
-			cla
-			minut += 60
-			intel_exp += 1 + (mentats_dose - rand(0,mentats_dose))
-			npc_rel['A220'] += 1
-			'You get out your textbooks and notes, while you and Vika sit down together on the bed to study. You help each other with your classwork, making it much easier and more fun to study.'
-
-			act 'Finish':gt'Vika'
-		end
+			if $ARGS[1] = 'study':
+				act 'Continue studying (1:00)':gs 'Vika', 'talk', 'study', 'continue'
+			else
+				act 'Study with Vika (1:00)':gs 'Vika', 'talk', 'study'
+			end
 
-		if vikasex > 0 and npc_rel['A220'] > 40:
-			gs 'willpower', 'cuni', 'self', 'easy'
-			if will_cost <= pcs_willpwr:
-				act 'Suggest you do something fun (<<will_cost>> Willpower)':
-					gs 'willpower', 'pay', 'self'
-					minut += 60
-					npc_rel['A220'] += 5
-					$sexloc = 'obroom'
-					gt'lezbsex','start'
+			if vikasex > 0 and npc_rel['A220'] > 40:
+				gs 'willpower', 'cuni', 'self', 'easy'
+				if will_cost <= pcs_willpwr:
+					act 'Suggest you do something fun (<<will_cost>> Willpower)':
+						gs 'willpower', 'pay', 'self'
+						minut += 60
+						npc_rel['A220'] += 5
+						$sexloc = 'obroom'
+						gt'lezbsex','start'
+					end
+				else
+					act 'Suggest you do something fun (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
-			else
-				act 'Suggest you do something fun (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		end
 
-		if npc_rel['A220'] > 80 and vikaslut = 0:
+		gs 'Vika', 'brothel_questions'
+	end
+end
+
+if $ARGS[0] = 'talk':
+	gs 'Vika', 'text', 'awake', $ARGS[1]
+	if $ARGS[1] = 'chat':
+		gs 'Vika', 'chat', RAND(0,10)
+	elseif $ARGS[1] = 'study':
+		gs 'Vika', 'study', $ARGS[2]
+	end
+	gs 'Vika', 'actions', 'awake', $ARGS[1]
+	gs 'Vika', 'leave_for_night'
+end
+
+if $ARGS[0] = 'chat':
+	minut += 15
+	if vikachatday ! daystart: npc_rel['A220'] += 3
+	vikachatday = daystart
+	gs 'stat'
+
+	if ARGS[1] = 0:
+		'You start talking with Vika. She tells you about the boys she''s met, about parties, about cosmetics.'
+	elseif ARGS[1] = 1:
+		'Vika says she was in this cafe and got invited to dance by a guy who then paid her bill.'
+	elseif ARGS[1] = 2:
+		'Vika says that working as a stripper in the strip club is a rather profitable job for students, although clients are very grabby.'
+	elseif ARGS[1] = 3:
+		'Vika tells you that a few girls from the track team at the university go to the European level sports competitions and earn big money, though of course Vika admits that she is too lazy to put in the effort to make the team.'
+	elseif ARGS[1] = 4:
+		'Vika says that one of her friends who''s a guy did not pull out in time and came inside of her. But Vika is smarter than that. She buys birth control pills at the pharmacy control. Then it doesn''t matter if the guy pulls out or wears a condom.'
+	elseif ARGS[1] = 5:
+		'Vika says in the park, she accidentally went to an area and was offered money for sex.'
+	elseif ARGS[1] = 6:
+		'Vika tells how she did a nude photo shoot at the photography studio, but it is bad for your reputation to do.'
+	elseif ARGS[1] = 7:
+		'Vika tells a horror story about how a nice girl did not wash or shave, then she began to smell so terrible and got a vaginal infection.'
+	elseif ARGS[1] = 8:
+		'Vika says that she buys tampons and always keeps a reserve of them even if she is on the birth control shot.'
+	elseif ARGS[1] = 9:
+		'Vika tells how one of her guys likes anal sex, but she didn''t have any lube, but let him fuck her anyways. She tells you how it hurt a lot at first but then she started to like it anyways.'
+	else
+		'Vika tells how she was sunbathing in the summer on the beach and that she needed to buy a new swimsuit. Having one is useful in winter too for using the pool, which is a great way to keep yourself in good shape.'
+	end
+end
+
+if $ARGS[0] = 'study':
+	minut += 60
+	intel_exp += 1 + (mentats_dose - rand(0,mentats_dose))
+	npc_rel['A220'] += 1
+	gs 'stat'
+
+	iif($ARGS[1] = 'continue', 'You and Vika continue studying together.', 'You get out your textbooks and notes, while you and Vika sit down together on the bed to study.') + ' You help each other with your classwork, making it much easier and more fun to study.'
+end
+
+if $ARGS[0] = 'leave_for_night':
+	if func('bordel', 'is_open'):'Vika tells you she needs to ' + iif(vikaslut = 1, 'leave for work at the brothel.', 'get going.')
+end
+
+if $ARGS[0] = 'brothel_questions':
+	if npc_rel['A220'] > 80:
+		if vikaslut = 0:
 			act 'Ask where she goes at night':
 				cla
 				minut += 30
@@ -135,35 +207,21 @@ if $ARGS[0] = 'normal_day':
 
 				act 'Follow Vika': gt 'bordelv', 'start'
 			end
-		elseif npc_rel['A220'] > 80 and vikaslut = 1 and bordel = 0:
-			act 'Ask about work':
-				cla
-				npc_rel['A220'] += 5
-				bordel = 1
-				odkomp = 0
-
-				'"Do you think you could get me a job at the brothel?" you ask.'
-				'"Well I can ask the manager, but I can''t guarantee anything. Come by after 20:00, and I''ll see what I can do."'
+		elseif vikaslut = 1:
+			if bordel = 0:
+				act 'Ask if she can get you a job at the brothel':
+					delact 'Ask if she can get you a job at the brothel'
+					npc_rel['A220'] += 5
+					bordel = 1
+					odkomp = 0
 
-				act 'Finish': gt 'Vika'
+					'"Do you think you could get me a job at the brothel?" you ask.'
+					'"Well I can ask the manager, but I can''t guarantee anything. Come by' + iif(hour < 20, ' after 20:00', '') + ', and I''ll see what I can do."'
+				end
 			end
 		end
 	end
 end
 
-if $ARGS[0] = 'birthday':
-	b_vika_present_Day = daystart
-	'You don''t have time to say a word before Vika practically pounces on you.'
-	'"There is my favorite birthday girl, happy birthday!" she screeches as she hugs and kisses you on the cheek.'
-	'"Wow! This is so unexpected," you reply.'
-	'"Here''s a present for you." Vika gives you a box. Inside is a silk pale blue sheer teddy.'
-	'"Oh, Vika, this is too much. It''s way too expensive of a gift." You are flattered she would give you such a nice gift.'
-	'"Relax and put it on, come on. The least you could do is model it for me," Vika says in a commanding voice, winking at you.'
-	'You''re a little embarrassed, but you quickly strip off your clothes until you are naked and put the teddy on. It looks even more sheer on your body. It hides absolutely nothing, your nipples, even your pussy lips are clearly visible. You turn and model it for Vika, a nice gift but definitely not for everyday life gift.'
-	'"You look great, it fits nice, good! I was worried it wouldn''t fit as I had to guess your size. Here put this on. We need to go to your other present." Vika throws you a bathrobe and grabs you by the arm and drags you out of the room as you struggle to get the robe on in time.'
-
-	act 'Where are we heading?': gt 'univer_din', 'b_vika_present_start'
-end
-
 --- Vika ---------------------------------
 

+ 1 - 1
locations/Voltrener.qsrc

@@ -522,7 +522,7 @@ if $ARGS[0] = 'trener_speak':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/mikhail/volleytrener5.jpg"></center>'
 		'Mikhail smiles at you, gives a thumbs up, and says, "<<$pcs_nickname>>, I want to congratulate you, I think. I''ve decided to make you a first string regular. From now on, you''ll be starting."'
 		'"But," he adds, shaking his finger at you admonishingly. "You still need to keep practicing, and less drinking!"'
-		'You squeal happily and threw your arms around the Mikhail''s neck. "Now we have them... I always... Yes we like..." The excitement of the unexpected anouncement left you unable to speak and Mikhail just smiles at you and says "Go."'
+		'You squeal happily and threw your arms around the Mikhail''s neck. "Now we have them... I always... Yes we like..." The excitement of the unexpected announcement left you unable to speak and Mikhail just smiles at you and says "Go."'
 		volleysostav = 2
 	else
 		npc_rel['A69'] += 1

+ 70 - 460
locations/autosalonF.qsrc

@@ -7,7 +7,6 @@ if $ARGS[0] = 'start':
 	cla
 	*clr
 	minut += 5
-	cartraid = 1
 	gs 'stat'
 	'<center><b>Car Dealership</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/cardealer/manager.jpg"></center>'
@@ -15,30 +14,30 @@ if $ARGS[0] = 'start':
 	'<b><center>List of vehicles for sale</center></b>'
 	nl
 	'<center><table border=0><TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car6''">Kalina VAZ</a>.</TD><TD> - </TD><TD> New. Price: 400 th.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car7''">WHA PRIORA</a>.</TD><TD> - </TD><TD> New. Price: 450 th.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car8''">Chevrolet NIVA</a>.</TD><TD> - </TD><TD> New. Price: 500 th.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car9''">UAZ HUNTER</a>.</TD><TD> - </TD><TD> New. Price: 500 th.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car10''">UAZ Patriot</a>.</TD><TD> - </TD><TD> New. Price: 600 th.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car13''">Ford Focus 2</a>.</TD><TD> - </TD><TD> New. Price: 500 th.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car102''">Renault LOGAN</a>.</TD><TD> - </TD><TD> New. Price: 700 th.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car110''">Ford Mondeo</a>.</TD><TD> - </TD><TD> New. Price: 850 th.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car104''">Toyota Celica</a>.</TD><TD> - </TD><TD> New. Price: 1 million.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car95''">Mitsubishi l200</a>.</TD><TD> - </TD><TD> New. Price: 1 million.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car103''">Toyota Corolla</a>.</TD><TD> - </TD><TD> New. Price: 1,1 million.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car105''">Mazda 6</a>.</TD><TD> - </TD><TD> New. Price: 1,2 million.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car106''">Mercedes-Benz E 212</a>.</TD><TD> - </TD><TD> New. Price: 1,7 million.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car109''">Audi A6</a>.</TD><TD> - </TD><TD> New. Price: 1,9 million.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car97''">Cadillac Escalade</a>.</TD><TD> - </TD><TD> New. Price: 2 million.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car101''">BMW Z4</a>.</TD><TD> - </TD><TD> New. Price: 3 million.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car107''">BMW M5</a>.</TD><TD> - </TD><TD> New. Price: 4,5 million.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car99''">BMW X6</a>.</TD><TD> - </TD><TD> New. Price: 4,5 million.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car96''">Audi Q7</a>.</TD><TD> - </TD><TD> New. Price: 5 million.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car98''">Porsche Cayenne</a>.</TD><TD> - </TD><TD> New. Price: 5 million.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car108''">Jaguar XKR-S</a>.</TD><TD> - </TD><TD> New. Price: 7 million.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car100''">Mercedes-Benz S 600</a>.</TD><TD> - </TD><TD> New. Price: 8 million.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car111''">Bentley Continental gt</a>.</TD><TD> - </TD><TD> New. Price: 10 million.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car112''">Ferrari 458 Italia</a>.</TD><TD> - </TD><TD> New. Price: 20 million.RUB</TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''6''">Kalina VAZ</a>.</TD><TD> - </TD><TD> New. Price: 400,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''7''">WHA PRIORA</a>.</TD><TD> - </TD><TD> New. Price: 450,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''8''">Chevrolet NIVA</a>.</TD><TD> - </TD><TD> New. Price: 500,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''9''">UAZ HUNTER</a>.</TD><TD> - </TD><TD> New. Price: 500,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''10''">UAZ Patriot</a>.</TD><TD> - </TD><TD> New. Price: 600,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''13''">Ford Focus 2</a>.</TD><TD> - </TD><TD> New. Price: 500,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''102''">Renault LOGAN</a>.</TD><TD> - </TD><TD> New. Price: 700,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''110''">Ford Mondeo</a>.</TD><TD> - </TD><TD> New. Price: 850,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''104''">Toyota Celica</a>.</TD><TD> - </TD><TD> New. Price: 1,000,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''95''">Mitsubishi l200</a>.</TD><TD> - </TD><TD> New. Price: 1,000,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''103''">Toyota Corolla</a>.</TD><TD> - </TD><TD> New. Price: 1,100,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''105''">Mazda 6</a>.</TD><TD> - </TD><TD> New. Price: 1,200,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''106''">Mercedes-Benz E 212</a>.</TD><TD> - </TD><TD> New. Price: 1,700,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''109''">Audi A6</a>.</TD><TD> - </TD><TD> New. Price: 1,900,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''97''">Cadillac Escalade</a>.</TD><TD> - </TD><TD> New. Price: 2,000,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''101''">BMW Z4</a>.</TD><TD> - </TD><TD> New. Price: 3,000,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''107''">BMW M5</a>.</TD><TD> - </TD><TD> New. Price: 4,500,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''99''">BMW X6</a>.</TD><TD> - </TD><TD> New. Price: 4,500,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''96''">Audi Q7</a>.</TD><TD> - </TD><TD> New. Price: 5,000,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''98''">Porsche Cayenne</a>.</TD><TD> - </TD><TD> New. Price: 5,000,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''108''">Jaguar XKR-S</a>.</TD><TD> - </TD><TD> New. Price: 7,000,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''100''">Mercedes-Benz S 600</a>.</TD><TD> - </TD><TD> New. Price: 8,000,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''111''">Bentley Continental gt</a>.</TD><TD> - </TD><TD> New. Price: 10,000,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''112''">Ferrari 458 Italia</a>.</TD><TD> - </TD><TD> New. Price: 20,000,000 <b>₽</b></TD></TR>'
 	'</TR></table>'
 
 	act 'Talk to the manager': gt 'autosalonF', 'manager1'
@@ -57,518 +56,129 @@ if $ARGS[0] = 'manager1':
 	minut += 5
 	'<center><b>Car Dealership</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/cardealer/manager.jpg"></center>'
-	'You have <<karta>> <b>₽</b> on your bank account.'
-	'The manager smiles affably and explains routinely what is required to purchase a car: A driver''s license and the sum, in full, on your bank account.' 
-	'"With how the economy is right now, we can''t accept payment by installments at this time I''m afraid." he apologizes. "A few new laws have also been passed too: We cannot accept cash payment - the Duma believes that will help fight crime - and it is currently not possible to own more than one car, according to the Oblast''s new anti-corruption law.'
+	'You have <<karta>> <b>₽</b> in your bank account.'
+	'The manager smiles affably and explains routinely what is required to purchase a car: A driver''s license and the sum, in full, in your bank account.' 
+	'"With how the economy is right now, we can''t accept payment by installments at this time I''m afraid," he apologizes. "A few new laws have also been passed too: We cannot accept cash payment - the Duma believes that will help fight crime - and it is currently not possible to own more than one car, according to the Oblast''s new anti-corruption law.'
 
 	act 'Leave':gt 'city_industrial'
 
 	if prava = 1:
 		if karta + bankDebtLimit >= 400000:
-			act 'Buy a Kalina VAZ (400 th.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 400000
-				$car = 'Kalina VAZ'
-				car = 6
-				benz = 3
-				cardrive = 8
-				teh = 400
-				tehcar = 400
-				wrek = 0
-
-				'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a Kalina VAZ (400,000 <b>₽</b>)':gt 'autosalonF', 'buy', 400000, 'Kalina VAZ', 6, 400
 		end
 
 		if karta + bankDebtLimit >= 450000:
-			act 'Buy a VAZ Priora (450 th.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 450000
-				$car = 'WHA PRIORA'
-				car = 7
-				benz = 3
-				cardrive = 8
-				teh = 450
-				tehcar = 450
-				wrek = 0
-
-				'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a VAZ Priora (450,000 <b>₽</b>)':gt 'autosalonF', 'buy', 450000, 'WHA PRIORA', 7, 450
 		end
 
 		if karta + bankDebtLimit >= 500000:
-			act 'Buy a Chevrolet Niva (500 th.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 500000
-				$car = 'Chevrolet NIVA'
-				car = 8
-				benz = 3
-				cardrive = 8
-				teh = 500
-				tehcar = 500
-				wrek = 0
-
-				'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a Chevrolet Niva (500,000 <b>₽</b>)':gt 'autosalonF', 'buy', 500000, 'Chevrolet NIVA', 8, 500
 		end
 
 		if karta + bankDebtLimit >= 500000:
-			act 'Buy a UAZ Hunter (500 th.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 500000
-				$car = 'UAZ HUNTER'
-				car = 9
-				benz = 3
-				cardrive = 8
-				teh = 300
-				tehcar = 300
-				wrek = 0
-
-				'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a UAZ Hunter (500,000 <b>₽</b>)':gt 'autosalonF', 'buy', 500000, 'UAZ HUNTER', 9, 300
 		end
 
 		if karta + bankDebtLimit >= 600000:
-			act 'Buy a UAZ Patriot (600 th.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 600000
-				$car = 'UAZ Patriot'
-				car = 10
-				benz = 3
-				cardrive = 8
-				teh = 400
-				tehcar = 400
-				wrek = 0
-
-				'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a UAZ Patriot (600,000 <b>₽</b>)':gt 'autosalonF', 'buy', 600000, 'UAZ Patriot', 10, 400
 		end
 
 		if karta + bankDebtLimit >= 500000:
-			act 'Buy a Ford Focus 2 (500 th.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 500000
-				$car = 'Ford Focus 2'
-				car = 13
-				benz = 3
-				cardrive = 8
-				teh = 800
-				tehcar = 800
-				wrek = 0
-
-				'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a Ford Focus 2 (500,000 <b>₽</b>)':gt 'autosalonF', 'buy', 500000, 'Ford Focus 2', 13, 800
 		end
 
 		if karta + bankDebtLimit >= 700000:
-			act 'Buy a Renault LOGAN (700 th.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 700000
-				$car = 'Renault LOGAN'
-				car = 102
-				benz = 3
-				cardrive = 8
-				teh = 1000
-				tehcar = 1000
-				wrek = 0
-
-				'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a Renault LOGAN (700,000 <b>₽</b>)':gt 'autosalonF', 'buy', 700000, 'Renault LOGAN', 102, 1000
 		end
 
 		if karta + bankDebtLimit >= 850000:
-			act 'Buy a Ford Mondeo (850 th.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 850000
-				$car = 'Ford Mondeo'
-				car = 110
-				benz = 3
-				cardrive = 8
-				teh = 2000
-				tehcar = 2000
-				wrek = 0
-
-				'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a Ford Mondeo (850,000 <b>₽</b>)':gt 'autosalonF', 'buy', 850000, 'Ford Mondeo', 110, 2000
 		end
 
 		if karta + bankDebtLimit >= 1000000:
-			act 'Buy a Toyota Celica (1 million.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 1000000
-				$car = 'Toyota Celica'
-				car = 104
-				benz = 3
-				cardrive = 8
-				teh = 3000
-				tehcar = 3000
-				wrek = 0
-
-				'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a Toyota Celica (1,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 1000000, 'Toyota Celica', 104, 3000
 		end
 
 		if karta + bankDebtLimit >= 1000000:
-			act 'Buy a Mitsubishi l200 (1 million.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 1000000
-				$car = 'Mitsubishi l200'
-				car = 95
-				benz = 3
-				cardrive = 8
-				teh = 2000
-				tehcar = 2000
-				wrek = 0
-
-				'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a Mitsubishi l200 (1,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 1000000, 'Mitsubishi l200', 95, 2000
 		end
 
 		if karta + bankDebtLimit >= 1100000:
-			act 'Buy a Toyota Corolla (1,1 million.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 1100000
-				$car = 'Toyaboutta Corolla'
-				car = 103
-				benz = 3
-				cardrive = 8
-				teh = 3000
-				tehcar = 3000
-				wrek = 0
-
-				'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-				'"It''s waiting for you outside." she says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a Toyota Corolla (1,100,000 <b>₽</b>)':gt 'autosalonF', 'buy', 1100000, 'Toyaboutta Corolla', 103, 3000
 		end
 
 		if karta + bankDebtLimit >= 1200000:
-			act 'Buy a Mazda 6 (1,2 million.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 1200000
-				$car = 'Mazda 6'
-				car = 105
-				benz = 3
-				cardrive = 8
-				teh = 3000
-				tehcar = 3000
-				wrek = 0
-
-				'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a Mazda 6 (1,200,000 <b>₽</b>)':gt 'autosalonF', 'buy', 1200000, 'Mazda 6', 105, 3000
 		end
 
 		if karta + bankDebtLimit >= 1700000:
-			act 'Buy a Mercedes-Benz E 212 (1,7 million.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 1700000
-				$car = 'Mercedes-Benz E 212'
-				car = 106
-				benz = 3
-				cardrive = 8
-				teh = 5000
-				tehcar = 5000
-				wrek = 0
-
-				'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a Mercedes-Benz E 212 (1,700,000 <b>₽</b>)':gt 'autosalonF', 'buy', 1700000, 'Mercedes-Benz E 212', 106, 5000
 		end
 
 		if karta + bankDebtLimit >= 1900000:
-			act 'Buy an Audi A6 (1,9 million.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 1900000
-				$car = 'Audi A6'
-				car = 109
-				benz = 3
-				cardrive = 8
-				teh = 5000
-				tehcar = 5000
-				wrek = 0
-
-				'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy an Audi A6 (1,900,000 <b>₽</b>)':gt 'autosalonF', 'buy', 1900000, 'Audi A6', 109, 5000
 		end
 
 		if karta + bankDebtLimit >= 2000000:
-			act 'Buy a Cadillac Escalade (2 million.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 2000000
-				$car = 'Cadillac Escalade'
-				car = 97
-				benz = 3
-				cardrive = 8
-				teh = 4000
-				tehcar = 4000
-				wrek = 0
-
-				'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a Cadillac Escalade (2,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 2000000, 'Cadillac Escalade', 97, 4000
 		end
 
 		if karta + bankDebtLimit >= 3000000:
-			act 'Buy a BMW Z4 (3 million.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 3000000
-				$car = 'BMW Z4'
-				car = 101
-				benz = 3
-				cardrive = 8
-				teh = 4000
-				tehcar = 4000
-				wrek = 0
-
-				'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a BMW Z4 (3,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 3000000, 'BMW Z4', 101, 4000
 		end
 
 		if karta + bankDebtLimit >= 4500000:
-			act 'Buy a BMW M5 (4,5 million.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 4500000
-				$car = 'BMW M5'
-				car = 107
-				benz = 3
-				cardrive = 8
-				teh = 6000
-				tehcar = 6000
-				wrek = 0
-
-				'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a BMW M5 (4,500,000 <b>₽</b>)':gt 'autosalonF', 'buy', 4500000, 'BMW M5', 107, 6000
 		end
 
 		if karta + bankDebtLimit >= 4500000:
-			act 'Buy a BMW X6 (4,5 million.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 4500000
-				$car = 'BMW X6'
-				car = 99
-				benz = 3
-				cardrive = 8
-				teh = 4000
-				tehcar = 4000
-				wrek = 0
-
-				'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a BMW X6 (4,500,000 <b>₽</b>)':gt 'autosalonF', 'buy', 4500000, 'BMW X6', 99, 4000
 		end
 
 		if karta + bankDebtLimit >= 5000000:
-			act 'Buy an Audi Q7 (5 million.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 5000000
-				$car = 'Audi Q7'
-				car = 96
-				benz = 3
-				cardrive = 8
-				teh = 5000
-				tehcar = 5000
-				wrek = 0
-
-				'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy an Audi Q7 (5,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 5000000, 'Audi Q7', 96, 5000
 		end
 
 		if karta + bankDebtLimit >= 5000000:
-			act 'Buy a Porsche Cayenne (5 million.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 5000000
-				$car = 'Porsche Cayenne'
-				car = 98
-				benz = 3
-				cardrive = 8
-				teh = 3000
-				tehcar = 3000
-				wrek = 0
-
-				'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a Porsche Cayenne (5,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 5000000, 'Porsche Cayenne', 98, 3000
 		end
 
 		if karta + bankDebtLimit >= 7000000:
-			act 'Buy a Jaguar XKR-S (7 million.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 7000000
-				$car = 'Jaguar XKR-S'
-				car = 108
-				benz = 3
-				cardrive = 8
-				teh = 4000
-				tehcar = 4000
-				wrek = 0
-
-				'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a Jaguar XKR-S (7,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 7000000, 'Jaguar XKR-S', 108, 4000
 		end
 
 		if karta + bankDebtLimit >= 8000000:
-			act 'Buy a Mercedes-Benz S 600 (8 million.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 8000000
-				$car = 'Mercedes-Benz S 600'
-				car = 100
-				benz = 3
-				cardrive = 8
-				teh = 8000
-				tehcar = 8000
-				wrek = 0
-
-				'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a Mercedes-Benz S 600 (8,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 8000000, 'Mercedes-Benz S 600', 100, 8000
 		end
 
 		if karta + bankDebtLimit >= 10000000:
-			act 'Buy a Bentley Continental GT (10 million.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 10000000
-				$car = 'Bentley Continental GT'
-				car = 111
-				benz = 3
-				cardrive = 8
-				teh = 8000
-				tehcar = 8000
-				wrek = 0
-
-				'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a Bentley Continental GT (10,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 10000000, 'Bentley Continental GT', 111, 8000
 		end
 
 		if karta + bankDebtLimit >= 20000000:
-			act 'Buy a Ferrari 458 Italia (10 million.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 20000000
-				$car = 'Ferrari 458 Italia'
-				car = 112
-				benz = 3
-				cardrive = 8
-				teh = 10000
-				tehcar = 10000
-				wrek = 0
-
-				'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a Ferrari 458 Italia (10,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 20000000, 'Ferrari 458 Italia', 112, 10000
 		end
 	end
 end
 
+if $ARGS[0] = 'buy':
+	cla
+	*clr
+	menu_off = 1
+	karta -= ARGS[1]
+	$car = $ARGS[2]
+	car = ARGS[3]
+	benz = 3
+	cardrive = 9
+	teh = ARGS[4]
+	tehcar = ARGS[4]
+	wrek = 0
+
+	'The manager draws up a purchasing contract, and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
+	'"It''s waiting for you outside," he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
+
+	act 'Leave':gt'city_industrial'
+end
+
 --- autosalonF ---------------------------------
 

+ 16 - 10
locations/autoservisF.qsrc

@@ -13,6 +13,8 @@ if $ARGS[0] = 'start':
 	'<center><b>Car Service Center</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/carservicesta/autoservis1.jpg"></center>'
 
+	if car > 0 and cardrive = 7:'Your <a href="exec:gs ''carF'', ''start''"><<$car>></a> is parked just inside.'
+
 	if cardrive = 7:
 		menu_off = 1
 		if wrek = 0:
@@ -23,7 +25,7 @@ if $ARGS[0] = 'start':
 
 			if teh < tehcar * 75 / 100:
 				'The foreman inspects your car quickly but thoroughly.' 
-				'Here and there, he seems to be murmurring to himself, maybe assessing a defect. After only a few minutes, he returns to you, points out what needs to be fixed.' 
+				'Here and there, he seems to be murmuring to himself, maybe assessing a defect. After only a few minutes, he returns to you and points out what needs to be fixed.' 
 				'It would cost you <<normrem>> <b>₽</b>.'
 
 				if money >= normrem:
@@ -35,15 +37,15 @@ if $ARGS[0] = 'start':
 						teh = tehcar
 						wrek = 0
 						'<center><img <<$set_imgh>> src="images/locations/city/industrial/carservicesta/autoservis2.jpg"></center>'
-						'Since he tells you that it''s not gonna take long, you go into a waiting or recreation room, with couches and a TV. After about an our of flipping through channels, the car is ready and you pay <<normrem>> <b>₽</b>.'
+						'Since he tells you that it''s not gonna take long, you go into a waiting room with couches and a TV. After about an hour of flipping through channels, the car is ready, and you pay <<normrem>> <b>₽</b>.'
 
 						act 'Leave': minut += 5 & gt 'city_industrial'
 					end
 				end
 			end
 		elseif wrek = 1:
-			'The foreman looks onto your car, if this wreckage even qualifies as one, with a professional boredom that tells you he''s seen vehicles in similar or worse states a million times over.' 
-			'He quickly but thoroughly inspects it, murmurring all the while to take mental notes on what needs to be done and, when he returns to you, simply states that it would cost <<normrem>> <b>₽</b> to repair the damage.'
+			'The foreman looks at your car, if this wreckage even qualifies as one, with a professional boredom that tells you he''s seen vehicles in similar or worse states a million times over.' 
+			'He quickly but thoroughly inspects it, murmuring all the while to take mental notes on what needs to be done, and, when he returns to you, simply states that it would cost <<normrem>> <b>₽</b> to repair the damage.'
 
 			if money >= normrem:
 				act 'Pay and wait while they repair the car':
@@ -55,9 +57,9 @@ if $ARGS[0] = 'start':
 					teh = tehcar
 					wrek = 0
 					'<center><img <<$set_imgh>> src="images/locations/city/industrial/carservicesta/autoservis2.jpg"></center>'
-					'Since he tells you that it''s not gonna take long - at first you thought he was being sarcastic but then realized that his no-nonsense attitude didn''t leave much room for humour - you go into a waiting or recreation room, with couches and a TV. After about an our of flipping through channels, you are called back to the garage and can hardly believe your eyes.'
-					'The car looks brandnew! Not a single dent, not one scratch, and when you start the engine to make sure it''s working, it sounds better than ever before. You ask the foreman how he and his crew managed to repair the car, and that quickly, but his only response is a shrug.'
-					'Before he sends you back into the office to pay the <<normrem>> <b>₽</b>, he asks you to not bring them cars in this pitiable state anymore - you''re not sure whether he was joking or not.'
+					'Since he tells you that it''s not gonna take long - at first you think he is being sarcastic but then realize that his no-nonsense attitude doesn''t leave much room for humour - you go into a waiting room with couches and a TV. After about an hour of flipping through channels, you are called back to the garage and can hardly believe your eyes.'
+					'The car looks brand new! Not a single dent, not one scratch, and when you start the engine to make sure it''s working, it sounds better than ever before. You ask the foreman how he and his crew managed to repair the car, and that quickly, but his only response is a shrug.'
+					'Before he sends you back into the office to pay the <<normrem>> <b>₽</b>, he asks you to not bring them cars in this pitiable state anymore - you''re not sure whether he is joking or not.'
 
 					act 'Leave': minut += 5 & gt 'city_industrial'
 				end
@@ -65,10 +67,10 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if cardrive ! 7:'The foreman sighs. "Where is your car, girl? I need to look at your car to see if and what is wrong with it. Bring your car and I''ll examine it."'
+	if cardrive ! 7:'The foreman sighs. "Where is your car, girl? I need to look at your car to see if and what is wrong with it. Bring your car, and I''ll examine it."'
 
 	if wrek = 1 and cardrive ! 7 and car > 0:
-		'The garage offers a towing service for damaged cars, to bring them to this service centers. The price: 2500 <b>₽</b>'
+		'The garage offers a towing service for damaged cars to bring them to this service center. The price: 2500 <b>₽</b>'
 
 		if money >= 2500:
 			act 'Pay for the towing service (2,500 <b>₽</b>) (1:00)':
@@ -79,7 +81,7 @@ if $ARGS[0] = 'start':
 				cardrive = 7
 				minut += 60
 				'<center><img <<$set_imgh>> src="images/locations/city/industrial/carservicesta/autoservis2.jpg"></center>'
-				'You sit down and wait at the service station. It takes about an hour until your car arrives, but when it does, it is almost immediately moved into the garage and it looks like the foreman is about ready to inspect it.'
+				'You sit down and wait at the service station. It takes about an hour until your car arrives, but when it does, it is almost immediately moved into the garage, and it looks like the foreman is about ready to inspect it.'
 
 				act 'See what the foreman has to say':gt 'autoservisF', 'start'
 			end
@@ -89,5 +91,9 @@ if $ARGS[0] = 'start':
 	act 'Leave': minut += 5 & gt 'city_industrial'
 end
 
+if $ARGS[0] = 'is_open':
+	RESULT = hour >= 9 and hour <= 20 and week < 7
+end
+
 --- autoservisF ---------------------------------
 

+ 64 - 219
locations/autotraidF.qsrc

@@ -15,9 +15,11 @@ if $ARGS[0] = 'start':
 	'- We only sell to people with valid driver''s licenses.'
 	'- New State law: No sale if you already own a car.'
 
+	if car > 0 and cardrive = 9:'Your <a href="exec:gs ''carF'', ''start''"><<$car>></a> is parked just inside.'
+
 	act 'Leave': minut += 5 & gt 'city_industrial'
 	
-	if hour <= 17:
+	if func('autotraidF', 'is_open'):
 		if car > 0:act 'Ask about selling your car':gt 'autotraidF', 'manager1'
 
 		act 'Look at the new cars for sale': gt 'autosalonF', 'start'
@@ -25,6 +27,10 @@ if $ARGS[0] = 'start':
 	end
 end
 
+if $ARGS[0] = 'is_open':
+	RESULT = hour >= 9 and hour < 18 and week > 1
+end
+
 if $ARGS[0] = 'manager1':
 	$loc_arg = $ARGS[0]
 	$loc = 'autotraidF'
@@ -40,7 +46,7 @@ if $ARGS[0] = 'manager1':
 	act 'Leave': killvar 'bupay' & minut += 5 & gt 'city_industrial'
 	
 	if cardrive = 9 and car > 0:
-		'The shifty-looking salesman circles around your car a couple of times, making exaggerated displeased noises all the while and pointing out practically every speck of dust as if it was a huge damage. When he turns to you, he states that the best he can do is <<bupay>> <b>₽</b> - while he claims that he''s taking a risk with that price, you''re pretty sure he''s ripping you off.'
+		'The shifty-looking salesman circles around your car a couple of times, making exaggerated displeased noises all the while and pointing out practically every speck of dust as if it is major damage. When he turns to you, he states that the best he can do is <<bupay>> <b>₽</b> - while he claims that he''s taking a risk with that price, you''re pretty sure he''s ripping you off.'
 
 		act 'No way, not at that price - Leave': killvar 'bupay' & minut += 5 & gt 'city_industrial'
 		
@@ -50,7 +56,7 @@ if $ARGS[0] = 'manager1':
 			minut += 60
 			money += bupay
 			car = 0
-			'While you are almost certain that he''s offering less than the car is actually worth, you doubt that you''re going find somebody who''s going to offer you more for it and your attempts at haggling with the fence fall flat - he''s just too experienced at this.'
+			'While you are almost certain that he''s offering less than the car is actually worth, you doubt that you''re going to find somebody who''s going to offer you more for it, and your attempts at haggling with the fence fall flat - he''s just too experienced at this.'
 			'So, as much as you hate it, you give your car one last look before you shake hands with him and follow him into the tiny shed he calls his "office" to sign the papers. He hands you the money in cash and, with a nasty grin, suggests that you look around the yard.' 
 			'"Maybe you''ll see something you like?"'
 
@@ -86,44 +92,14 @@ if $ARGS[0] = 'car':
 	gs 'stat'
 	'<center><b>Used Car Dealership</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/usedcar/autotraid.jpg"></center>'
-	'There are so many cars on the parking lot that you could spend a lifetime looking around without ever seeing all of them. According to the salesman, several cars are currently being test-driven or maintained. You doubt that there''s actually any maintenance going on though: Several of the cars are visibly damaged or make awful sounds when they are started.' 
+	'There are so many cars on the parking lot that you could spend a lifetime looking around without ever seeing all of them. According to the salesman, several cars are currently being test-driven or maintained. You doubt that there''s actually any maintenance going on though: several of the cars are visibly damaged or make awful sounds when they are started.' 
 	*nl
 	'It''s obvious that most, if not all of them have sustained some visible or invisible damage. Buying a car here could be a fantastic bargain... or a complete waste of money. If you are to buy any of them, you know that the first place to visit should be a service center.'
 
 	act 'Return': killvar 'carT' & killvar 'bupay' & gt 'autotraidF', 'start'
 	
 	if hour <= 17:
-		act 'Inspect a 2107':
-			cla
-			*clr
-			menu_off = 1
-			'<center><b>2107</b></center>'
-			'<center><img <<$set_imgh>> src="images/shared/accessories/car/car.jpg"></center>'
-			tehNT = 200
-			carT = 1
-			gs 'avt'
-			'<<$tehT>> The car salesman wants <<bupay>> <b>₽</b> for it.'
-
-			act 'Look around some more':gt 'autotraidF', 'car'
-
-			if car = 0 and prava = 1 and money >= bupay:
-				act 'Buy the car (<<bupay>> <b>₽</b>)':
-					cla
-					money -= bupay
-					$car = '2107'
-					car = 1
-					benz = 3
-					cardrive = 9
-					teh = tehT
-					tehcar = 200
-					wrek = 0
-					'You agree and before you know it, the car salesman and you have signed all the necessary documents. You hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
-					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
-					killvar 'bupay' & killvar 'tehT'
-					act 'Leave': minut += 5 & gt 'city_industrial'
-				end
-			end
-		end
+		act 'Inspect a 2107':gt 'autotraidF', 'inspect', '2107', 1, 200, 1, 3
 
 		act 'Inspect another 2107 (Broken Engine)':
 			cla
@@ -147,7 +123,7 @@ if $ARGS[0] = 'car':
 					tehcar = 200
 					teh = rand(10, tehcar)
 					wrek = 1
-					'You agree and before you know it, the car salesman and you have signed all the necessary documents. You hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
+					'You agree and before you know it, the car salesman and you have signed all the necessary documents. You hand over the <<bupay>> <b>₽</b> in cash, and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you... and that''s it.' 
 					'If you want to get the car to a garage, you''ll have to go there and have it towed.'
 					killvar 'bupay'
@@ -155,193 +131,62 @@ if $ARGS[0] = 'car':
 				end
 			end
 		end
-		act 'Inspect a VAZ 2115':
-			cla
-			*clr
-			menu_off = 1
-			tehNT = 300
-			carT = 1
-			'<center><b>VAZ 2115</b></center>'
-			'<center><img <<$set_imgh>> src="images/shared/accessories/car/car2.jpg"></center>'
-			gs'avt'
-			'<<$tehT>> The car salesman wants <<bupay>> <b>₽</b> for it.'
-
-			act 'Look around some more':gt'autotraidF','car'
-
-			if car = 0 and prava = 1 and money >= bupay:
-				act 'Buy for <<bupay>> <b>₽</b>':
-					cla
-					money = money - bupay
-					$car = 'VAZ 2115'
-					car = 2
-					benz = 3
-					cardrive = 9
-					teh = tehT
-					tehcar = 300
-					wrek = 0
-					'You agree and before you know it, the car salesman and you have signed all the necessary documents. You hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
-					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
-					killvar 'bupay' & killvar 'tehT'
-					act 'Leave': minut += 5 & gt'city_industrial'
-				end
-			end
-		end
-		act 'Inspect a VAZ 2113':
-			cla
-			*clr
-			menu_off = 1
-			tehNT = 290
-			carT = 1
-			'<center><b>VAZ 2113</b></center>'
-			'<center><img <<$set_imgh>> src="images/shared/accessories/car/car3.jpg"></center>'
-			gs'avt'
-			'<<$tehT>> The car salesman wants <<bupay>> <b>₽</b> for it.'
-
-			act 'Look around some more':gt'autotraidF','car'
-
-			if car = 0 and prava = 1 and money >= bupay:
-				act 'Buy for <<bupay>> <b>₽</b>':
-					cla
-					money = money - bupay
-					$car = 'VAZ 2113'
-					car = 3
-					benz = 3
-					cardrive = 9
-					teh = tehT
-					tehcar = 290
-					wrek = 0
-					'You agree and before you know it, the car salesman and you have signed all the necessary documents. You hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
-					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
-					killvar 'bupay' & killvar 'tehT'
-					act 'Leave': minut += 5 & gt'city_industrial'
-				end
-			end
-		end
-		act 'Inspect a VAZ 2114':
-			cla
-			*clr
-			menu_off = 1
-			tehNT = 300
-			carT = 1
-			'<center><b>VAZ 2114</b></center>'
-			'<center><img <<$set_imgh>> src="images/shared/accessories/car/car4.jpg"></center>'
-			gs'avt'
-			'<<$tehT>> The car salesman wants <<bupay>> <b>₽</b> for it.'
 
-			act 'Look around some more':gt'autotraidF','car'
-
-			if car = 0 and prava = 1 and money >= bupay:
-				act 'Buy for <<bupay>> <b>₽</b>':
-					cla
-					money = money - bupay
-					$car = 'VAZ 2114'
-					car = 4
-					benz = 3
-					cardrive = 9
-					teh = tehT
-					tehcar = 300
-					wrek = 0
-					'You agree and before you know it, the car salesman and you have signed all the necessary documents. You hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
-					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
-					killvar 'bupay' & killvar 'tehT'
-					act 'Leave': minut += 5 & gt'city_industrial'
-				end
-			end
-		end
-		act 'Inspect a VAZ 2110':
-			cla
-			*clr
-			menu_off = 1
-			tehNT = 350
-			carT = 1
-			'<center><b>VAZ 2110</b></center>'
-			'<center><img <<$set_imgh>> src="images/shared/accessories/car/car5.jpg"></center>'
-			gs'avt'
-			'<<$tehT>> The car salesman wants <<bupay>> <b>₽</b> for it.'
-
-			act 'Look around some more':gt'autotraidF','car'
-
-			if car = 0 and prava = 1 and money >= bupay:
-				act 'Buy for <<bupay>> <b>₽</b>':
-					cla
-					money = money - bupay
-					$car = 'VAZ 2110'
-					car = 5
-					benz = 3
-					cardrive = 9
-					teh = tehT
-					tehcar = 350
-					wrek = 0
-					'You agree and before you know it, the car salesman and you have signed all the necessary documents. You hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
-					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
-					killvar 'bupay' & killvar 'tehT'
-					act 'Leave': minut += 5 & gt'city_industrial'
-				end
-			end
-		end
-
-		act 'Inspect a GAZ 3102':
-			cla
-			*clr
-			menu_off = 1
-			'<center><b>3102 GAS</b></center>'
-			'<center><img <<$set_imgh>> src="images/shared/accessories/car/car11.jpg"></center>'
-			tehNT = 1000
-			carT = 2
-			gs 'avt'
-			'<<$tehT>> The car salesman wants <<bupay>> <b>₽</b> for it.'
-
-			act 'Look around some more':gt 'autotraidf', 'car'
+		act 'Inspect a VAZ 2115':gt 'autotraidF', 'inspect', 'VAZ 2115', 2, 300, 1, 3
+		act 'Inspect a VAZ 2113':gt 'autotraidF', 'inspect', 'VAZ 2113', 3, 290, 1, 3
+		act 'Inspect a VAZ 2114':gt 'autotraidF', 'inspect', 'VAZ 2114', 4, 300, 1, 3
+		act 'Inspect a VAZ 2110':gt 'autotraidF', 'inspect', 'VAZ 2110', 5, 350, 1, 3
+		act 'Inspect a GAZ 3102':gt 'autotraidF', 'inspect', '3102 GAS', 11, 1000, 2, 5
+		act 'Inspect a 3110':gt 'autotraidF', 'inspect', '3110', 12, 800, 2, 5
+	end
+end
 
-			if car = 0 and prava = 1 and money >= bupay:
-				act 'Buy <<bupay>><b>₽</b>':
-					cla
-					money -= bupay
-					$car = 'GAZ 3102'
-					car = 11
-					benz = 5
-					cardrive = 9
-					teh = tehT
-					tehcar = 1000
-					wrek = 0
-					'You agree and before you know it, the car salesman and you have signed all the necessary documents. You hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
-					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
-					killvar 'bupay' & killvar 'tehT'
-					act 'Leave': minut += 5 & gt 'city_industrial'
-				end
-			end
-		end
+if $ARGS[0] = 'inspect':
+	cla
+	*clr
+	menu_off = 1
+	$autotraidF_carname = $ARGS[1]
+	autotraidF_carnum = ARGS[2]
+	tehNT = ARGS[3]
+	carT = ARGS[4]
+	autotraidF_benz = ARGS[5]
+
+	'<center><b><<$autotraidF_carname>></b></center>'
+	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car<<iif(autotraidF_carnum = 1, '''', autotraidF_carnum)>>.jpg"></center>'
+
+	gs 'avt'
+	'<<$tehT>> The car salesman wants <<bupay>> <b>₽</b> for it.'
+
+	act 'Look around some more':
+		killvar 'bupay'
+		killvar 'tehT'
+		killvar 'tehNT'
+		killvar '$autotraidF_carname'
+		killvar 'autotraidF_carnum'
+		killvar 'autotraidF_benz'
+		gt 'autotraidF', 'car'
+	end
 
-		act 'Inspect a 3110':
+	if car = 0 and prava = 1 and money >= bupay:
+		act 'Buy (<<bupay>> <b>₽</b>)':
 			cla
-			*clr
-			menu_off = 1
-			'<center><b>3110</b></center>'
-			'<center><img <<$set_imgh>> src="images/shared/accessories/car/car12.jpg"></center>'
-			tehNT = 800
-			carT = 2
-			gs 'avt'
-			'<<$tehT>> The car salesman wants <<bupay>> <b>₽</b> for it.'
-
-			act 'Look around some more':gt 'autotraidF', 'car'
-
-			if car = 0 and prava = 1 and money >= bupay:
-				act 'Buy (<<bupay>> <b>₽</b>)':
-					cla
-					money -= bupay
-					$car = '3110'
-					car = 12
-					benz = 5
-					cardrive = 9
-					teh = tehT
-					tehcar = 800
-					wrek = 0
-					'You agree and before you know it, the car salesman and you have signed all the necessary documents. You hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
-					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
-					killvar 'bupay' & killvar 'tehT'
-					act 'Leave': minut += 5 & gt 'city_industrial'
-				end
-			end
+			money -= bupay
+			$car = $autotraidF_carname
+			car = autotraidF_carnum
+			benz = autotraidF_benz
+			cardrive = 9
+			teh = tehT
+			tehcar = tehNT
+			wrek = 0
+			'You agree and before you know it, the car salesman and you have signed all the necessary documents. You hand over the <<bupay>> <b>₽</b> in cash, and the car is yours.' 
+			'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
+			killvar 'bupay'
+			killvar 'tehT'
+			killvar 'tehNT'
+			killvar '$autotraidF_carname'
+			killvar 'autotraidF_carnum'
+			killvar 'autotraidF_benz'
+			act 'Leave': minut += 5 & gt 'city_industrial'
 		end
 	end
 end

+ 4 - 5
locations/avt.qsrc

@@ -2,10 +2,10 @@
 if tehNT = 0: tehNT = 200
 tehT = rand(10, tehNT)
 
-if tehT >= tehNT * 75 / 100:$tehT = 'Machine in excellent condition.'
-if tehT < tehNT * 75 / 100 and tehT >= tehNT * 50 / 100:$tehT = 'When the engine has what is background noise'
-if tehT < tehNT * 50 / 100 and tehT >= tehNT * 25 / 100:$tehT = 'Machine rumbles and smokes.'
-if tehT < tehNT * 25 / 100:$tehT = 'As this bowl was able to be got is not clear.'
+if tehT >= tehNT * 75 / 100:$tehT = 'The car looks like it''s in excellent condition.'
+if tehT < tehNT * 75 / 100 and tehT >= tehNT * 50 / 100:$tehT = 'When you turn on the car, the engine makes some noise.'
+if tehT < tehNT * 50 / 100 and tehT >= tehNT * 25 / 100:$tehT = 'When you turn on the car, the engine rumbles and smokes.'
+if tehT < tehNT * 25 / 100:$tehT = 'You''re not sure how someone managed to get this piece of junk here.'
 
 if carT = 1:
 	if tehT >= tehNT * 75 / 100:bupay = rand(100000, 180000)
@@ -18,7 +18,6 @@ elseif carT = 2:
 	if tehT < tehNT * 50 / 100 and tehT >= tehNT * 25 / 100:bupay = rand(30000, 60000)
 	if tehT < tehNT * 25 / 100:bupay = rand(15000, 40000)
 end
-killvar 'tehNT'
 killvar 'carT'
 
 --- avt ---------------------------------

+ 49 - 26
locations/bordel.qsrc

@@ -7,6 +7,8 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	'<center><b>Brothel</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/bordel.jpg"></center>'
 
+	'The brothel madam looks you over as you enter.'
+
 	if pcs_apprnc < 0:
 		'"You look half dead, get yourself treated."'
 
@@ -16,7 +18,9 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 
 		act 'Leave':gt 'city_industrial', 'redlight'
 	else
-		act 'In the room':gt 'bordel', 'brothel'
+		'"You can work tonight, head to your room and get ready."'
+
+		act 'Go to your room':gt 'bordel', 'brothel'
 	end
 end
 
@@ -34,9 +38,9 @@ if $ARGS[0] = 'brothel':
 	gs 'stat'
 	'<center><b>Your room in a brothel</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/borroom.jpg"></center>'
-	'This is your room in the brothel. In the middle is a huge bed and not much else, there is a small side door to the <a href="exec:gt ''bordel'', ''dysh''">bathroom</a>.'
+	'This is your room in the brothel. In the middle is a huge bed and not much else. There is a small side door to the <a href="exec:gt ''bordel'', ''dysh''">bathroom</a>.'
 	*nl
-	'In a brothel there is a lot of competition, in order to avoid a massacre they introduced a rule - no more than two clients per day'
+	'In a brothel there is a lot of competition. In order to avoid a massacre, they introduced a rule - no more than two clients per day.'
 
 	act 'Leave':
 		if $clothingworntype ! 'nude':
@@ -49,21 +53,23 @@ if $ARGS[0] = 'brothel':
 		end
 	end
 
-	act 'Go to the reception room and wait for customers':
+	if func('bordel', 'is_open'):
+		act 'Go to the reception room and wait for customers':
 
-		if (cumloc[6] = 1 or cumloc[7] = 1) or cumloc[11] = 1 or pcs_makeup < 2 or pcs_leghair > 3 or pcs_pubes > 3 or sweat > 25 or pcs_hairbsh = 0:
-			cla
-			'The brothel madam comes over to you and says, "Our customers expect you to be clean, shaven, made-up and with your hair looking nice. Go and sort yourself out, now!"'
+			if (cumloc[6] = 1 or cumloc[7] = 1) or cumloc[11] = 1 or pcs_makeup < 2 or pcs_leghair > 3 or pcs_pubes > 3 or sweat > 25 or pcs_hairbsh = 0:
+				cla
+				'The brothel madam comes over to you and says, "Our customers expect you to be clean, shaven, made-up and with your hair looking nice. Go and sort yourself out, now!"'
 
-			act 'Go to the bathroom':gt 'bordel', 'dysh'
-		elseif $clothingworntype ! 'fancy_burlesque' and PCloStyle ! 4 and $clothingworntype ! 'nude':
-			cla
-			'You need to wear an outfit that can be used for prostitution. If you haven''t got anything suitable and you are desperate, you could work naked but you will get paid less and might get treated badly.'
-			'You can change your clothes in the bathroom.'
+				act 'Go to the bathroom':gt 'bordel', 'dysh'
+			elseif $clothingworntype ! 'fancy_burlesque' and PCloStyle ! 4 and $clothingworntype ! 'nude':
+				cla
+				'You need to wear an outfit that can be used for prostitution. If you haven''t got anything suitable and you are desperate, you could work naked, but you will get paid less and might get treated badly.'
+				'You can change your clothes in the bathroom.'
 
-			act 'Go to the bathroom':gt 'bordel', 'dysh'
-		else
-			gt 'bordel', 'var'
+				act 'Go to the bathroom':gt 'bordel', 'dysh'
+			else
+				gt 'bordel', 'var'
+			end
 		end
 	end
 end
@@ -84,7 +90,7 @@ if $ARGS[0] = 'dysh':
 
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/bordysh.jpg"></center>'
 	'The bathroom is well fitted and clean as customers can access it and hygiene is very important in a brothel.'
-	'Your room is so dedicated to it purpose that your clothes are stored in here.'
+	'Your room is so dedicated to its purpose that your clothes are stored in here.'
 	*nl
 	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.' 
 	
@@ -118,7 +124,8 @@ if $ARGS[0] = 'var':
 	borrand = rand(0, 10)
 
 	if borrand = 0:
-		'Customer orders one girl (1,000 <b>₽</b>).'
+		bordelpay *= 100
+		'A customer orders you (<<bordelpay>> <b>₽</b>).'
 		
 		gs 'willpower', 'sex', 'resist'
 		if will_cost <= pcs_willpwr:
@@ -134,7 +141,7 @@ if $ARGS[0] = 'var':
 
 		act 'Agree':
 			borsexkol += 1
-			money += 100 * bordelpay
+			money += bordelpay
 			slutty += 1
 			bordelslutty += 1
 			minut += 10
@@ -146,7 +153,8 @@ if $ARGS[0] = 'var':
 			gt 'sex', 'start'
 		end
 	elseif borrand = 1:
-		'Customer orders two girls (1,000 <b>₽</b>).'
+		bordelpay *= 100
+		'A customer orders you and another girl (<<bordelpay>> <b>₽</b>).'
 
 		gs 'willpower', 'sex', 'resist', 'hard'
 		if will_cost <= pcs_willpwr:
@@ -162,7 +170,7 @@ if $ARGS[0] = 'var':
 
 		act 'Agree':
 			borsexkol += 1
-			money += 100 * bordelpay
+			money += bordelpay
 			slutty += 1
 			bordelslutty += 1
 			minut += 10
@@ -173,7 +181,8 @@ if $ARGS[0] = 'var':
 			gt 'podrsex', 'start'
 		end
 	elseif borrand = 2:
-		'Two clients book one girl (1,500 <b>₽</b>).'
+		bordelpay *= 150
+		'Two clients book you (<<bordelpay>> <b>₽</b>).'
 
 		gs 'willpower', 'sex', 'resist', 'hard'
 		if will_cost <= pcs_willpwr:
@@ -189,7 +198,7 @@ if $ARGS[0] = 'var':
 
 		act 'Agree':
 			borsexkol += 1
-			money += 150 * bordelpay
+			money += bordelpay
 			slutty += 1
 			bordelslutty += 1
 			minut += 10
@@ -202,7 +211,8 @@ if $ARGS[0] = 'var':
 			gt 'sexdvoe', 'start'
 		end
 	elseif borrand = 3:
-		'Two clients book two girls (1,500 <b>₽</b>).'
+		bordelpay *= 150
+		'Two clients book you and another girl (<<bordelpay>> <b>₽</b>).'
 
 		gs 'willpower', 'sex', 'resist'
 		if will_cost <= pcs_willpwr:
@@ -218,7 +228,7 @@ if $ARGS[0] = 'var':
 
 		act 'Agree':
 			borsexkol += 1
-			money += 150 * bordelpay
+			money += bordelpay
 			slutty += 1
 			bordelslutty += 1
 			minut += 10
@@ -231,7 +241,8 @@ if $ARGS[0] = 'var':
 			gt 'sexdvanadva', 'start'
 		end
 	elseif borrand = 4:
-		'Group of customers order one girl, price 2,000 <b>₽</b>.'
+		bordelpay *= 200
+		'A group of customers order you (<<bordelpay>> <b>₽</b>).'
 
 		gs 'willpower', 'sex', 'resist', 'hard'
 		if will_cost <= pcs_willpwr:
@@ -247,7 +258,7 @@ if $ARGS[0] = 'var':
 
 		act 'Agree':
 			borsexkol += 1
-			money += 200 * bordelpay
+			money += bordelpay
 			slutty += 1
 			bordelslutty += 1
 			minut += 10
@@ -273,5 +284,17 @@ if $ARGS[0] = 'var':
 	end
 end
 
+if $ARGS[0] = 'is_open':
+	RESULT = hour >= func('bordel', 'open_hour') or hour <= func('bordel', 'close_hour')
+end
+
+if $ARGS[0] = 'open_hour':
+	RESULT = 20
+end
+
+if $ARGS[0] = 'close_hour':
+	RESULT = 3
+end
+
 --- bordel ---------------------------------
 

+ 28 - 28
locations/bordelv.qsrc

@@ -5,11 +5,11 @@ menu_off = 1
 minut += 30
 pcs_horny += 20
 gs 'stat'
-'<center><b><font color="maroon">room with a mirror</font></b></center>'
+'<center><b><font color="maroon">Room with a mirror</font></b></center>'
 '<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/sex/bvika1.jpg"></center>'
-'Vika walks you through the neighborhood, and you end up entering through an inconspicuous door where you find a large room full of girls scurrying around in their underwear. Not letting you look around Vika drags you down the hall, you finally end up in a small room that''s empty except some chairs and a glass wall. "Sit here." she says, and leaves.'
+'Vika takes you on the metro to the city industrial area. After the two of you leave the station, she walks you through the neighborhood, and you end up entering an inconspicuous door where you find a large room full of girls scurrying around in their underwear. Not letting you look around, Vika drags you down the hall. You finally end up in a small room that''s empty except some chairs and a glass wall. "Sit here," she says and leaves.'
 'You take a seat and look through the glass only to find a room with a large bed. <i>"This is a brothel."</i> flashes in your head, <i>"I''m in the room for voyeurs."</i>'
-'While you''re pondering this information, Vika enters the room, dressed in a pink combination, and lies on the bed.'
+'While you''re processing this information, Vika enters the room, dressed in a pink combination, and lies on the bed.'
 'She looks at you through the glass and with one hand massages her pussy through her panties. Observing her is turning you on.'
 
 act 'Watch Vika work':
@@ -17,7 +17,7 @@ act 'Watch Vika work':
 	*clr
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/sex/bvika2.jpg"></center>'
 	'A few minutes later, two men enter the room. Vika jumps off the bed and kneels between them, grabs hold of their members while still looking in your direction, and begins sucking them both at once.'
-	'You look on in amazement as her mouth makes one of the cocks disappears down the throat then moves on to the other member. She diligently continues to satisfy the men not taking her eyes from the mirror. This sight has your pussy dripping wet wanting to join them.'
+	'You look on in amazement as her mouth makes one of the cocks disappear down her throat then moves on to the other member. She diligently continues to satisfy the men, not taking her eyes from the mirror. This sight has your pussy dripping wet wanting to join them.'
 
 	gs 'arousal', 'voyeur_sex', 5
 	gs 'arousal', 'masturbate', 5
@@ -45,8 +45,8 @@ if $ARGS[0] = 'sex':
 	dviksex += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/sex/bvika<<rand(3,7)>>.jpg"></center>'
-	'You continue to watch on as the men start to fuck Vika. They keep changing positions alternately entering her pussy, then switching her anus, and letting her taste it all. Vika moans loudly and struggles to please them, she tries her hardest to keep looking towards you behind the mirror.'
-	'Even though you knew that she could not see you, if felt she could see you right in the eyes, searching for your approval.'
+	'You continue to watch on as the men start to fuck Vika. They keep changing positions, alternately entering her pussy then switching to her anus, and letting her taste it all. Vika moans loudly and struggles to please them. She tries her hardest to keep looking towards you behind the mirror.'
+	'Even though you know that she can not see you, if feels like she''s looking you right in the eyes, searching for your approval.'
 
 	gs 'arousal', 'voyeur_sex', 10
 	gs 'arousal', 'masturbate', 10
@@ -74,8 +74,8 @@ if $ARGS[0] = 'end':
 	minut += 10
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/sex/bvika8.jpg"></center>'
-	'When the men are satisfied, Vika kneels down and lets them cum all over her mouth, face and chest. Watching them cum all over Vika has your body tremble with excitement, you close your eyes and a pleasant orgasm washes over you.'
-	'When you re-open them, the men are already gone and Vika is sitting on the floor covered in sperm, she is now trying to avoid your judgmental eyes. Finally, she forces herself to get up and leaves the room.'
+	'When the men are satisfied, Vika kneels down and lets them cum all over her mouth, face and chest. Watching them cum all over Vika has your body tremble with excitement. You close your eyes, and a pleasant orgasm washes over you.'
+	'When you re-open them, the men are already gone, and Vika is sitting on the floor covered in sperm. She is now trying to avoid your judgmental eyes. Finally, she forces herself to get up and leaves the room.'
 
 	$orgasm_or = 'yes'
 	gs 'stat'
@@ -84,17 +84,17 @@ if $ARGS[0] = 'end':
 		cla
 		*clr
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/sex/bvika9.jpg"></center>'
-		'A few minutes later the door opens and Vika enters the room. She closes the door and you can''t really see her, only her silhouette. Not saying anything, Vika silently awaits your reaction.'
+		'A few minutes later, the door opens, and Vika enters the room. She closes the door, and you can''t really see her, only her silhouette. Not saying anything, Vika silently awaits your reaction.'
 
 		if slutty = 0:
 			act 'Call her a whore':
 				cla
-				'"Whore" is perhaps the nicest word you can say, due to the shock you reel off every swear word you can think of, some of the words you might have just made up. As you''ve finished with your barrage all quiets down and you notice a distraught Vika crying.'
+				'"Whore" is perhaps the nicest word you direct at her. Due to the shock, you reel off every swear word you can think of, some of the words you might have just made up. As you finish with your barrage, all quiets down, and you notice a distraught Vika crying.'
 
 				act 'Leave':
 					npc_rel['A220'] = 0
 					vikaend = 1
-					gt 'city_residential'
+					gt 'city_industrial', 'redlight'
 				end
 				
 				gs 'willpower', 'misc', 'self'
@@ -105,8 +105,8 @@ if $ARGS[0] = 'end':
 						gs 'willpower', 'misc', 'self'
 						gs 'willpower', 'pay', 'self'
 						gs 'stat'
-						'You begin to comfort her by saying that you did not want to hurt her and what you uttered was because it came as a shock. Vika nears you and you hug her, soon after she stops crying and says that she should get back to work, and walks you to the exit.'
-						act 'Leave':gt 'city_residential'
+						'You begin to comfort her by saying that you did not want to hurt her and what you uttered was because this came as a shock. Vika nears you, and you hug her. Soon after, she stops crying and says that she should get back to work, and walks you to the exit.'
+						act 'Leave':gt 'city_industrial', 'redlight'
 					end
 				else
 					act 'Comfort her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -120,10 +120,10 @@ if $ARGS[0] = 'end':
 					gs 'willpower', 'misc', 'self', 'hard'
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
-					'"Why are you so upset? So you work in a brothel, I couldn''t keep my hands off me. It was so hot." you say quietly.'
-					'Vika breaths out, relieved, "I was worried that you would not understand. I have to go back to work now, you should leave." Vika says as she leads you to the exit.'
+					'"Why are you so upset? So you work in a brothel, I couldn''t keep my hands off myself. It was so hot," you say quietly.'
+					'Vika breaths out, relieved. "I was worried that you would not understand. I have to go back to work now, you should leave," Vika says as she leads you to the exit.'
 
-					act 'Leave':gt 'city_residential'
+					act 'Leave':gt 'city_industrial', 'redlight'
 				end
 			else
 				act 'Comfort her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -132,10 +132,10 @@ if $ARGS[0] = 'end':
 			act 'Comfort her':
 				cla
 				npc_rel['A220'] += 5
-				'"Why are you so upset? So you work in a brothel, I couldn''t keep my hands off me. It was so hot." you say quietly.'
-				'Vika breaths out, relieved, "I was worried that you would not understand. I have to go back to work now, you should leave." Vika says as she leads you to the exit.'
+				'"Why are you so upset? So you work in a brothel, I couldn''t keep my hands off myself. It was so hot," you say quietly.'
+				'Vika breaths out, relieved. "I was worried that you would not understand. I have to go back to work now, you should leave," Vika says as she leads you to the exit.'
 
-				act 'Leave':gt 'city_residential'
+				act 'Leave':gt 'city_industrial', 'redlight'
 			end
 			
 			gs 'willpower', 'misc', 'self', 'hard'
@@ -147,10 +147,10 @@ if $ARGS[0] = 'end':
 					gs 'willpower', 'misc', 'self', 'hard'
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
-					'"That was so hot! Can you talk to your boss, I want to work here?" you ask.'
-					'Vika lets out a relieving sigh, "And here I was worried that you would not understand. I''ll ask the boss, but I can not guarantee they''ll take you on. I have to go back to work, you should leave." Vika says and leads you to the exit.'
+					'"That was so hot! Can you talk to your boss? I want to work here," you ask.'
+					'Vika lets out a relieved sigh. "And here I was worried that you would not understand. I''ll ask the boss, but I can not guarantee they''ll take you on. I have to go back to work, you should leave," Vika says and leads you to the exit.'
 
-					act 'Leave':gt 'city_residential'
+					act 'Leave':gt 'city_industrial', 'redlight'
 				end
 			else
 				act 'Ask about a job at the brothel (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -165,11 +165,11 @@ if $ARGS[0] = 'out':
 	minut += 20
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/bordel.jpg"></center>'
-	'Panicking you run out of the room trying to escape, you rush towards the first door you notice, as you open it you find yourself in another room where a girl is "working". The girl quickly shoos you out and slams the door, as you rush to the next room and find the same thing again. You rush through the corridors, all the doors are looking the same and you start to panic.'
-	'Just as you''re about to give up and cry all of a sudden someone pats you on the shoulder, you turn and see Vika, she has just left the room and stands in front of you naked, her face and chest covered with sperm.'
+	'Panicking, you run out of the room trying to escape. You rush towards the first door you notice, but as you open it, you find yourself in another room where a girl is "working". The girl quickly shoos you out and slams the door. You rush to the next room and find the same thing again. You rush through the corridors, but all the doors are looking the same, and you start to panic.'
+	'Just as you''re about to give up and cry, all of a sudden someone pats you on the shoulder. You turn and see Vika. She has just left the room and stands in front of you naked, her face and chest covered with sperm.'
 	'"<<$pcs_nickname>> wait and relax. You promised to keep quiet..." Vika says.'
 	'"Where''s the fucking way out, whore!" you cry out.'
-	'Vika looks at you, you noticed her lips tremble and her eyes slowly tearing up, "There." she points you to one of the doors, barely hiding the fact that she''s about to cry.'
+	'Vika looks at you. You notice her lips tremble and her eyes slowly tearing up. "There," she points you to one of the doors, barely hiding the fact that she''s about to cry.'
 	
 	act 'Leave':
 		npc_rel['A220'] = 0
@@ -178,7 +178,7 @@ if $ARGS[0] = 'out':
 		gs 'arousal', 'end'
 		gs 'stat'
 	
-		gt 'city_residential'
+		gt 'city_industrial', 'redlight'
 	end
 	
 	gs 'willpower', 'misc', 'self', 'hard'
@@ -190,8 +190,8 @@ if $ARGS[0] = 'out':
 			gs 'willpower', 'pay', 'self'
 			gs 'arousal', 'end'
 			gs 'stat'
-			'Seeing her upset, you begin to comfort her by saying that you did not want to hurt her and that you''re sorry. Vika walks up to you and you hug each other. Shortly thereafter she stops crying and says that she should get back to work, as she walks you to the exit.'
-			act 'Leave':gt 'city_residential'
+			'Seeing her upset, you begin to comfort her by saying that you did not want to hurt her and that you''re sorry. Vika walks up to you, and you hug each other. Shortly thereafter, she stops crying and says that she should get back to work, as she walks you to the exit.'
+			act 'Leave':gt 'city_industrial', 'redlight'
 		end
 	else
 		act 'Comfort her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'

+ 94 - 272
locations/carF.qsrc

@@ -23,6 +23,7 @@ $enddrive = {
 	if cardrive = 24:gt 'pav_commercial'
 	if cardrive = 25:gt 'city_island'
 	if cardrive = 26:gt 'pav_industrial'
+	if cardrive = 27:gt 'city_industrial', 'redlight'
 }
 
 if $ARGS[0] = 'start':
@@ -42,7 +43,7 @@ if $ARGS[0] = 'start':
 	act 'Move away from the car':dynamic $enddrive
 
 	if kanistra > 0:
-		'In the trunk there is <<kanistra>> canister/s of gasoline. Each canister contains 5 liters of gasoline.'
+		'In the trunk there ' + iif(kanistra = 1, 'is 1 cannister', 'are <<kanistra>> canisters') + ' of gasoline. Each canister contains 5 liters of gasoline.'
 
 		if benz <= 45:
 			act 'Pour gasoline into the tank':
@@ -50,7 +51,7 @@ if $ARGS[0] = 'start':
 				menu_off = 1
 				benz += 5
 				kanistra -= 1
-				'You emptied the canister of gasoline into the tank.'
+				'You empty the canister of gasoline into the tank.'
 
 				act 'Move away':gt 'carF', 'start'
 			end
@@ -69,12 +70,12 @@ if $ARGS[0] = 'salon':
 	gs 'stat'
 	'<center><b><<$car>></b></center>'
 	'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon<<car>>.jpg"></center>'
-	'Gasoline - <<benz>> liters, the fuel tank has a capacity of 40 liters.'
+	'Gasoline - <<benz>> ' + iif(benz = 1, 'liter', 'liters') + ', the fuel tank has a capacity of 40 liters.'
 
 	if teh <= 0:teh = 0 & wrek = 1
 	if teh <= 0 or wrek = 1:$teh = 'The car is in need of repairs and won''t start.'
 	if teh >= tehcar * 75 / 100 and wrek = 0:$teh = 'The car is in excellent condition.'
-	if teh < tehcar * 75 / 100 and teh >= tehcar * 50 / 100 and wrek = 0:$teh = 'While driving, you occasionally hear some troubling noises'
+	if teh < tehcar * 75 / 100 and teh >= tehcar * 50 / 100 and wrek = 0:$teh = 'While driving, you occasionally hear some troubling noises.'
 	if teh < tehcar * 50 / 100 and teh >= tehcar * 25 / 100 and wrek = 0:$teh = 'The car seems broken and barely drives.'
 	if teh < tehcar * 25 / 100 and wrek = 0:$teh = 'How this car still runs is a mystery, even to its designers.'
 
@@ -102,47 +103,38 @@ if $ARGS[0] = 'salon':
 	if cardrive = 24:'Through the windshield, you can see Pavlovsk''s commercial region.'
 	if cardrive = 25:'You cross one of the bridges that leads to the island.'
 	if cardrive = 26:'Through the windshield, you can see Pavlovsk''s industrial region.'
+	if cardrive = 27:'Through the windshield, you see St. Petersburg''s red light district.'
 
 	if prava = 0:'You don''t have a driver''s license.'
 
 	act 'Get out of the car':dynamic $enddrive
 
 	if benz > 0 and wrek = 0 and prava > 0:
-		if teh >= tehcar * 75 / 100 and wrek = 0:
-			wrekrand = rand(0, 1000)
-
-			if wrekrand = 1000:wrek = 1
-		elseif teh < tehcar * 75 / 100 and teh >= tehcar * 50/100 and wrek = 0:
-			wrekrand = rand(0, 100)
-
-			if wrekrand = 100:wrek = 1
-		elseif teh < tehcar * 50 / 100 and teh >= tehcar * 25 / 100 and wrek = 0:
-			wrekrand = rand(0, 100)
-
-			if wrekrand >= 80:wrek = 1
-		elseif teh < tehcar * 25 / 100 and wrek = 0:
-			wrekrand = rand(0, 100)
+		if teh >= tehcar * 75 / 100:
+			if rand(0, 1000) = 1000:wrek = 1
+		elseif teh >= tehcar * 50 / 100:
+			if rand(0, 100) = 100:wrek = 1
+		elseif teh >= tehcar * 25 / 100:
+			if rand(0, 100) >= 80:wrek = 1
+		else
+			if rand(0, 100) >= 40:wrek = 1
+		end
 
-			if wrekrand >= 40:wrek = 1
-		elseif wrek = 1:
+		if wrek = 1:
 			'Something clatters loudly, and the engine stalls.'
 
 			act 'Fuck':gt 'carF', 'salon'
-		end
-
-		if alko > 0:
-			dpsrand = rand(0, 100)
-
-			if dpsrand <= alko:
-				'A policeman stops you, he looks at your condition and requests you breathe into a tube. You breathe and a red light brightens up on the instrument panel.'
-				'The officer snorts, and writes something down. He hands you a slip of paper with the number 50,000 on it'
+		else
+			if alko > 0 and rand(0, 100) <= alko:
+				'A policeman stops you. He looks at your condition and requests you breathe into a tube. You breathe, and a red light brightens up on the instrument panel.'
+				'The officer snorts and writes something down. He hands you a slip of paper with the number 50,000 on it'
 				'"Or I can write a report. But you will get a permanent record for driving drunk."'
 
 				if money >= 50000:
 					act 'Bribe him (50,000 <b>₽</b>)':
 						cla
 						money = money - 50000
-						'You pay and the policeman warns you that you can not keep driving in your drunken state.'
+						'You pay, and the policeman warns you that you can not keep driving in your drunken state.'
 
 						act 'In the salon':gt 'carF', 'salon'
 					end
@@ -151,74 +143,63 @@ if $ARGS[0] = 'salon':
 				act 'Come on, this is within the law':
 					cla
 					prava = 0
-					'"I can take your license, for not driving sober."'
+					'"I can take your license for not driving sober."'
 
 					act 'In the salon':gt 'carF', 'salon'
 				end
-
-				exit
-			end
-		elseif alko >= 10:
-			avarand = rand(0, 100)
-
-			if avarand >= 50:
+			elseif alko >= 10 and rand(0, 100) >= 50:
 				teh = teh/2
 				wrek = 1
-				'Driving drunken, you crash into a tree and wreck your car.'
+				'Driving drunk, you crash into a tree and wreck your car.'
 
 				act 'In the salon':gt 'carF', 'salon'
-
-				exit
-			end
-		end
-
-		if wrek = 0:
-
-			if (cardrive = 22 and nroad >= 18) or cardrive = 14 or cardrive = 20 or cardrive = 21 or cardrive = 24 or cardrive = 26:
-				car_town = 0
-				act 'Go to local destination': gs 'carF', 'pav'
-				act 'Go to the city':
-					minut += 65
-					*nl
-					'You drive for more than an hour on the highway before you get to the city.'
-					gs 'carF', 'city'
-				end
-				act 'Go to another destination':
-					minut += 30
-					*nl
-					'You drive out of Pavlovsk.'
-					gs 'carF', 'other'
-				end
-			elseif cardrive <= 11 or cardrive = 25:
-				car_town = 1
-				act 'Go to another city destination': gs 'carF', 'city'
-				act 'Go to Pavlosvsk':
-					minut += 65
-					*nl
-					'You drive for more than an hour on the highway before you get to the town of Pavlovsk.'
-					gs 'carF', 'pav'
-				end
-				act 'Go to another destination':
-					minut += 30
-					*nl
-					'You drive out of the city.'
-					gs 'carF', 'other'
-				end
 			else
-				car_town = 2
-				act 'Go to a city destination':
-					minut += 30
-					*nl
-					'You drive for half an hour on the highway before you get to the city.'
-					gs 'carF', 'city'
-				end
-				act 'Go to a Pavlosvsk destination':
-					minut += 30
-					*nl
-					'You drive for half an hour on the highway before you get to the town of Pavlovsk.'
-					gs 'carF', 'pav'
+				if (cardrive = 22 and nroad >= 18) or cardrive = 14 or cardrive = 20 or cardrive = 21 or cardrive = 24 or cardrive = 26:
+					car_town = 0
+					act 'Go to local destination': gs 'carF', 'pav'
+					act 'Go to the city':
+						minut += 65
+						*nl
+						'You drive for more than an hour on the highway before you get to the city.'
+						gs 'carF', 'city'
+					end
+					act 'Go to another destination':
+						minut += 30
+						*nl
+						'You drive out of Pavlovsk.'
+						gs 'carF', 'other'
+					end
+				elseif cardrive <= 11 or cardrive = 19 or cardrive = 25 or cardrive = 27:
+					car_town = 1
+					act 'Go to another city destination': gs 'carF', 'city'
+					act 'Go to Pavlovsk':
+						minut += 65
+						*nl
+						'You drive for more than an hour on the highway before you get to the town of Pavlovsk.'
+						gs 'carF', 'pav'
+					end
+					act 'Go to another destination':
+						minut += 30
+						*nl
+						'You drive out of the city.'
+						gs 'carF', 'other'
+					end
+				else
+					car_town = 2
+					act 'Go to a city destination':
+						minut += 30
+						*nl
+						'You drive for half an hour on the highway before you get to the city.'
+						gs 'carF', 'city'
+					end
+					act 'Go to a Pavlovsk destination':
+						minut += 30
+						*nl
+						'You drive for half an hour on the highway before you get to the town of Pavlovsk.'
+						gs 'carF', 'pav'
+					end
+					act 'Go to another destination': gs 'carF', 'other'
 				end
-				act 'Go to another destination': gs 'carF', 'other'
 			end
 		end
 	end
@@ -317,195 +298,36 @@ end
 
 if $ARGS[0] = 'pav':
 	cla
-	if cardrive ! 26:
-		act 'Go to Pavlovsk''s Industrial Region':
-			cla
-			minut += 5
-			benz -= 1
-			teh -= rand(1, 3)
-			cardrive = 26
-			'5 minutes later, you reach your destination.'
-
-			dynamic $enddrive
-		end
-	end
-
-	if cardrive ! 20:
-		act 'Go to Pavlovsk''s Residential Area':
-			cla
-			minut += 5
-			benz -= 1
-			teh -= rand(1, 3)
-			cardrive = 20
-			'5 minutes later, you reach your destination.'
-
-			dynamic $enddrive
-		end
-	end
-
-	if cardrive ! 24:
-		act 'Go to Pavlovsk''s Commercial Region':
-			cla
-			minut += 5
-			benz -= 1
-			teh -= rand(1, 3)
-			cardrive = 24
-			'5 minutes later, you reach your destination.'
-
-			dynamic $enddrive
-		end
-	end
-
-	if cardrive ! 14:
-		act 'Go to Old Town district of Pavlovsk':
-			cla
-			benz -= 1
-			teh -= rand(2, 5)
-			cardrive = 14
-			minut += 5
-			'5 minutes later, you reach Old Town district of Pavlovsk.'
-
-			dynamic $enddrive
-		end
-	end
-
-	if cardrive ! 21:
-		act 'Go to the gas station':
-			cla
-			minut += 5
-			benz -= 1
-			teh -= rand(1, 3)
-			cardrive = 21
-			'5 minutes later, you reach your destination.'
-
-			dynamic $enddrive
-		end
-	end
+	if cardrive ! 26:act 'Go to Pavlovsk''s Industrial Region':gs 'carF', 'nearby', 26
+	if cardrive ! 20:act 'Go to Pavlovsk''s Residential Area':gs 'carF', 'nearby', 20
+	if cardrive ! 24:act 'Go to Pavlovsk''s Commercial Region':gs 'carF', 'nearby', 24
+	if cardrive ! 14:act 'Go to Old Town district of Pavlovsk':gs 'carF', 'nearby', 14
+	if cardrive ! 21:act 'Go to the gas station':gs 'carF', 'nearby', 21
 end
 
 if $ARGS[0] = 'city':
 	cla
-	if cardrive ! 3:
-		act 'Go to St. Petersburg''s Industrial Region':
-			cla
-			minut += 5
-			benz -= 1
-			teh -= rand(1, 3)
-			cardrive = 3
-			'You drive for more than an hour on the highway before you get to the city.'
-			dynamic $enddrive
-		end
-	end
-
-	if cardrive ! 1:
-		act 'Go to St. Petersburg''s residential area':
-			cla
-			minut += 5
-			benz -= 1
-			teh -= rand(1, 3)
-			cardrive = 1
-			'You drive for more than an hour on the highway before you get to St. Petersburg''s residential area.'
-			dynamic $enddrive
-		end
-	end
-
-	if cardrive ! 2:
-		act 'Go to St. Petersburg city center':
-			cla
-			minut += 5
-			benz -= 1
-			teh -= rand(1, 3)
-			cardrive = 2
-			'You drive for more than an hour on the highway before you get to St. Petersburg city center.'
-			dynamic $enddrive
-		end
-	end
-
-	if cardrive ! 19 and cardrive < 20:
-		act 'Go to the city train station':
-			cla
-			minut += 5
-			benz -= 1
-			teh -= rand(1, 3)
-			cardrive = 19
-
-			'5 minutes later, you arrive at your destination.'
-
-			dynamic $enddrive
-		end
-	end
-
-	if cardrive ! 4 and cardrive < 20:
-		act 'Go to the city lake':
-			cla
-			minut += 5
-			benz -= 1
-			teh -= rand(1, 3)
-			cardrive = 4
-			'5 minutes later, you arrive at your destination.'
-			dynamic $enddrive
-		end
-	end
-
-	if cardrive ! 5 and cardrive < 20:
-		act 'Go to the city park':
-			cla
-			minut += 5
-			benz -= 1
-			teh -= rand(1, 3)
-			cardrive = 5
-			'5 minutes later, you arrive at your destination.'
-			dynamic $enddrive
-		end
-	end
-
-	if cardrive ! 6 and cardrive < 20:
-		act 'Go to the gas station':
-			cla
-			minut += 5
-			benz -= 1
-			teh -= rand(1, 3)
-			cardrive = 6
-			'5 minutes later, you arrive at your destination.'
-			dynamic $enddrive
-		end
-	end
-
-	if cardrive ! 7 and cardrive < 20:
-		act 'Go to the auto repair shop':
-			cla
-			minut += 5
-			benz -= 1
-			teh -= rand(1, 3)
-			cardrive = 7
-			'5 minutes later, you arrive at your destination.'
-			dynamic $enddrive
-		end
-	end
-
-	if cardrive ! 8 and cardrive < 20:
-		act 'Go to the car dealership':
-			cla
-			minut += 5
-			benz -= 1
-			teh -= rand(1, 3)
-			cardrive = 8
-			'5 minutes later, you arrive at your destination.'
-			dynamic $enddrive
-		end
-	end
+	if cardrive ! 3:act 'Go to St. Petersburg''s Industrial Region':gs 'carF', 'nearby', 3
+	if cardrive ! 1:act 'Go to St. Petersburg''s residential area':gs 'carF', 'nearby', 1
+	if cardrive ! 2:act 'Go to St. Petersburg city center':gs 'carF', 'nearby', 2
+	if cardrive ! 19:act 'Go to the city train station':gs 'carF', 'nearby', 19
+	if cardrive ! 4:act 'Go to the city lake':gs 'carF', 'nearby', 4
+	if cardrive ! 5:act 'Go to the city park':gs 'carF', 'nearby', 5
+	if cardrive ! 6:act 'Go to the gas station':gs 'carF', 'nearby', 6
+	if cardrive ! 7 and func('autoservisF', 'is_open'):act 'Go to the auto repair shop':gs 'carF', 'nearby', 7
+	if cardrive ! 9 and func('autotraidF', 'is_open'):act 'Go to the car dealership':gs 'carF', 'nearby', 9
+	if cardrive ! 25:act 'Go to the island':gs 'carF', 'nearby', 25
+	if cardrive ! 27:act 'Go to the red light district':gs 'carF', 'nearby', 27
+end
 
-	if cardrive ! 25 and cardrive < 20:
-		act 'Go to the island':
-			cla
-			minut += 5
-			benz -= 1
-			teh -= rand(1, 3)
-			cardrive = 25
-			'5 minutes later, you arrive at your destination.'
-			dynamic $enddrive
-		end
-	end
+if $ARGS[0] = 'nearby':
+	cla
+	minut += 5
+	benz -= 1
+	teh -= rand(1, 3)
+	cardrive = ARGS[1]
+	'5 minutes later, you arrive at your destination.'
+	dynamic $enddrive
 end
 
 --- carF ---------------------------------

+ 49 - 662
locations/carF1.qsrc

@@ -1,703 +1,90 @@
 # carF1
 
 menu_off = 1
+$loc_arg = $ARGS[0]
+$loc = 'carF1'
+*clr & cla
+minut += 5
+gs'stat'
 
-if $ARGS[0] = 'car':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs 'stat'
+if $ARGS[0] = '':
 	'<center><b>VAZ 2107</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car.jpg"></center>'
-
-	act 'Leave':
-		cla
-
-		if cartraid = 1:gt 'autosalonF', 'start'
-		if cartraid = 2:gt 'autotraidF', 'manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon.jpg"></center>'
-
-		act 'Leave':gt 'carF1', 'car'
-	end
-end
-
-if $ARGS[0] = 'car2':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs 'stat'
+elseif $ARGS[0] = '2':
 	'<center><b>VAZ 2115</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car2.jpg"></center>'
-
-	act 'Leave':
-		cla
-
-		if cartraid = 1:gt 'autosalonF', 'start'
-		if cartraid = 2:gt 'autotraidF', 'manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon2.jpg"></center>'
-
-		act 'Leave':gt 'carF1', 'car2'
-	end
-end
-
-if $ARGS[0] = 'car3':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs 'stat'
+elseif $ARGS[0] = '3':
 	'<center><b>VAZ 2113</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car3.jpg"></center>'
-
-	act 'Leave':
-		cla
-
-		if cartraid = 1:gt 'autosalonF', 'start'
-		if cartraid = 2:gt 'autotraidF', 'manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon3.jpg"></center>'
-
-		act 'Leave':gt 'carF1', 'car3'
-	end
-end
-
-if $ARGS[0] = 'car4':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs 'stat'
+elseif $ARGS[0] = '4':
 	'<center><b>VAZ 2114</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car4.jpg"></center>'
-
-	act 'Leave':
-		cla
-
-		if cartraid = 1:gt 'autosalonF', 'start'
-		if cartraid = 2:gt 'autotraidF', 'manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon4.jpg"></center>'
-
-		act 'Leave':gt 'carF1', 'car4'
-	end
-end
-
-if $ARGS[0] = 'car5':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs 'stat'
+elseif $ARGS[0] = '5':
 	'<center><b>VAZ 2119</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car5.jpg"></center>'
-
-	act 'Leave':
-		cla
-
-		if cartraid = 1:gt 'autosalonF', 'start'
-		if cartraid = 2:gt 'autotraidF', 'manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon5.jpg"></center>'
-
-		act 'Leave':gt 'carF1', 'car5'
-	end
-end
-
-if $ARGS[0] = 'car6':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs 'stat'
-
+elseif $ARGS[0] = '6':
 	'<center><b>VAZ Kalina</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car6.jpg"></center>'
-
-	act 'Leave':
-		cla
-
-		if cartraid = 1:gt 'autosalonF', 'start'
-		if cartraid = 2:gt 'autotraidF', 'manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon6.jpg"></center>'
-
-		act 'Leave':gt 'carF1', 'car6'
-	end
-end
-
-if $ARGS[0] = 'car7':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs 'stat'
+elseif $ARGS[0] = '7':
 	'<center><b>WHA PRIORA</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car7.jpg"></center>'
-
-	act 'Leave':
-		cla
-
-		if cartraid = 1:gt 'autosalonF', 'start'
-		if cartraid = 2:gt 'autotraidF', 'manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon7.jpg"></center>'
-
-		act 'Leave':gt 'carF1', 'car7'
-	end
-end
-
-if $ARGS[0] = 'car8':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs 'stat'
+elseif $ARGS[0] = '8':
 	'<center><b>Chevrolet Niva</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car8.jpg"></center>'
-
-	act 'Leave':
-		cla
-
-		if cartraid = 1:gt 'autosalonF', 'start'
-		if cartraid = 2:gt 'autotraidF', 'manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon8.jpg"></center>'
-
-		act 'Leave':gt 'carF1', 'car8'
-	end
-end
-
-if $ARGS[0] = 'car9':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs 'stat'
+elseif $ARGS[0] = '9':
 	'<center><b>UAZ HUNTER</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car9.jpg"></center>'
-
-	act 'Leave':
-		cla
-
-		if cartraid = 1:gt 'autosalonF', 'start'
-		if cartraid = 2:gt 'autotraidF', 'manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon9.jpg"></center>'
-
-		act 'Leave':gt 'carF1', 'car9'
-	end
-end
-
-if $ARGS[0] = 'car10':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs 'stat'
+elseif $ARGS[0] = '10':
 	'<center><b>UAZ Patriot</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car10.jpg"></center>'
-
-		act 'Leave':
-		cla
-
-		if cartraid = 1:gt 'autosalonF', 'start'
-		if cartraid = 2:gt 'autotraidF', 'manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon10.jpg"></center>'
-
-		act 'Leave':gt 'carF1', 'car10'
-	end
-end
-
-if $ARGS[0] = 'car13':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs'stat'
-
+elseif $ARGS[0] = '13':
 	'<center><b>Ford Focus 2</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car13.jpg"></center>'
-
-	act 'Leave':
-		cla
-		if cartraid = 1:gt'autosalonF','start'
-		if cartraid = 2:gt'autotraidF','manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon13.jpg"></center>'
-
-		act 'Leave':gt 'carF1', 'car13'
-	end
-end
-
-if $ARGS[0] = 'car95':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs 'stat'
+elseif $ARGS[0] = '95':
 	'<center><b>Mitsubishi l200</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car95.jpg"></center>'
-
-	act 'Leave':
-		cla
-
-		if cartraid = 1:gt 'autosalonF', 'start'
-		if cartraid = 2:gt 'autotraidF', 'manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon95.jpg"></center>'
-
-		act 'Leave':gt 'carF1', 'car95'
-	end
-end
-
-if $ARGS[0] = 'car96':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs 'stat'
-
-
+elseif $ARGS[0] = '96':
 	'<center><b>Audi Q7</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car96.jpg"></center>'
-
-	act 'Leave':
-		cla
-
-		if cartraid = 1:gt 'autosalonF', 'start'
-		if cartraid = 2:gt 'autotraidF', 'manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon96.jpg"></center>'
-
-		act 'Leave':gt 'carF1', 'car96'
-	end
-end
-
-if $ARGS[0] = 'car97':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs 'stat'
+elseif $ARGS[0] = '97':
 	'<center><b>Cadillac Escalade</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car97.jpg"></center>'
-
-	act 'Leave':
-		cla
-
-		if cartraid = 1:gt 'autosalonF', 'start'
-		if cartraid = 2:gt 'autotraidF', 'manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon97.jpg"></center>'
-
-		act 'Leave':gt 'carF1', 'car97'
-	end
-end
-
-if $ARGS[0] = 'car98':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs 'stat'
+elseif $ARGS[0] = '98':
 	'<center><b>Porsche Cayenne</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car98.jpg"></center>'
-
-	act 'Leave':
-		cla
-
-		if cartraid = 1:gt 'autosalonF', 'start'
-		if cartraid = 2:gt 'autotraidF', 'manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon98.jpg"></center>'
-
-		act 'Leave':gt 'carF1', 'car98'
-	end
-end
-
-if $ARGS[0] = 'car99':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs 'stat'
+elseif $ARGS[0] = '99':
 	'<center><b>BMW X6</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car99.jpg"></center>'
-
-	act 'Leave':
-		cla
-
-		if cartraid = 1:gt 'autosalonF', 'start'
-		if cartraid = 2:gt 'autotraidF', 'manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon99.jpg"></center>'
-
-		act 'Leave':gt 'carF1', 'car99'
-	end
-end
-
-if $ARGS[0] = 'car100':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs 'stat'
+elseif $ARGS[0] = '100':
 	'<center><b>Mercedes-Benz S 600</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car100.jpg"></center>'
-
-	act 'Leave':
-		cla
-
-		if cartraid = 1:gt 'autosalonF', 'start'
-		if cartraid = 2:gt 'autotraidF', 'manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon100.jpg"></center>'
-
-		act 'Leave':gt 'carF1', 'car100'
-	end
-end
-
-if $ARGS[0] = 'car101':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs'stat'
-
+elseif $ARGS[0] = '101':
 	'<center><b>BMW Z4</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car101.jpg"></center>'
-
-	act 'Leave':
-		cla
-		if cartraid = 1:gt'autosalonF','start'
-		if cartraid = 2:gt'autotraidF','manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon101.jpg"></center>'
-
-		act 'Leave':gt'carF1','car101'
-	end
-end
-
-if $ARGS[0] = 'car102':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs'stat'
-
+elseif $ARGS[0] = '102':
 	'<center><b>Renault LOGAN</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car102.jpg"></center>'
-
-	act 'Leave':
-		cla
-		if cartraid = 1:gt'autosalonF','start'
-		if cartraid = 2:gt'autotraidF','manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon102.jpg"></center>'
-
-		act 'Leave':gt'carF1','car102'
-	end
-end
-
-if $ARGS[0] = 'car103':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs'stat'
-
-	'<center><b>Toyaboutta Corolla</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car103.jpg"></center>'
-
-	act 'Leave':
-		cla
-		if cartraid = 1:gt'autosalonF','start'
-		if cartraid = 2:gt'autotraidF','manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon103.jpg"></center>'
-
-		act 'Leave':gt'carF1','car103'
-	end
-end
-
-if $ARGS[0] = 'car104':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs'stat'
-
+elseif $ARGS[0] = '103':
+	'<center><b>Toyota Corolla</b></center>'
+elseif $ARGS[0] = '104':
 	'<center><b>Toyota Celica</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car104.jpg"></center>'
-
-	act 'Leave':
-		cla
-		if cartraid = 1:gt'autosalonF','start'
-		if cartraid = 2:gt'autotraidF','manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon104.jpg"></center>'
-
-		act 'Leave':gt'carF1','car104'
-	end
-end
-
-if $ARGS[0] = 'car105':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs'stat'
-
+elseif $ARGS[0] = '105':
 	'<center><b>Mazda 6</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car105.jpg"></center>'
-
-	act 'Leave':
-		cla
-		if cartraid = 1:gt'autosalonF','start'
-		if cartraid = 2:gt'autotraidF','manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon105.jpg"></center>'
-
-		act 'Leave':gt'carF1','car105'
-	end
-end
-
-if $ARGS[0] = 'car106':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs'stat'
-
+elseif $ARGS[0] = '106':
 	'<center><b>Mercedes-Benz E 212</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car106.jpg"></center>'
-
-	act 'Leave':
-		cla
-		if cartraid = 1:gt'autosalonF','start'
-		if cartraid = 2:gt'autotraidF','manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon106.jpg"></center>'
-
-		act 'Leave':gt'carF1','car106'
-	end
-end
-
-if $ARGS[0] = 'car107':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs'stat'
-
+elseif $ARGS[0] = '107':
 	'<center><b>BMW M5</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car107.jpg"></center>'
-
-	act 'Leave':
-		cla
-		if cartraid = 1:gt'autosalonF','start'
-		if cartraid = 2:gt'autotraidF','manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon107.jpg"></center>'
-
-		act 'Leave':gt'carF1','car107'
-	end
-end
-
-if $ARGS[0] = 'car108':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs'stat'
-
+elseif $ARGS[0] = '108':
 	'<center><b>Jaguar XKR-S</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car108.jpg"></center>'
-
-	act 'Leave':
-		cla
-		if cartraid = 1:gt'autosalonF','start'
-		if cartraid = 2:gt'autotraidF','manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon108.jpg"></center>'
-
-		act 'Leave':gt'carF1','car108'
-	end
-end
-
-if $ARGS[0] = 'car109':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs'stat'
-
+elseif $ARGS[0] = '109':
 	'<center><b>Audi A6</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car109.jpg"></center>'
-
-	act 'Leave':
-		cla
-		if cartraid = 1:gt'autosalonF','start'
-		if cartraid = 2:gt'autotraidF','manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon109.jpg"></center>'
-
-		act 'Leave':gt'carF1','car109'
-	end
-end
-
-if $ARGS[0] = 'car110':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs'stat'
-
+elseif $ARGS[0] = '110':
 	'<center><b>Ford Mondeo</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car110.jpg"></center>'
-
-	act 'Leave':
-		cla
-		if cartraid = 1:gt'autosalonF','start'
-		if cartraid = 2:gt'autotraidF','manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon110.jpg"></center>'
-
-		act 'Leave':gt'carF1','car110'
-	end
-end
-
-if $ARGS[0] = 'car111':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla	
-	minut += 5
-	gs'stat'
-
+elseif $ARGS[0] = '111':
 	'<center><b>Bentley Continental GT</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car111.jpg"></center>'
-
-	act 'Leave':
-		cla
-		if cartraid = 1:gt'autosalonF','start'
-		if cartraid = 2:gt'autotraidF','manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon111.jpg"></center>'
-
-		act 'Leave':gt'carF1','car111'
-	end
+elseif $ARGS[0] = '112':
+	'<center><b>Ferrari 458 Italia</b></center>'
+else
+	$carF1_num = 'invalid'
 end
 
-if $ARGS[0] = 'car112':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs'stat'
-
-	'<center><b>Ferrari 458 Italia</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car112.jpg"></center>'
+act 'Leave':
+	killvar '$carF1_num'
+	gt 'autosalonF','start'
+end
 
-	act 'Leave':
-		cla
-		if cartraid = 1:gt'autosalonF','start'
-		if cartraid = 2:gt'autotraidF','manager'
-	end
+if $carF1_num = 'invalid':
+	'It appears the car you selected does not actually exist.'
+else
+	$carF1_num = $ARGS[0]
+	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car<<$carF1_num>>.jpg"></center>'
 	
 	act 'Sit behind the wheel':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon112.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon<<$carF1_num>>.jpg"></center>'
 
-		act 'Leave':gt'carF1','car112'
+		act 'Leave':gt 'carF1', $carF1_num
 	end
 end
 

+ 24 - 6
locations/city_industrial.qsrc

@@ -48,7 +48,15 @@ if $ARGS[0] = '':
 
 	gs 'taxi'
 
-	if car > 0 and cardrive = 3 or (cardrive >= 6 and cardrive <= 9):'In the parking stands your <a href="exec:GS ''carF'', ''start''"><<$car>></a>.'
+	if car > 0:
+		if wrek = 0 and ((cardrive = 7 and func('autoservisF', 'is_open') = 0) or (cardrive = 9 and func('autotraidF', 'is_open') = 0)):
+			'It looks like the ' + iif(cardrive = 7, 'repair shop', 'car dealership') + ' moved your car outside before they closed.'
+			cardrive = 3
+		end
+		if cardrive = 3 or cardrive = 6 or (cardrive = 7 and func('autoservisF', 'is_open')) or (cardrive = 9 and func('autotraidF', 'is_open')) or cardrive = 27:
+			'In the parking stands your <a href="exec:' + iif(cardrive = 3, '', 'minut += 5 & ') + 'gs ''carF'', ''start''"><<$car>></a>.'
+		end
+	end
 
 	'The town''s <a href="exec:minut += 60 & gt ''city_park'', ''start''">central park</a> is a one hour walk from here.'
 
@@ -75,15 +83,15 @@ if $ARGS[0] = '':
 	else
 		'The metro station is within a 5 minute walk from here. The metro system is closed between midnight and 05:00.'
 	end
-	if hour >= 9 and hour < 18 and week > 1:
+	if func('autotraidF', 'is_open'):
 		'A <a href="exec: minut += 5 & gt ''autotraidF'', ''start''">car dealership</a> is nearby.'
 	else
-		'A car dealership is nearby'+iif(week = 1, ', but it''s closed on Mondays.', '. It''s currently closed and will open between 09:00 and 18:00.')
+		'A car dealership is nearby' + iif(week = 1, ', but it''s closed on Mondays.', '. It''s currently closed and will open between 09:00 and 18:00.') + iif(car > 0 and cardrive = 9, ' Your <<$car>> is currently locked inside.', '')
 	end
-	if hour >= 9 and hour <= 20 and week < 7:
+	if func('autoservisF', 'is_open'):
 		'Next to the car dealership is a <a href="exec: minut += 5 & gt ''autoservisF'', ''start''">repair shop</a>.'
 	else
-		'Next to the car dealership is a repair shop.'+ iif(week = 7, 'It''s closed on Sundays.', 'It will be open between 09:00 and 20:00.')
+		'Next to the car dealership is a repair shop.' + iif(week = 7, 'It''s closed on Sundays.', 'It will be open between 09:00 and 20:00.') + iif(car > 0 and cardrive = 7, ' Your <<$car>> is currently locked inside.', '')
 	end
 	if hour >= 9 and hour < 17 and week < 6:
 		'The <a href="exec: minut += 5 & gt ''dk'', ''start''">community centre</a> is currently open.'
@@ -158,7 +166,7 @@ if $ARGS[0] = 'redlight':
 	else
 		'A shop that sells sex toys. It is currently closed and will open at 11:00.'
 	end
-	if bordel > 0 and (hour >= 20 or hour <= 3):'Inside the courtyard is the entrance to the <a href="exec:gt ''bordel''">brothel</a>.'
+	if bordel > 0 and func('bordel', 'is_open'):'Inside the courtyard is the entrance to the <a href="exec:gt ''bordel''">brothel</a>.'
 
 	act 'Return to the Industrial Region (0:05)': minut += 5 & gt 'city_industrial'
 
@@ -166,6 +174,16 @@ if $ARGS[0] = 'redlight':
 	
 	gs 'taxi'
 
+	if car > 0:
+		if wrek = 0 and ((cardrive = 7 and func('autoservisF', 'is_open') = 0) or (cardrive = 9 and func('autotraidF', 'is_open') = 0)):
+			'It looks like the ' + iif(cardrive = 7, 'repair shop', 'car dealership') + ' moved your car outside before they closed.'
+			cardrive = 3
+		end
+		if cardrive = 3 or cardrive = 6 or (cardrive = 7 and func('autoservisF', 'is_open')) or (cardrive = 9 and func('autotraidF', 'is_open')) or cardrive = 27:
+			'In the parking stands your <a href="exec:' + iif(cardrive = 27, '', 'minut += 5 & ') + 'gs ''carF'', ''start''"><<$car>></a>.'
+		end
+	end
+
 	if hour >= 20 or hour <= 4:
 		*nl
 		'There are prostitutes working in places near here.'

+ 16 - 16
locations/gameover.qsrc

@@ -11,54 +11,54 @@ gs 'stat'
 
 if over = 1:
 	'<center><img <<$set_imgh>> src="images/system/gameover/deadgirl.jpg"></center>'
-	'You are dragged out by the morgue attendants, the pathologist noted that you died from an unknown cause. Soon your body was handed over to your parents...'
+	'You are dragged out by the morgue attendants. The pathologist notes that you died from an unknown cause. Soon, your body is handed over to your parents...'
 elseif over = 2:
 	'<center><img <<$set_imgh>> src="images/system/gameover/over.jpg"></center>'
 	if StoryLine = 0 and ntstart = 0:
-		'You went mad, and started running around town naked screaming, "I am a man!". The police were quickly alerted, and you were taken to a mental hospital. There you were put in a straitjacket then placed in a room with soft walls. You spent the rest of your days in happy delusions about your family, and being a man again. But the delusions never became reality.'
+		'You go mad and start running around town naked screaming, "I am a man!". The police are quickly alerted, and you are taken to a mental hospital. There, you are put in a straitjacket then placed in a room with soft walls. You spend the rest of your days in happy delusions about your family and being a man again, but the delusions never became reality.'
 		*nl
 		'Hint:'
-		'When your mood is low, your mind weakens and finally breaks. Don''t forget, it''s difficult for a normal man to come to terms with the fact that he is now a woman. In order to keep your mood and psyche at an acceptable level, make sure you are healthy, increase it by watching TV, and visiting a psychotherapist.'
+		'When your mood is low, your mind weakens and finally breaks. Don''t forget, it''s difficult for a normal man to come to terms with the fact that he is now a woman. In order to keep your mood and psyche at an acceptable level, make sure you are healthy, increase it by watching TV and visiting a psychotherapist.'
 	else
-		'You went mad, and started to run around town naked screaming, "I am THE PLAYER!". The police were quickly alerted, and you were arrested. Your mother could only send you to a mental hospital, hoping you''d recover. There you were put in a straitjacket then placed in a room with soft walls. You spent the rest of your days in happy delusions about your family. You can''t help but wonder, how different your life would have been, if you did not follow the whisper from the twisted mouse clicker?'
+		'You go mad and start to run around town naked screaming, "I am THE PLAYER!". The police are quickly alerted, and you are arrested. Your mother can only send you to a mental hospital, hoping you''ll recover. There you are put in a straitjacket then placed in a room with soft walls. You spend the rest of your days in happy delusions about your family. You can''t help but wonder how different your life would have been if you did not follow the whisper from the twisted mouse clicker?'
 		*nl
 		'Hint:'
 		'When your mood is low, your mind weakens and finally breaks. In order to keep your mood and psyche at an acceptable level, make sure you are healthy, increase it by watching TV or visiting the psychotherapist.'
 	end
 elseif over = 3:
 	'<center><img <<$set_imgh>> src="images/system/gameover/deadgirl.jpg"></center>'
-	'You have died of starvation. A stupid way to go, but apparently it''s one of the symptoms of anorexia.'
+	'You die of starvation. A stupid way to go, but apparently it''s one of the symptoms of anorexia.'
 elseif over = 4:
 	'<center><img <<$set_imgh>> src="images/system/gameover/birth.jpg"></center>'
-	'You died from complications during childbirth.'
+	'You die from complications during childbirth.'
 elseif over = 5:
 	'<center><img <<$set_imgh>> src="images/system/gameover/toilet.jpg"></center>'
-	'You tried to run, but immediately found yourself in a strange place surrounded by walls with obscene graffiti, you couldn''t move even if you tried. When suddenly, the door opened and some fat guy came in. He undid his pants and turned his back to you, his ass hovering in the air just above you. Then you realized, the witch kept her promise and turned you into a toilet at the station.'
-	'So you spent the rest of your days swallowing shit, until 50 years later, the train station is in need of repair, and you are just broken up, taken out and thrown in a landfill.'
+	'You try to run, but immediately find yourself in a strange place surrounded by walls with obscene graffiti. you couldn''t move even if you tried. Suddenly, the door opens and some fat guy comes in. He undoes his pants and turns his back to you, his ass hovering in the air just above you. Then you realize, the witch kept her promise and turned you into a toilet at the station.'
+	'So you spend the rest of your days swallowing shit, until 50 years later when the train station is in need of repair and you are just broken up, taken out and thrown in a landfill.'
 elseif over = 6:
 	'<center><img <<$set_imgh>> src="images/system/gameover/stab.jpg"></center>'
-	'You suddenly feel a sharp piercing pain in your abdomen, then another, and another. "Greetings to you, from the boys" says a shadowy figure, you look down as he moves away. You realize that you are standing in a puddle of your own blood, with multiple stab wounds in your stomach. The last thing you saw was the ground rushing towards you.'
+	'You suddenly feel a sharp piercing pain in your abdomen, then another, and another. "Greetings to you, from the boys," says a shadowy figure. You look down as he moves away. You realize that you are standing in a puddle of your own blood, with multiple stab wounds in your stomach. The last thing you see is the ground rushing towards you.'
 elseif over = 7:
 	'<center><img <<$set_imgh>> src="images/system/gameover/deadgirl.jpg"></center>'
-	'The last thing you saw was a police baton, flying at your face. You were beaten to death, and your early demise was written up as an accident. You are dragged out by the morgue attendants, the pathologist noted that you died from a blow to the head. Soon your body was handed over to your parents...'
+	'The last thing you see is a police baton flying at your face. You are beaten to death, and your early demise wi written up as an accident. You are dragged out by the morgue attendants, and the pathologist notes that you died from a blow to the head. Soon, your body is handed over to your parents...'
 elseif over = 8:
 	'<center><img <<$set_imgh>> src="images/system/gameover/crackwhore8.jpg"></center>'
-	'"At some point you question your life decisions." You are trying to understand why you made the choices you did, while your mouth is as yet another explosion of cum fills it. Without finding an answer, you swallow everything like you normally do and drift back into your drug hazed existence.'
+	'"At some point, you question your life decisions." You try to understand why you made the choices you did as yet another explosion of cum fills your mouth. Without finding an answer, you swallow everything like you normally do and drift back into your drug hazed existence.'
 elseif over = 9:
 	'<center><img <<$set_imgh>> src="images/system/gameover/overdose.jpg"></center>'
-	'Your last moments where those of bliss, your mind was so hazed by the drugs you didn''t even know you were dying. You body was found surrounded by the drugs that had ended your life.'
+	'Your last moments are those of bliss, your mind is so hazed by the drugs you don''t even know you are dying. You body is found surrounded by the drugs that ended your life.'
 elseif over = 10:
 	'<center><img <<$set_imgh>> src="images/system/gameover/over10.jpg"></center>'
-	'You fell into a quagmire while trying to find a way out of the swamp, it sucked you down deeper, and deeper. The blue sky through the tree tops is the last thing you see before marsh muck closes over you forever.'
+	'You fall into a quagmire while trying to find a way out of the swamp. It sucks you down deeper, and deeper. The blue sky through the tree tops is the last thing you see before marsh muck closes over you forever.'
 elseif over = 11:
 	'<center><img <<$set_imgh>> src="images/system/gameover/over11.jpg"></center>'
-	'Apparently you learned nothing from when your mother used to read you; the tale of Little Red Riding Hood. Otherwise you might not have gone into the forest at night alone. But you can at least be a cautionary tale the locals tell, and of course be food for the wolf.'
+	'Apparently, you learned nothing from when your mother used to read you the tale of Little Red Riding Hood. Otherwise, you might not have gone into the forest at night alone. But you can at least be a cautionary tale the locals tell, and of course be food for the wolf.'
 elseif over = 12:
 	'<center><img <<$set_imgh>> src="images/system/gameover/over12.jpg"></center>'
-	'Your body was found a few months later by some hunters, no one ever found out what happened to you.'
+	'Your body is found a few months later by some hunters. No one ever finds out what happened to you.'
 elseif over = 13:
    '<center><img <<$set_imgh>> src="images/system/gameover/fade.jpg"></center>'
-   'As the procedure continues, you feel a strange sensation. As if someone punched a hole in your spirit. You lose focus on everything around you, and it felt like you were flying into the ether. You attempt to rally your magical energies, to plug the hole, but the hole in your spirit isn''t able to be blocked by spirit energy, and you just force more of yourself out of it. You can''t run from it, it eats you up from your center, leaving no energy remaining in the part that was once you. The last b t of you f des aw y, an  wha   as y   n     g r                                .'
+   'As the procedure continues, you feel a strange sensation, as if someone punched a hole in your spirit. You lose focus on everything around you, and it feels like you are flying into the ether. You attempt to rally your magical energies to plug the hole, but the hole in your spirit isn''t able to be blocked by spirit energy, and you just force more of yourself out of it. You can''t run from it, it eats you up from your center, leaving no energy remaining in the part that was once you. The last b t of you f des aw y, an  wha   as y   n     g r                                .'
    !! {"The last bit of you fades away, and what was you no longer has the ability to care anymore." The idea being there was no soul that went to the afterlife. Total death. So not even able to bring full understanding of what happened, because you are gone. Broodmare curse abortion death.}
 end
 act 'End?':gt 'gameover', 'endscreen'

+ 18 - 32
locations/metro.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = 'start':
 		'<center><b><font color="maroon">City Suburbs</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/platsuburb.jpg"></center>'
 	elseif $loc = 'city_island': 
-		'<center><b><font color="maroon">Vasilievsky Island</font></b></center>'
+		'<center><b><font color="maroon">Vasilyevsky Island</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/platisland.jpg"></center>'
 	end
 
@@ -82,7 +82,7 @@ if $ARGS[0] = 'start':
 		end
 
 		if $loc ! 'city_island':
-			act 'Go to the <b>Vasilievsky Island</b> (16 <b>₽</b>)':
+			act 'Go to the <b>Vasilyevsky Island</b> (16 <b>₽</b>)':
 				$loc = 'city_island'
 				$loc_arg = ''
 				money -= 16
@@ -91,12 +91,12 @@ if $ARGS[0] = 'start':
 			end
 		end
 	else
-	'You don''t have enough money to pay for the metro.'
+		'You don''t have enough money to pay for the metro.'
 	end
 	
 	if pusher = 1 and dealer = 0:
 		dealer = 1
-		'You see a tall, emaciated man leaning against the wall next to tracks, looking very shady.<br>He notices you looking and beckons you to come closer.'
+		'You see a tall, emaciated man leaning against the wall next to the tracks, looking very shady.<br>He notices you looking and beckons you to come closer.'
 		act 'Talk to the man':gt 'metro', 'dealer'
 	elseif dealer ! 0:
 		'You see the dealer lurking around the station.'
@@ -115,46 +115,34 @@ if $ARGS[0] = 'vagon':
 	'<center><b><font color="maroon">Metro car</font></b></center>'
 	if hour < 7 or hour >=22:
 		if rand(0, 100) >= 70:gt 'metro_events', 'frot'
-		if rand(0,1) = 0:
-			metro_busy = 0
-		else
-			metro_busy = 1
-		end
+		metro_busy = rand(0,1)
 	elseif (hour >= 9 and hour < 16) or (hour >= 18 and hour < 22):
 		if rand(0, 100) >= 80:gt 'metro_events', 'frot'
-		if rand(0,1) = 0:
-			metro_busy = 1
-		else
-			metro_busy = 2
-		end
+		metro_busy = rand(1,2)
 	else
 		if rand(0, 100) >= 90:gt 'metro_events', 'frot'
-		if rand(0,1) = 0:
-			metro_busy = 2
-		else
-			metro_busy = 3
-		end
+		metro_busy = rand(2,3)
 	end
 
 	if metro_busy = 0:
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/metroempty.jpg"></center>'
-		'The car is almost completely empty, one or two other passengers are in the car with you. It seems a bit odd and a little creepy seeing the car this empty. You have practically the whole car to yourself and pick the cleanest spot to sit.'
+		'The car is almost completely empty. One or two other passengers are in the car with you. It seems a bit odd and a little creepy seeing the car this empty. You have practically the whole car to yourself and pick the cleanest spot to sit.'
 	elseif metro_busy = 1:
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/metro.jpg"></center>'
-		'The car is mostly empty, leaving you a choice of seats. You easily find a place for yourself, leaving you plenty of room to get comfortable. The few other people on the car, mind their own business, leaving you to your own thoughts.'
+		'The car is mostly empty, leaving you a choice of seats. You easily find a place for yourself, leaving you plenty of room to get comfortable. The few other people on the car mind their own business, leaving you to your own thoughts.'
 	elseif metro_busy = 2:
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/metrofull<<rand(1,5)>>.jpg"></center>'
-		'The car is full of people, all of the seats are taken, but only a few people are forced to stand. You easily find a place for yourself, at least it is not packed, leaving you plenty of room to get comfortable.'
+		'The car is full of people. All of the seats are taken, but only a few people are forced to stand. At least it is not packed. You easily find a place for yourself, leaving you plenty of room to get comfortable.'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/metropacked.jpg"></center>'
-		'The car is packed with people, most of them are forced to stand, as there is not enough seats. It is so tightly packed that people are crammed tight up against each other either in the seats or standing up. You manage to squeeze yourself in among the people, you can feel other bodies pressed up tightly against yours, it is very uncomfortable and hot.'
+		'The car is packed with people. Most of them are forced to stand, as there are not enough seats. It is so tightly packed that people are crammed tight up against each other either in the seats or standing up. You manage to squeeze yourself in among the people. You can feel other bodies pressed up tightly against yours. It is very uncomfortable and hot.'
 	end
 
 	if sosedQW >= 1:
 		if hour = 7 or hour = 15:
 			sosedMetroRand = rand(0, 100)
 
-			if sosedMetroRand >= 60 and sosedMetroDay ! daystart:'You notice your neighbor <a href="exec:gt ''TimofeiMetro''">Timofei</a>, in the metro car.'
+			if sosedMetroRand >= 60 and sosedMetroDay ! daystart:'You notice your neighbor <a href="exec:gt ''TimofeiMetro''">Timofei</a> in the metro car.'
 		end
 	end
 
@@ -182,7 +170,7 @@ if $ARGS[0] = 'shop':
 	menu_off = 1
 	gs 'stat'
 	'<b>What''s it gonna be?</b>'
-	'He shows you a small box filled with red and blue pills. There is about two dozen of each pill inside.'
+	'He shows you a small box filled with red and blue pills. There are about two dozen of each pill inside.'
 	act 'Leave':gt 'metro','start'
 	if money >= 1000:
 		'<a href="exec:money -= 1000 & mentats_have += 20 & gt ''metro'', ''shop''">Buy neuroboosters</a> 1000 <b>₽</b>'
@@ -197,7 +185,7 @@ if $ARGS[0] = 'shop':
 		'Buy steroids 500 <b>₽</b> (You do not have enough money)'
 	end
 	'Uses left: <<steroid_have>>'
-	'Paste tube with two pictures of a woman. In latter one she sports an enormous bust.'
+	'Paste tube with two pictures of a woman. In the latter one, she sports an enormous bust.'
 	if money >= 500:
 		'<a href="exec:money -= 500 & bcream_have += 5 & gt ''metro'', ''shop''">Buy breast cream</a> 500 <b>₽</b>'
 	else
@@ -205,7 +193,7 @@ if $ARGS[0] = 'shop':
 	end
 	'Uses left: <<bcream_have>>'
 	if MagikDostup = 0:
-		'Packet of pink chewing gums. There are 10 in one package.'
+		'Packet of pink chewing gum. There are 10 in one package.'
 		if money >= 200:
 			'<a href="exec:money -= 200 & aphrodisiac_have += 10 & gt ''metro'', ''shop''">Buy aphrodisiacs</a> 200 <b>₽</b>'
 		else
@@ -215,18 +203,16 @@ if $ARGS[0] = 'shop':
 	end
 	if money >= 250:
 		'Buy enough <a href="exec:money -= 250 & joint += 5 & gt ''metro'', ''shop''">weed</a> for 5 joints for 250 <b>₽</b>'
-	elseif money >= 500:
-		'Buy enough <a href="exec:money -= 250 & joint += 5 & gt ''metro'', ''shop''">weed</a> for 5 joints for 250 <b>₽</b>'
-		'Buy enough <a href="exec:money -= 500 & joint += 10 & gt ''metro'', ''shop''">weed</a> for 5 joints for 500 <b>₽</b>'
+		if money >= 500:'Buy enough <a href="exec:money -= 500 & joint += 10 & gt ''metro'', ''shop''">weed</a> for 10 joints for 500 <b>₽</b>'
 	else
-		'Buy a enough weed for 5 joints for 250 <b>₽</b> (You do not have enough money)'
+		'Buy enough weed for 5 joints for 250 <b>₽</b> (You do not have enough money)'
 	end
 end
 
 if $ARGS[0] = 'dealer':
 	*clr & cla
 	menu_off = 1
-	'He sizes you up with suspicion.<br><b>"Hey miss, saw you buying Lady in the park."</b> <br>He clears his throat and spits onto the tracks.<b> "That shit will mess you up."</b><br>He opens his coat and you flinch thinking he is going to flash you, but instead you see he is wearing a business suit beneath.<br>He gestures at numerous pockets lining insides of his coat. They are filled to bursting with various packages, pills and ampules.<br><b>"Here, my products are of a much better quality. You''ll have a great times and I guarantee they won''t kill you."</b>'
+	'He sizes you up with suspicion.<br><b>"Hey miss, saw you buying Lady in the park."</b> <br>He clears his throat and spits onto the tracks.<b> "That shit will mess you up."</b><br>He opens his coat, and you flinch thinking he is going to flash you, but instead you see he is wearing a business suit beneath.<br>He gestures at numerous pockets lining the insides of his coat. They are filled to bursting with various packages, pills and ampules.<br><b>"Here, my products are of a much better quality. You''ll have a great time, and I guarantee they won''t kill you."</b>'
 	act 'Continue':gt 'metro','shop'
 end
 

+ 15 - 15
locations/obroom.qsrc

@@ -17,30 +17,30 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	gs 'stat'
 	'<center><b>Your room</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/obroom.jpg"></center>'
-	'This is your room which you share with another girl named Vika Zhurova.'
-	'At the right of the entrance you find an old <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing).'
+	'This is your room which you share with another girl named Vika Kirilova.'
+	'At the right of the entrance, you find an old <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing).'
 	'There''s a <a href="exec:gt ''mirror'',''start''">mirror</a> hanging on the wall.'
 	'Your <a href="exec:gt ''bed'',''start''">bed</a> is positioned in one of the corners of the room.'
-	if komp = 1:'There''s a <a href="exec:gt ''Komp'',''start''">laptop</a> laying on your bed.'
+	if komp = 1:'There''s a <a href="exec:gt ''Komp'',''start''">laptop</a> lying on your bed.'
 	*nl
 	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 
 	gs 'exercise', 'start'
 	''
-	if hour > 14 and hour < 20 and npc_rel['A220']>=60 and birthday = day and birthmonth = month and vikaslut = 1 and bordel = 1 and slutty > 0 and b_vika_present_Day!day:
+	if hour > 14 and hour < func('bordel', 'open_hour'):
 		vika_sleep = 0
-		'<a href="exec:gt''Vika''">Vika</a> seems excited when she notices you, trying to hide a box behind her back.'
-	elseif hour > 14 and hour < 20:
-		vika_sleep = 0
-		'<a href="exec:gt''Vika''">Vika</a> is laying on her bed.'
-	end
-	if hour > 3 and hour < 8 and vikaslut = 0:
-		vika_sleep = 1
-		'<a href="exec:gt''Vika''">Vika</a> is sleeping in her bed after being out the whole night.'
-	end
-	if hour > 3 and hour < 8 and vikaslut = 1:
+		if npc_rel['A220'] >= 60 and birthday = day and birthmonth = month and vikaslut = 1 and b_vika_present_Day ! daystart:
+			'<a href="exec:gt''Vika''">Vika</a> seems excited when she notices you, trying to hide a box behind her back.'
+		else
+			'<a href="exec:gt''Vika''">Vika</a> is lying on her bed.'
+		end
+	elseif hour > func('bordel', 'close_hour') and hour < 8:
 		vika_sleep = 1
-		'<a href="exec:gt''Vika''">Vika</a> is sleeping in her bed after working hard in the brothel all night.'
+		if vikaslut = 0:
+			'<a href="exec:gt''Vika''">Vika</a> is sleeping in her bed after being out the whole night.'
+		elseif vikaslut = 1:
+			'<a href="exec:gt''Vika''">Vika</a> is sleeping in her bed after working hard in the brothel all night.'
+		end
 	end
 
 	act 'Walk out in the corridor':

+ 80 - 80
locations/spell.qsrc

@@ -185,7 +185,7 @@ if $ARGS[0] = 'regenerate':
 		killvar 'regenVal'
 		killvar 'regenArrIdx'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -194,7 +194,7 @@ if $ARGS[0] = 'painblock':
 		pain['killer'] = 1
 		'<b><font color = <<$SplTxtColGood>>>Your pain recedes into a dull throb.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -215,9 +215,9 @@ if $ARGS[0] = 'curedisease':
 		pain['vaginal'] += 10
 		! You do not feel good
 		pcs_mood -= 30
-		'<b><font color = <<$SplTxtColGood>>>You burst into a high fever.  You feel terrible, but you know you are now healthy.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>You burst into a high fever. You feel terrible, but you know you are now healthy.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -226,9 +226,9 @@ if $ARGS[0] = 'curewounds':
 		! Remove some pain
 		gs 'medical_din','healthTreatment'
 		gs 'medical_din','healthTreatment'
-		'<b><font color = <<$SplTxtColGood>>>You feel yourself coursing with life.  You feel better already.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>You feel yourself coursing with life. You feel better already.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -237,9 +237,9 @@ if $ARGS[0] = 'curewounds2':
 		! Remove all pain
 		killvar 'pain'
 		pcs_health = pcs_vital * 10 + pcs_stren * 5 + 1000
-		'<b><font color = <<$SplTxtColGood>>>You feel yourself coursing with life.  All pain is gone.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>You feel yourself coursing with life. All pain is gone.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -287,7 +287,7 @@ if $ARGS[0] = 'berserk':
 		end
 		'<b><font color = <<$SplTxtColGood>>>You feel a huge adrenalin surge. You begin looking for someone to battle.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 	killvar 'spellArrIdx'
 	killvar 'berserkCode'
@@ -305,7 +305,7 @@ if $ARGS[0] = 'shower':
 		pcs_breath = 1
 		'<b><font color = <<$SplTxtColGood>>>You feel clean and refreshed.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -319,9 +319,9 @@ if $ARGS[0] = 'glamour':
 		!	CompCode = 'pcs_apprncbase -= 150' Remove bonus
 		!	TickCode = ''  Do nothing
 		gs 'spellTimer', 'add', 'glamour', 120, 'pcs_apprncbase -= 150', ''
-		'<b><font color = <<$SplTxtColGood>>>You feel gorgeous.  People will love you.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>You feel gorgeous. People will love you.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -329,9 +329,9 @@ if $ARGS[0] = 'alterself':
 	if SuccessValue > 0:
 		! Stop Reputation accumulation.
 		!TODO
-		'<b><font color = <<$SplTxtColGood>>>Your feature change.  Your own mother wouldn''t recognize you.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>Your feature change. Your own mother wouldn''t recognize you.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -364,7 +364,7 @@ if $ARGS[0] = 'makeup':
 		killvar '$MakeupArg'
 		'<b><font color = <<$SplTxtColGood>>>makeup is applied to your face.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -409,7 +409,7 @@ if $ARGS[0] = 'cosmetica':
 
 		'<b><font color = <<$SplTxtColGood>>>You feel beautiful.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -423,7 +423,7 @@ if $ARGS[0] = 'fog':
 		dynamic $spellFunc['UpdateAttrib'], 'fog', $TargetType, TargetNumber, '+', 10 * SuccessValue
 		'<b><font color = <<$SplTxtColGood>>>A Fog materializes around, obscuring <<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> from enemies.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -435,7 +435,7 @@ if $ARGS[0] = 'clone':
 		dynamic $spellFunc['UpdateAttrib'], 'clone', $TargetType, TargetNumber, '-', 1
 		'<b><font color = <<$SplTxtColBad>>>The spell backfires! A <<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> clone disappears.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -445,19 +445,19 @@ if $ARGS[0] = 'stun':
 		dynamic $spellFunc['UpdateAttrib'], 'stun', $TargetType, TargetNumber, '+', rand(2,5)+ SuccessValue
 		'<b><font color = <<$SplTxtColGood>>><<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> is stunned.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
 if $ARGS[0] = 'weapon':
 	!{if SuccessValue > 0:
 		magweapbonus = weapbonus * 4 * SuccessValue
-		'<b><font color = <<$SplTxtColGood>>>Your Weapon now feels more powerful.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>Your weapon now feels more powerful.</font></b>'
 	elseif SuccessValue < 0:
 		magweapbonus = weapbonus * -1
 		'<b><font color = <<$SplTxtColBad>>>The spell backfires! Your weapon seems weaker.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 }
 	"weapon"
@@ -466,23 +466,23 @@ end
 if $ARGS[0] = 'wind':
 	if SuccessValue = 2:
 		dynamic $spellFunc['UpdateAttrib'], 'fog', $TargetType, TargetNumber, '=', 0
-		'<b><font color = <<$SplTxtColGood>>>A wind blows through the area eliminating the fog around <<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> from the battlefield.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>A wind blows through the area, eliminating the fog around <<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> from the battlefield.</font></b>'
 	elseif SuccessValue = 1:
 		dynamic $spellFunc['UpdateAttrib'], 'fog', $TargetType, TargetNumber, '=', 0
 		dynamic $spellFunc['UpdateAttrib'], 'fog', $CasterType, CasterNumber, '=', 0
-		'<b><font color = <<$SplTxtColGood>>>A wind blows through the area eliminating all fog on the battlefield.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>A wind blows through the area, eliminating all fog on the battlefield.</font></b>'
 	elseif SuccessValue = -1:
 		dynamic $spellFunc['UpdateAttrib'], 'fog', $CasterType, CasterNumber, '=', 0
-		'<b><font color = <<$SplTxtColBad>>>A wind blows through the area eliminating the fog around <<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> from the battlefield.</font></b>'
+		'<b><font color = <<$SplTxtColBad>>>A wind blows through the area, eliminating the fog around <<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> from the battlefield.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
 if $ARGS[0] = 'multiclone':
 	if SuccessValue > 0:
 		dynamic $spellFunc['UpdateAttrib'], 'clone', $TargetType, TargetNumber, '+', SuccessValue * 3
-		'<b><font color = <<$SplTxtColGood>>><<SuccessValue * 3>> clone<<iif(SuccessValue>1,"s","")>> of <<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> springs forth confusing the enemy.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>><<SuccessValue * 3>> clone<<iif(SuccessValue>1,"s","")>> of <<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> springs forth, confusing the enemy.</font></b>'
 	elseif SuccessValue < 0 and klon > 0:
 		if dyneval('result=<<$TargetType>>_clone[<<TargetNumber>>]') < 3:
 			dynamic $spellFunc['UpdateAttrib'], 'clone', $TargetType, TargetNumber, '=', 0
@@ -491,7 +491,7 @@ if $ARGS[0] = 'multiclone':
 		end
 		'<b><font color = <<$SplTxtColBad>>>The spell backfires! Some clones of <<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> disappear.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -500,7 +500,7 @@ if $ARGS[0] = 'energo':
 		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', SuccessValue * 100
 		'<b><font color = <<$SplTxtColGood>>>An energy shield materializes around <<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>>, granting protection from enemies.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -509,7 +509,7 @@ if $ARGS[0] = 'haste':
 		dynamic $spellFunc['UpdateAttrib'], 'init', $TargetType, TargetNumber, '+', SuccessValue * 120
 		'<b><font color = <<$SplTxtColGood>>><<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> feels mind and body race though a sluggish world.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -518,7 +518,7 @@ if $ARGS[0] = 'heal':
 		dynamic $spellFunc['UpdateAttrib'], 'health', $TargetType, TargetNumber, '+', SuccessValue * 400
 		'<b><font color = <<$SplTxtColGood>>><<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> surges with life, feeling much stronger.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -533,7 +533,7 @@ if $ARGS[0] = 'hand':
 		killvar 'TargetStrenDelta'
 		killvar 'TargetStrenBase'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -542,7 +542,7 @@ if $ARGS[0] = 'scaldingtouch':
 		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 100 * SuccessValue
 		'<b><font color = <<$SplTxtColGood>>>Flames spring from your hands.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -551,38 +551,38 @@ if $ARGS[0] = 'burninghands':
 		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 250 * SuccessValue
 		'<b><font color = <<$SplTxtColGood>>>A torrent of flames jets from your hands.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
 if $ARGS[0] = 'firebarrier':
 	if SuccessValue > 0:
 		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', SuccessValue * 200
-		'<b><font color = <<$SplTxtColGood>>>A flaming barrier has sprung up between you and your opponents.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>A flaming barrier springs up between you and your opponents.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
 if $ARGS[0] = 'firestorm':
 	if SuccessValue > 0:
 		dynamic $spellFunc['ApplyDamageToAll'], $TargetType, (200 * SuccessValue)
-		'<b><font color = <<$SplTxtColGood>>>Uncountable glowing embers steak down upon the foes of <<dyneval($spellFunc["GetCombatantName"], $CasterType, CasterNumber)>>.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>Uncountable glowing embers streak down upon the foes of <<dyneval($spellFunc["GetCombatantName"], $CasterType, CasterNumber)>>.</font></b>'
 	elseif SuccessValue < 0:
 		dynamic $spellFunc['ApplyDamageToAll'], $TargetType, 200
 		dynamic $spellFunc['ApplyDamageToAll'], $CasterType, 100
-		'<b><font color = <<$SplTxtColBad>>>The spell backfires! Uncountable glowing embers steak down upon the battlefield burning everyone.</font></b>'
+		'<b><font color = <<$SplTxtColBad>>>The spell backfires! Uncountable glowing embers streak down upon the battlefield, burning everyone.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
 if $ARGS[0] = 'flameshield':
 	if SuccessValue > 0:
 		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', SuccessValue * 250
-		'<b><font color = <<$SplTxtColGood>>>A Shield made of Flames interposes itself between <<dyneval($spellFunc["GetCombatantName"], $CasterType, CasterNumber)>> and the enemy.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>A Shield made of flames interposes itself between <<dyneval($spellFunc["GetCombatantName"], $CasterType, CasterNumber)>> and the enemy.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -594,19 +594,19 @@ if $ARGS[0] = 'shock':
 		gs 'fight', 'applyDamage', $CasterType, CasterNumber, 50
 		'<b><font color = <<$SplTxtColBad>>>The spell backfires! You manage to zap yourself with a static charge.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
 if $ARGS[0] = 'lightning':
 	if SuccessValue > 0:
 		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 200 * SuccessValue
-		'<b><font color = <<$SplTxtColGood>>>You shoot a lightning bolt from your hand zapping your opponent.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>You shoot a lightning bolt from your hand, zapping your opponent.</font></b>'
 	elseif SuccessValue < 0:
 		gs 'fight', 'applyDamage', $CasterType, CasterNumber, 100
 		'<b><font color = <<$SplTxtColBad>>>The spell backfires! You manage to zap yourself with lightning.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -615,7 +615,7 @@ if $ARGS[0] = 'electricbarrier':
 		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', SuccessValue * 250
 		'<b><font color = <<$SplTxtColGood>>>A wall of dancing lightning springs up around yourself.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -627,117 +627,117 @@ if $ARGS[0] = '1000birds':
 	elseif SuccessValue < 0:
 		dynamic $spellFunc['ApplyDamageToAll'], $TargetType, 100
 		dynamic $spellFunc['ApplyDamageToAll'], $CasterType, 100
-		'<b><font color = <<$SplTxtColBad>>>The spell backfires! Hundreds of small lightning bolts curl toward the battlefield shocking everyone.</font></b>'
+		'<b><font color = <<$SplTxtColBad>>>The spell backfires! Hundreds of small lightning bolts curl toward the battlefield, shocking everyone.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
 if $ARGS[0] = 'dancingsphere':
 	if SuccessValue > 0:
 		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', SuccessValue * 500
-		'<b><font color = <<$SplTxtColGood>>>A large field of lightning dances around you blocking attacks.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>A large field of lightning dances around you, blocking attacks.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
 if $ARGS[0] = 'quicksand':
 	if SuccessValue > 0:
 		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 100 * SuccessValue
-		'<b><font color = <<$SplTxtColGood>>>You have trapped your opponent in quicksand.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>You trap your opponent in quicksand.</font></b>'
 	elseif SuccessValue < 0:
 		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 100
 		gs 'fight', 'applyDamage', $CasterType, CasterNumber, 50
 		'<b><font color = <<$SplTxtColBad>>>The spell backfires! You are both trapped in quicksand.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
 if $ARGS[0] = 'earthshield':
 	if SuccessValue > 0:
 		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', SuccessValue * 100 + 250
-		'<b><font color = <<$SplTxtColGood>>>Tendrils of Earth rise to defend you.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>Tendrils of earth rise to defend you.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
 if $ARGS[0] = 'abyss':
 	if SuccessValue > 0:
 		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 250 * SuccessValue
-		'<b><font color = <<$SplTxtColGood>>>The Earth opens up beneath your opponents feet, slamming shut damaging him and depriving him of the ability to move.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>The Earth opens up beneath your opponent''s feet, slamming shut damaging him and depriving him of the ability to move.</font></b>'
 	elseif SuccessValue < 0:
 		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 250
 		gs 'fight', 'applyDamage', $CasterType, CasterNumber, 200
-		'<b><font color = <<$SplTxtColBad>>>The spell backfires! The Earth opens up beneath your opponents feet, slamming shut damaging him and depriving him of the ability to move.  You are also caught.</font></b>'
+		'<b><font color = <<$SplTxtColBad>>>The spell backfires! The Earth opens up beneath your opponent''s feet, slamming shut damaging him and depriving him of the ability to move. You are also caught.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
 if $ARGS[0] = 'earthguardian':
 	if SuccessValue > 0:
 		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', SuccessValue * 500
-		'<b><font color = <<$SplTxtColGood>>>The Earth itself comes alive defending you from attacks.  It draws from the power of the land to regenerate itself every round. You now have <<defence>> protection units.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>The Earth itself comes alive defending you from attacks. It draws from the power of the land to regenerate itself every round. You now have <<defence>> protection units.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
 if $ARGS[0] = 'sando':
 	if SuccessValue > 0:
 		gs 'fight', 'applyDamage', $TargetType, TargetNumber, (250 * SuccessValue)
-		'<b><font color = <<$SplTxtColGood>>>Two huge plates of earth colapse together crushing the enemy and depriving him of the ability to move.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>Two huge plates of earth collapse together, crushing the enemy and depriving him of the ability to move.</font></b>'
 	elseif SuccessValue < 0:
 		gs 'fight', 'applyDamage', $CasterType, CasterNumber, 50
-		'<b><font color = <<$SplTxtColBad>>>The spell backfires! Two huge plates of earth colapse together with crushing force, but the enemy is missed and you are instead caught.</font></b>'
+		'<b><font color = <<$SplTxtColBad>>>The spell backfires! Two huge plates of earth collapse together with crushing force, but the enemy is missed and you are instead caught.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
 if $ARGS[0] = 'windgust':
 	if SuccessValue > 0:
 		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 100 * SuccessValue
-		'<b><font color = <<$SplTxtColGood>>>You have created a gust of wind.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>You create a gust of wind.</font></b>'
 		if dyneval('result=<<$TargetType>>_clone[<<TargetNumber>>]') > 0:
 			dynamic $spellFunc['UpdateAttrib'], 'clone', $TargetType, TargetNumber, '=', 0
 			'<b><font color = <<$SplTxtColGood>>>Enemy clones are vaporized.</font></b>'
 		end
 		if dyneval('result=<<$TargetType>>_fog[<<TargetNumber>>]') > 0:
 			dynamic $spellFunc['UpdateAttrib'], 'fog', $TargetType, TargetNumber, '=', 0
-			'<b><font color = <<$SplTxtColGood>>>Enemy Fog is torn to shreds by the wind.</font></b>'
+			'<b><font color = <<$SplTxtColGood>>>Enemy fog is torn to shreds by the wind.</font></b>'
 		end
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
 if $ARGS[0] = 'pressure':
 	if SuccessValue > 0:
 		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 200 * SuccessValue
-		'<b><font color = <<$SplTxtColGood>>>You dramatically raised the air pressure.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>You dramatically raise the air pressure.</font></b>'
 		if dyneval('result=<<$TargetType>>_clone[<<TargetNumber>>]') > 0:
 			dynamic $spellFunc['UpdateAttrib'], 'clone', $TargetType, TargetNumber, '=', 0
 			'<b><font color = <<$SplTxtColGood>>>Enemy clones are vaporized.</font></b>'
 		end
 		if dyneval('result=<<$TargetType>>_fog[<<TargetNumber>>]') > 0:
 			dynamic $spellFunc['UpdateAttrib'], 'fog', $TargetType, TargetNumber, '=', 0
-			'<b><font color = <<$SplTxtColGood>>>Enemy Fog is torn to shreds by the wind.</font></b>'
+			'<b><font color = <<$SplTxtColGood>>>Enemy fog is torn to shreds by the wind.</font></b>'
 		end
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
 if $ARGS[0] = 'vacuum':
 	if SuccessValue > 0:
 		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', SuccessValue * 250
-		'<b><font color = <<$SplTxtColGood>>>A turbulent sphere of vacuum surrounds you blocking incoming attacks. You now have <<defence>> protection units.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>A turbulent sphere of vacuum surrounds you, blocking incoming attacks. You now have <<defence>> protection units.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -751,19 +751,19 @@ if $ARGS[0] = 'vacuumshells':
 		end
 		if dyneval('result=<<$TargetType>>_fog[<<TargetNumber>>]') > 0:
 			dynamic $spellFunc['UpdateAttrib'], 'fog', $TargetType, TargetNumber, '=', 0
-			'<b><font color = <<$SplTxtColGood>>>Enemy Fog is torn to shreds by the wind.</font></b>'
+			'<b><font color = <<$SplTxtColGood>>>Enemy fog is torn to shreds by the wind.</font></b>'
 		end
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
 if $ARGS[0] = 'devouringvacuum':
 	if SuccessValue > 0:
 		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '=', 0
-		'<b><font color = <<$SplTxtColGood>>>A devouring vacuum sucks away your enemys defenses.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>A devouring vacuum sucks away your enemy''s defenses.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -777,7 +777,7 @@ if $ARGS[0] = 'leechmana':
 		gs 'fight', 'applyDamage', $CasterType, CasterNumber, 50
 		'<b><font color = <<$SplTxtColBad>>>The spell backfires! Ouch!</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -787,9 +787,9 @@ if $ARGS[0] = 'flood':
 		'<b><font color = <<$SplTxtColGood>>>A surge of water rises towards your enemy.</font></b>'
 	elseif SuccessValue < 0:
 		gs 'fight', 'applyDamage', $CasterType, CasterNumber, 100
-		'<b><font color = <<$SplTxtColBad>>>The spell backfires! A surge of water rises towards your enemy, but missed and hits you.</font></b>'
+		'<b><font color = <<$SplTxtColBad>>>The spell backfires! A surge of water rises towards your enemy, but misses and hits you.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -798,33 +798,33 @@ if $ARGS[0] = 'blister':
 		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', 500
 		'<b><font color = <<$SplTxtColGood>>>A protective sphere of water surrounds you.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
 if $ARGS[0] = 'sharkrockets':
 	if SuccessValue > 0:
 		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 150 * SuccessValue
-		'<b><font color = <<$SplTxtColGood>>>Blobs of Water shaped like sharks fly towards your enemy stiking them.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>Blobs of water shaped like sharks fly towards your enemy, striking them.</font></b>'
 		if dyneval('result=<<$TargetType>>_clone[<<TargetNumber>>]') > 0:
 			dynamic $spellFunc['UpdateAttrib'], 'clone', $TargetType, TargetNumber, '=', 0
 			'<b><font color = <<$SplTxtColGood>>>Enemy clones are vaporized.</font></b>'
 		end
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
 if $ARGS[0] = 'greatflood':
 	if SuccessValue > 0:
 		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', 1000
-		'<b><font color = <<$SplTxtColGood>>>You have filled the whole neighborhood with water protecting you and devouring enemy mana.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>You have filled the whole neighborhood with water, protecting you and devouring enemy mana.</font></b>'
 		if dyneval('result=<<$TargetType>>_clone[<<TargetNumber>>]') > 0:
 			dynamic $spellFunc['UpdateAttrib'], 'clone', $TargetType, TargetNumber, '=', 0
 			'<b><font color = <<$SplTxtColGood>>>Enemy clones are vaporized.</font></b>'
 		end
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 

+ 25 - 25
locations/spellList.qsrc

@@ -66,7 +66,7 @@ spellMana['curewounds'] = 1000
 spellTime['curewounds'] = 30
 spellDiff['curewounds'] = 25
 $spellName['curewounds'] = 'Cure Wounds'
-$spellDesc['curewounds'] = 'You feel your bodys wounds begin to heal.'
+$spellDesc['curewounds'] = 'You feel your body''s wounds begin to heal.'
 $spellTarget['curewounds'] = 'team'
 !curewounds2
 spellMana['curewounds2'] = 10000
@@ -159,7 +159,7 @@ spellTime['glamour'] = 1
 spellDiff['glamour'] = 30
 $spellName['glamour'] = 'Glamour'
 $spellTarget['glamour'] = 'self'
-$spellDesc['glamour'] = 'Become undefinablely beautiful.  Your eyes sparkle just so.  Your hair has a perfect luster.  Your curves are undefinablely perfect.'
+$spellDesc['glamour'] = 'Become undefinably beautiful. Your eyes sparkle just so. Your hair has a perfect luster. Your curves are undefinably perfect.'
 !glamour
 spellMana['alterself'] = 500
 spellTime['alterself'] = 1
@@ -187,7 +187,7 @@ spellMana['clone'] = 15
 spellTime['clone'] = 0
 spellDiff['clone'] = 1
 $spellName['clone'] = 'Create Clone'
-$spellDesc['clone'] = 'You can create an exact clone of yourself, and slip out of sight of the enemy.'
+$spellDesc['clone'] = 'You can create an exact clone of yourself and slip out of sight of the enemy.'
 $spellTarget['clone'] = 'self'
 !stun
 spellMana['stun'] = 20
@@ -201,7 +201,7 @@ spellMana['weapon'] = 20
 spellTime['weapon'] = 0
 spellDiff['weapon'] = 0
 $spellName['weapon'] = 'Empower Weapon'
-$spellDesc['weapon'] = 'Magically power a weapon causing greater damage.'
+$spellDesc['weapon'] = 'Magically empower a weapon, causing it to deal greater damage.'
 $spellTarget['weapon'] = 'self'
 !wind
 spellMana['wind'] = 40
@@ -215,7 +215,7 @@ spellMana['multiclone'] = 45
 spellTime['multiclone'] = 0
 spellDiff['multiclone'] = 2
 $spellName['multiclone'] = 'Multi-Clone'
-$spellDesc['multiclone'] = 'Summon three clones of yourself and slip out of the enemys sight.'
+$spellDesc['multiclone'] = 'Summon three clones of yourself and slip out of the enemy''s sight.'
 $spellReq['multiclone'] = 'clone'
 $spellTarget['multiclone'] = 'self'
 !energo
@@ -223,7 +223,7 @@ spellMana['energo'] = 50
 spellTime['energo'] = 0
 spellDiff['energo'] = 3
 $spellName['energo'] = 'Energy Shield'
-$spellDesc['energo'] = 'Create an energy shield to absorb incoming damage.  You gain 100 defense.'
+$spellDesc['energo'] = 'Create an energy shield to absorb incoming damage. You gain 100 defense.'
 $spellTarget['energo'] = 'self'
 !haste
 spellMana['haste'] = 60
@@ -244,7 +244,7 @@ spellMana['hand'] = 100
 spellTime['hand'] = 0
 spellDiff['hand'] = 0
 $spellName['hand'] = 'Quivering Palm'
-$spellDesc['hand'] = 'Add energy from your mana to your hand for a devistating strike.'
+$spellDesc['hand'] = 'Add energy from your mana to your hand for a devastating strike.'
 $spellTarget['wind'] = 'enemy'
 !scaldingtouch
 spellMana['scaldingtouch'] = 10
@@ -266,21 +266,21 @@ spellMana['firebarrier'] = 150
 spellTime['firebarrier'] = 0
 spellDiff['firebarrier'] = 8
 $spellName['firebarrier'] = 'Fire Barrier'
-$spellDesc['firebarrier'] = 'You are shielded by a wall of flames.  Adds 750 defense.'
+$spellDesc['firebarrier'] = 'You are shielded by a wall of flames. Adds 750 defense.'
 $spellTarget['firebarrier'] = 'self'
 !firestorm
 spellMana['firestorm'] = 250
 spellTime['firestorm'] = 0
 spellDiff['firestorm'] = 9
 $spellName['firestorm'] = 'Fire Storm'
-$spellDesc['firestorm'] = 'Super heated embers rain down upon your enemies.'
+$spellDesc['firestorm'] = 'Superheated embers rain down upon your enemies.'
 $spellTarget['firestorm'] = 'enemy'
 !flameshield
 spellMana['flameshield'] = 500
 spellTime['flameshield'] = 0
 spellDiff['flameshield'] = 10
 $spellName['flameshield'] = 'Flame Shield'
-$spellDesc['flameshield'] = 'A Shield made of Flames interposes itself between you and your enemy, absorbing 2500 damage to defend you.'
+$spellDesc['flameshield'] = 'A Shield made of flames interposes itself between you and your enemy, absorbing 2500 damage to defend you.'
 $spellTarget['flameshield'] = 'self'
 !shock
 spellMana['shock'] = 10
@@ -316,14 +316,14 @@ spellMana['dancingsphere'] = 500
 spellTime['dancingsphere'] = 0
 spellDiff['dancingsphere'] = 10
 $spellName['dancingsphere'] = 'Dancing Sphere'
-$spellDesc['dancingsphere'] = 'Lightning dances around you blocking attacks coming toward you.'
+$spellDesc['dancingsphere'] = 'Lightning dances around you, blocking attacks coming toward you.'
 $spellTarget['dancingsphere'] = 'self'
 !quicksand
 spellMana['quicksand'] = 10
 spellTime['quicksand'] = 0
 spellDiff['quicksand'] = 6
 $spellName['quicksand'] = 'Quicksand'
-$spellDesc['quicksand'] = 'Opponent is caught in a quicksand trap.'
+$spellDesc['quicksand'] = 'Your opponent is caught in a quicksand trap.'
 $spellTarget['quicksand'] = 'enemy'
 !earthshield
 spellMana['earthshield'] = 100
@@ -337,56 +337,56 @@ spellMana['abyss'] = 150
 spellTime['abyss'] = 0
 spellDiff['abyss'] = 8
 $spellName['abyss'] = 'Abyss'
-$spellDesc['abyss'] = 'The Earth opens up beneath your opponents feet, slamming shut damaging him and depriving him of the ability to move.'
+$spellDesc['abyss'] = 'The Earth opens up beneath your opponent''s feet, slamming shut damaging him and depriving him of the ability to move.'
 $spellTarget['abyss'] = 'enemy'
 !earthguardian
 spellMana['earthguardian'] = 250
 spellTime['earthguardian'] = 0
 spellDiff['earthguardian'] = 9
 $spellName['earthguardian'] = 'Earth Guardian'
-$spellDesc['earthguardian'] = 'The Earth itself comes alive defending you from attacks.  It draws from the power of the land to regenerate itself every round.'
+$spellDesc['earthguardian'] = 'The Earth itself comes alive defending you from attacks. It draws from the power of the land to regenerate itself every round.'
 $spellTarget['earthguardian'] = 'self'
 !sando
 spellMana['sando'] = 500
 spellTime['sando'] = 0
 spellDiff['sando'] = 10
 $spellName['sando'] = 'Sando'
-$spellDesc['sando'] = 'Two huge plates of earth colapse together crushing the enemy and depriving him of the ability to move.'
+$spellDesc['sando'] = 'Two huge plates of earth collapse together, crushing the enemy and depriving him of the ability to move.'
 $spellTarget['sando'] = 'enemy'
 !windgust
 spellMana['windgust'] = 10
 spellTime['windgust'] = 0
 spellDiff['windgust'] = 6
 $spellName['windgust'] = 'Wind Gust'
-$spellDesc['windgust'] = 'a huge gust of wind rips past you killing clones and removing fog.'
+$spellDesc['windgust'] = 'a huge gust of wind rips past you, killing clones and removing fog.'
 $spellTarget['windgust'] = 'enemy'
 !pressure
 spellMana['pressure'] = 100
 spellTime['pressure'] = 0
 spellDiff['pressure'] = 7
 $spellName['pressure'] = 'Horrific Pressure'
-$spellDesc['pressure'] = 'Enormous air pressure surrounds your enemy causing damage as well as killing clones and removing fog.'
+$spellDesc['pressure'] = 'Enormous air pressure surrounds your enemy, causing damage as well as killing clones and removing fog.'
 $spellTarget['pressure'] = 'enemy'
 !vacuum
 spellMana['vacuum'] = 150
 spellTime['vacuum'] = 0
 spellDiff['vacuum'] = 8
 $spellName['vacuum'] = 'Vacuum Sphere'
-$spellDesc['vacuum'] = 'A turbulent sphere of vacuum surrounds you blocking incoming attacks.'
+$spellDesc['vacuum'] = 'A turbulent sphere of vacuum surrounds you, blocking incoming attacks.'
 $spellTarget['vacuum'] = 'self'
 !vacuumshells
 spellMana['vacuumshells'] = 250
 spellTime['vacuumshells'] = 0
 spellDiff['vacuumshells'] = 9
 $spellName['vacuumshells'] = 'Vacuum Shells'
-$spellDesc['vacuumshells'] = 'Turbulent spheres of vacuum bombard your enemy destroying clones and removing fog.'
+$spellDesc['vacuumshells'] = 'Turbulent spheres of vacuum bombard your enemy, destroying clones and removing fog.'
 $spellTarget['vacuumshells'] = 'enemy'
 !devouringvacuum
 spellMana['devouringvacuum'] = 500
 spellTime['devouringvacuum'] = 0
 spellDiff['devouringvacuum'] = 10
 $spellName['devouringvacuum'] = 'Devouring Vacuum'
-$spellDesc['devouringvacuum'] = 'A devouring vacuum sucks away your enemys defensive shields.'
+$spellDesc['devouringvacuum'] = 'A devouring vacuum sucks away your enemy''s defensive shields.'
 $spellTarget['devouringvacuum'] = 'enemy'
 !leechmana
 spellMana['leechmana'] = 10
@@ -407,21 +407,21 @@ spellMana['blister'] = 150
 spellTime['blister'] = 0
 spellDiff['blister'] = 8
 $spellName['blister'] = 'Blister'
-$spellDesc['blister'] = 'Create a protective sphere of water.  Some of the damage absorbed is converted into mana for you.'
+$spellDesc['blister'] = 'Create a protective sphere of water. Some of the damage absorbed is converted into mana for you.'
 $spellTarget['blister'] = 'enemy'
 !sharkrockets
 spellMana['sharkrockets'] = 250
 spellTime['sharkrockets'] = 0
 spellDiff['sharkrockets'] = 9
 $spellName['sharkrockets'] = 'Shark Rockets'
-$spellDesc['sharkrockets'] = 'Blobs of Water shaped like sharks fly towards your enemy stiking them for 1500 damage and abosorbing 2500 mana for you.  Clones are destroyed'
+$spellDesc['sharkrockets'] = 'Blobs of Water shaped like sharks fly towards your enemies, striking them for 1500 damage and absorbing 2500 mana for you. Clones are destroyed.'
 $spellTarget['sharkrockets'] = 'enemy'
 !greatflood
 spellMana['greatflood'] = 500
 spellTime['greatflood'] = 0
 spellDiff['greatflood'] = 10
 $spellName['greatflood'] = 'Great Flood'
-$spellDesc['greatflood'] = 'A huge flood of water fills the area absorbing mana from the enemy and giving you additional protection.'
+$spellDesc['greatflood'] = 'A huge flood of water fills the area, absorbing mana from the enemy and giving you additional protection.'
 $spellTarget['greatflood'] = 'enemy'
 
 
@@ -616,10 +616,10 @@ if $ARGS[0] = 'teacherActions':
 					spellLearn['<<$ThisSpellName>>'] += rand(1, 100/<<spellDifficulty>>)
 
 					if spellLearn['<<$ThisSpellName>>'] < 100:
-						'You diligently study the spell for an hour, but could not grasp it.'
+						'You diligently study the spell for an hour, but cannot grasp it.'
 					else
 						spellKnown['<<$ThisSpellName>>'] = 1
-						'Finally you are able to grasp and learn the spell.'
+						'Finally, you are able to grasp and learn the spell.'
 						*nl
 						'<<$spellName[$ThisSpellName]>>: <<$spellDesc[$ThisSpellName]>>'
 					end

+ 1 - 1
locations/sportShop.qsrc

@@ -9,7 +9,7 @@ if $ARGS[0] = 'start':
 	'<center><b><font color="maroon">Danilovich sporting goods</font></b></center>'
 	'<center><img src="images/locations/city/citycenter/mall/sportshop/sportshop.jpg"></center>'
 	*nl
-	'As soon as you enter, a high energy song with a thumping baseline fills your eardrums, making you feeling pumped and awake. The store is sleek and professional, the walls and floors advertising all different kinds of sporting equipment and attire. The room is filled with beautifully fit people shopping, their bodies varying from big and muscular to lean and trim. If they don''t inspire you to want to work out, the posters advertising past and present famous athletes is motivating as hell.'
+	'As soon as you enter, a high energy song with a thumping baseline fills your eardrums, making you feel pumped and awake. The store is sleek and professional, the walls and floors advertising all different kinds of sporting equipment and attire. The room is filled with beautifully fit people shopping, their bodies varying from big and muscular to lean and trim. If they don''t inspire you to want to work out, the posters advertising past and present famous athletes are motivating as hell.'
 	*nl
 	if refillable_bottle = 0 and money >= 1000 and bag > 0: 
 		'You could buy a high-quality <a href="exec:minut += 5 & money -= 1000 & refillable_bottle = 1 & gt ''sportShop'', ''start''">water bottle (1000 <b>₽</b>)</a> that you can carry around in your purse.'

+ 11 - 11
locations/stallion.qsrc

@@ -30,7 +30,7 @@ if $ARGS[0] = 'start':
 	act 'Run away':
 		*clr & cla
 		'You quickly sort yourself out and get out of the stall. You try the bathroom door. It''s locked. There is no handle, and the lock is just a keyhole.'
-		'"It''s no use. You are trapped." The strange man says.'
+		'"It''s no use. You are trapped," The strange man says.'
 		'A naked middle aged man exits the other stall and walks towards you.'
 		gs 'stallion', 'fight'
 	end
@@ -60,13 +60,13 @@ if $ARGS[0] = 'rape':
 	'The man pushes you down, and you fall on your ass. He advances towards you, grabs a hold of your clothes and rips them open. He falls on top of you. You feel his hot breath against your face as he ruthlessly grabs your arms. You feel his penis poking you in the leg.'
 	'"So you know what''s coming next, don''t you my little <<$pcs_nickname>>?"'
 	if pcs_horny < 30:
-		'You feel his cock stab you in the unprepared vagina, not even the slightest slowed down by the lack of lubrication. It''s rough and raw, pulling at your skin and pressing against your sensitive flesh painfully. You can''t help but cry out.'		
+		'You feel his cock stab you in your unprepared vagina, not even the slightest slowed down by the lack of lubrication. It''s rough and raw, pulling at your skin and pressing against your sensitive flesh painfully. You can''t help but cry out.'		
 	elseif pcs_horny < 50:
 		'You feel his cock stab you in the vagina. It''s not very well lubricated, and it rubs painfully against your sensitive flesh as it penetrates you.'
 	elseif pcs_horny < 70:
 		'You feel his cock stab you in the vagina. It slides into your lubricated entryway, penetrating you.'
 	else
-		'You feel his hard cock enter your wet vagina, easily entering you.'
+		'You feel his hard cock push against your wet vagina, easily entering you.'
 	end
 	if pcs_vag = 0: 'It brings tears to your eyes as he painfully rips your hymen, taking your virginity.'
 	gs 'arousal', 'vaginal', 30, 'rough', 'sub'
@@ -88,12 +88,12 @@ if $ARGS[0] = 'rape':
 			'You feel a tingling in your body. He places a powerful enchantment on you, increasing your fertility and binding your life force to the fruit of your womb. You realize with horror that he has practically guaranteed all sexual encounters will result in pregnancy in the future. Furthermore, your life is now tied to your womb. An abortion will result in your death.'
 		end
 		act 'What have you done to me?':
-			'"I have given you a gift, sweet <<$pcs_nickname>>. I have turned you into a broodmare." He replied as he continued to repeatedly thrust into you.'
+			'"I have given you a gift, sweet <<$pcs_nickname>>. I have turned you into a broodmare," he replies as he continues to repeatedly thrust into you.'
 		end
 	end
 	gs 'willpower', 'misc', 'self', 'easy'
 	if will_cost <= pcs_willpwr:
-		act 'Beg for Mercy (<<will_cost>> Willpower)':
+		act 'Beg for mercy (<<will_cost>> Willpower)':
 			cla
 			gs 'willpower', 'misc', 'self', 'easy'
 			gs 'willpower', 'pay', 'self'
@@ -108,14 +108,14 @@ if $ARGS[0] = 'rape':
 			end
 			if broodcurse = 0:
 				'Stallion smiles as you plead for him not to cum inside you.'
-				'"I''m sure you''ll manage to bear my child just fine." He says as he continues to thrust into you.' 
+				'"I''m sure you''ll manage to bear my child just fine," he says as he continues to thrust into you.' 
 			else
 				'Stallion smiles. "I''m not lifting the curse. You should accept your fate. It will be easier on you in the long run."'
 			end
 			act 'Continue': gt 'stallion', 'finish'
 		end
 	else
-		act 'Beg for Mercy (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		act 'Beg for mercy (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 	gs 'willpower', 'skill', 'resist', 'stren_lvl'
 	if will_cost <= pcs_willpwr:
@@ -124,7 +124,7 @@ if $ARGS[0] = 'rape':
 			gs 'willpower', 'skill', 'resist', 'stren_lvl'
 			gs 'willpower', 'pay', 'resist'
 			'You attempt to throw him off you, but he is able to resist your efforts.'
-			'"Tightening up like that, makes it feel so good." He says as he continues to thrust into you.'
+			'"Tightening up like that makes it feel so good," he says as he continues to thrust into you.'
 			act 'Continue': gt 'stallion', 'finish'
 		end
 	else
@@ -140,9 +140,9 @@ end
 if $ARGS[0] = 'finish':
 	cla
 	'<center><img <<$set_imgh>> src="images/characters/city/jora/sex/klof10.jpg"></center>'
-	'Stallion moaned. "I''m cumming!"'
+	'Stallion moans, "I''m cumming!"'
 	'He twitches on top of you, and you feel him fill you with his seed.'
-	'"Give birth to a cute baby for me, <<$pcs_nickname>>. But don''t you dare kill it. You won''t survive it long. Ta ta!" He said, pulling out.'
+	'"Give birth to a cute baby for me, <<$pcs_nickname>>. But don''t you dare kill it. You won''t survive it long. Ta ta!" He says, pulling out.'
 	act 'Continue': gt 'stallion', 'end'
 end
 
@@ -159,7 +159,7 @@ end
 if $ARGS[0] = 'awaken':
 	'<center><img <<$set_imgh>> src="images/locations/shared/bathroom/publictoilet.jpg"></center>'
 	minut += 160
-	'You come to several hours later laying on the cold bathroom floor. Your clothing is folded neatly in a pile nearby.'
+	'You come to several hours later lying on the cold bathroom floor. Your clothing is folded neatly in a pile nearby.'
 	if bag > 0: 
 		'Your handbag is sitting on top of the clothing. You check it for missing items.'
 		if money > 0: 'You have <<money>> rubles.'

+ 3 - 3
locations/stat.qsrc

@@ -161,7 +161,7 @@ if MagikDostup = 0:
 	if pcs_magik > magikhigh:
 		magikhigh += 1
 		rikudo += pcs_magik * 100
-		$stat_msg += '<BR><b>You feel like a strength has been revealed within you and you gush with magic, lifting you to a new energy level.</b>'
+		$stat_msg += '<BR><b>You feel like a strength has been revealed within you, and you gush with magic, lifting you to a new energy level.</b>'
 !!		This will be replaced when a more advanced physical system is made
 		if (pcs_magik mod 2 ! 0) and pcs_eyesize < 2: pcs_eyesize += 1
 		if (pcs_magik mod 2 = 0) and pcs_lashes < 2: pcs_lashes += 1
@@ -961,7 +961,7 @@ elseif pcs_willpwr >= willpowermax * 50 / 100:
 elseif pcs_willpwr >= willpowermax * 25 / 100:
 	$pcs_willpwr = '<font color="red">You will have to toe the line.</font>'
 else
-	$pcs_willpwr = '<font color="red">You are completely at our people''s mercy.</font>'
+	$pcs_willpwr = '<font color="red">You are completely at other people''s mercy.</font>'
 end
 
 !!stop auto birth control pill taking if the player believes they are pregnant or are pregnant
@@ -1033,7 +1033,7 @@ end
 
 if hotelroom > 0:
 	if hotelroom1day = daystart: $stat_msg += '<BR>You have 1 night left on your hotel booking.'
-	if hotelroom1day < daystart and hour <= 11: $stat_msg += '<BR>Your hotel booking has expired and you cannot return to your room after 11:00'
+	if hotelroom1day < daystart and hour <= 11: $stat_msg += '<BR>Your hotel booking has expired, and you cannot return to your room after 11:00'
 	if hotelroom1day < daystart and hour > 11: hotelroom = 0
 end
 

+ 43 - 43
locations/stat_display.qsrc

@@ -194,7 +194,7 @@ elseif pcs_energy < 20:
 	$stat_hunger_msg = 'You are very hungry and struggle to concentrate on anything other than food.'
 	$stat_hunger_tooltip = 'You are very hungry.'
 elseif pcs_energy < 30:
-	$stat_hunger_msg = 'You feel peckish and your thoughts sometimes drift towards food.'
+	$stat_hunger_msg = 'You feel peckish, and your thoughts sometimes drift towards food.'
 	$stat_hunger_tooltip = 'You feel peckish.'
 else
 	$stat_hunger_msg = ''
@@ -207,10 +207,10 @@ elseif pcs_hydra < 10:
 	$stat_thirst_msg = 'You are dehydrated, you really need to have something to drink.'
 	$stat_thirst_tooltip = 'You are dehydrated.'
 elseif pcs_hydra < 20:
-	$stat_thirst_msg = 'You are thirsty and your dry throat is irritating and distracting you.'
+	$stat_thirst_msg = 'You are thirsty, and your dry throat is irritating and distracting you.'
 	$stat_thirst_tooltip = 'You are thirsty.'
 elseif pcs_hydra < 30:
-	$stat_thirst_msg = 'You feel a little thirsty and your mouth is a little dry.'
+	$stat_thirst_msg = 'You feel a little thirsty, and your mouth is a little dry.'
 	$stat_thirst_tooltip = 'You feel a little thirsty.'
 else
 	$stat_thirst_msg = ''
@@ -245,7 +245,7 @@ elseif hypnoAddict > 0 and hypnoWithdrawal = 1 and missCum < timeTresh:
 	$stat_hypno_msg = 'You need to talk to your therapist. You feel unbalanced without your sessions.'
 	$stat_hypno_tooltip = 'Talk to your therapist.'
 elseif hypnoAddict > 0:
-	$stat_hypno_msg = 'You miss the feeling of sperm in your body and you feel moody.'
+	$stat_hypno_msg = 'You miss the feeling of sperm in your body, and you feel moody.'
 	$stat_hypno_tooltip = 'Maybe visit your therapist.'
 else
 	$stat_hypno_msg = ''
@@ -272,20 +272,20 @@ else
 end
 
 if sick = 1:
-	$stat_sick_tooltip = 'You are having a mild cold.'
+	$stat_sick_tooltip = 'You have a mild cold.'
 	$stat_sick_msg = 'This is not good, a tickle in the throat and a little runny nose.'
 elseif sick > 0 and sick < 24:
-	$stat_sick_tooltip = 'You are having a cold.'
+	$stat_sick_tooltip = 'You have a cold.'
 	$stat_sick_msg = 'You have chills. You nose is running and throat is raw, you cough and sneeze - it looks like you got a cold.'
 elseif sick > 0 and sick < 48:
-	$stat_sick_tooltip = 'You are having a serious cold.'
+	$stat_sick_tooltip = 'You have a serious cold.'
 	$stat_sick_msg = 'You have a fever. Your nose is clogged, it hurts to swallow - throat aches. You continually cough and sneeze - it looks like your cold is pretty bad.'
 elseif sick > 0 and sick < 72:
 	$stat_sick_tooltip = 'You have the flu.'
-	$stat_sick_msg = 'You have a high fever. You have a stuffy nose, sore head and throat, your coughing badly - it looks like you got a strong cold. Maybe it''s the flu.'
+	$stat_sick_msg = 'You have a high fever. You have a stuffy nose, sore head and throat, you''re coughing badly - it looks like you got a strong cold. Maybe it''s the flu.'
 elseif sick > 0:
 	$stat_sick_tooltip = 'You are seriously sick.'
-	$stat_sick_msg = 'You toss in the heat. You have a stuffy nose, headache and ache to the bone. Your throat is inflamed and very sore. You think you''re going to cough up a lung - it looks like you are seriously ill, or maybe it''s just a sore throat.'
+	$stat_sick_msg = 'You toss in the heat. You have a stuffy nose and headache and ache to the bone. Your throat is inflamed and very sore. You think you''re going to cough up a lung - it looks like you are seriously ill, or maybe it''s just a sore throat.'
 else
 	$stat_sick_msg = ''
 end
@@ -364,7 +364,7 @@ if $clothingworntype ! 'nude':
 			$stat_bra_msg = 'Your nipples are slightly poking through your swimsuit.'
 			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
 		elseif $braworntype = 'exhibitionist':
-			$stat_bra_msg = 'You are wearing such a thin bra that your nipples are still being fainly outlined through your top.'
+			$stat_bra_msg = 'You are wearing such a thin bra that your nipples are still being faintly outlined through your top.'
 			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
 		elseif $braworntype ! 'none':
 			$stat_bra_msg = 'Your bra is being outlined through your top.'
@@ -410,7 +410,7 @@ if $pantyworntype = 'none' and $clothingworntype ! 'swimwear' and $clothingwornt
 		$stat_panty_msg = 'You feel liberated not wearing panties as your naked ass flashes from under your short skirt.'
 		$stat_panty_text = '<BR><font color=#0064FF><<$stat_panty_msg>></font>'
 	elseif PCloSkirt > 3 and pcs_inhib <= 50:
-		$stat_panty_msg = 'Your face is flushed with shame, you are not wearing panties and your naked ass flashes from under your short skirt.'
+		$stat_panty_msg = 'Your face is flushed with shame. You are not wearing panties, and your naked ass flashes from under your short skirt.'
 		$stat_panty_text = '<BR><b><font color="red"><<$stat_panty_msg>></font></b>'
 	elseif PCloPants > 0 and $braworntype = 'none':
 		$stat_panty_msg = 'You aren''t wearing underwear, and your bare pussy is rubbing against your clothing.'
@@ -433,7 +433,7 @@ elseif $pantyworntype = 'exhibitionist' and $clothingworntype ! 'swimwear' and $
 		$stat_panty_msg = 'You feel liberated as your ass, clearly visible through your panties, flashes from under your short skirt.'
 		$stat_panty_text = '<BR><font color=#0064FF><<$stat_panty_msg>></font>'
 	elseif PCloSkirt > 3 and pcs_inhib <= 50:
-		$stat_panty_msg = 'Your face is flushed with shame, you are wearing panties so thin, they leave your ass clearly visible, as it flashes from under your short skirt.'
+		$stat_panty_msg = 'Your face is flushed with shame. You are wearing panties so thin they leave your ass clearly visible as it flashes from under your short skirt.'
 		$stat_panty_text = '<BR><b><font color="red"><<$stat_panty_msg>></font></b>'
 	end
 end
@@ -444,9 +444,9 @@ $stat_clothes_text = ''
 if $clothingworntype = 'nude':
 	if $pantyworntype = 'exhibitionist':
 		if $braworntype = 'none':
-			$stat_clothes_text = '<BR><font color = #AB052A>You are only wearing your see-through panties and your boobs sway invitingly as you walk.</font>'
+			$stat_clothes_text = '<BR><font color = #AB052A>You are only wearing your see-through panties, and your boobs sway invitingly as you walk.</font>'
 			$stat_clothes_tooltip = 'You are wearing your see-through panties.'
-			$stat_clothes_msg = 'You are only wearing your see-through panties and your boobs sway invitingly as you walk.'
+			$stat_clothes_msg = 'You are only wearing your see-through panties, and your boobs sway invitingly as you walk.'
 		elseif $braworntype = 'exhibitionist':
 			$stat_clothes_text = '<BR><font color = #AB052A>You are only wearing your see-through underwear.</font>'
 			$stat_clothes_tooltip = 'You are wearing your see-through underwear.'
@@ -458,9 +458,9 @@ if $clothingworntype = 'nude':
 		end
 	elseif $pantyworntype ! 'none':
 		if $braworntype = 'none':
-			$stat_clothes_text = '<BR><font color = #AB052A>You are only wearing your panties and your boobs sway invitingly as you walk.</font>'
+			$stat_clothes_text = '<BR><font color = #AB052A>You are only wearing your panties, and your boobs sway invitingly as you walk.</font>'
 			$stat_clothes_tooltip = 'You are wearing your panties.'
-			$stat_clothes_msg = 'You are only wearing your panties and your boobs sway invitingly as you walk.'
+			$stat_clothes_msg = 'You are only wearing your panties, and your boobs sway invitingly as you walk.'
 		elseif $braworntype = 'exhibitionist':
 			$stat_clothes_text = '<BR><font color = #AB052A>You are only wearing your see-through bra and panties.</font>'
 			$stat_clothes_tooltip = 'You are wearing your see-through bra and panties.'
@@ -481,17 +481,17 @@ if $clothingworntype = 'nude':
 				$stat_clothes_tooltip = 'You don''t like being naked.'
 				$stat_clothes_msg = 'You are completely naked, and it makes you feel nervous and ashamed.'
 			elseif pcs_inhib < 20:
-				$stat_clothes_text = '<BR><b><font color = orange>You are completely naked, you''re not too comfortable with nudity but it is a little exciting.</font></b>'
+				$stat_clothes_text = '<BR><b><font color = orange>You are completely naked. You''re not too comfortable with nudity but it is a little exciting.</font></b>'
 				$stat_clothes_tooltip = 'It''s a bit exciting to be naked.'
-				$stat_clothes_msg = 'You are completely naked, you''re not too comfortable with nudity but it is a little exciting.'
+				$stat_clothes_msg = 'You are completely naked. You''re not too comfortable with nudity, but it is a little exciting.'
 			elseif pcs_inhib >= 90:
 				$stat_clothes_text = '<BR><b><font color=#0064FF>You are completely naked, which is far better than having to wear clothes.</font></b>'
 				$stat_clothes_tooltip = 'Being naked is far better than wearing clothes.'
 				$stat_clothes_msg = 'You are completely naked, which is far better than having to wear clothes.'
 			else
-				$stat_clothes_text = '<BR><b><font color = #FF00FF>You are completely naked. It''s exciting and you feel tingly inside.</font></b>'
+				$stat_clothes_text = '<BR><b><font color = #FF00FF>You are completely naked. It''s exciting, and you feel tingly inside.</font></b>'
 				$stat_clothes_tooltip = 'It''s exciting to be naked.'
-				$stat_clothes_msg = 'You are completely naked. It''s exciting and you feel tingly inside.'
+				$stat_clothes_msg = 'You are completely naked. It''s exciting, and you feel tingly inside.'
 			end
 		end
 	end
@@ -622,7 +622,7 @@ elseif PCloStyle2 = 4:
 	end
 elseif $clothingworntype = 'misc_outfits' and clothingwornnumber = '1':
 	$stat_clothes_text = '<BR><b><font color = "yellow">You are wearing an old hessian sack the hunters gave you.</font></b>'
-	$stat_clothes_tooltip = 'You''re wearing an hessian sack.'
+	$stat_clothes_tooltip = 'You''re wearing a hessian sack.'
 	$stat_clothes_msg = 'You are wearing an old hessian sack the hunters gave you.'
 	$stat_clothes_style = 'clothes'
 else
@@ -804,7 +804,7 @@ if cheatStatusIcons = 0:
 	
 	if mood_trauma > 0:
 		mood_max_calc = max(10, mood_max)
-		$stat_trauma_msg = 'Recent events lower your maximum mood to <<mood_max_calc>>.'
+		$stat_trauma_msg = 'Recent events have lowered your maximum mood to <<mood_max_calc>>.'
 		$statusIconBarTab += '<td><a href="exec:msg $stat_trauma_msg"><img title="<<$stat_trauma_msg>>" height = <<set_siconht>> src="images/system/icon/status_icons/mood_6.png"></a></td>'
 		killvar 'mood_max_calc'
 	end
@@ -828,7 +828,7 @@ if cheatStatusIcons = 0:
 	end
 	
 	if pcs_horny > 90:
-		$statusIconBarTab += '<td><a href="exec:msg ''You can not stop thinking about sex, you are soaked between your legs from your juices.''"><img title="You can not stop thinking about sex." height = <<set_siconht>> src="images/system/icon/status_icons/arousal_high.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:msg ''You can not stop thinking about sex. You are soaked between your legs from your juices.''"><img title="You can not stop thinking about sex." height = <<set_siconht>> src="images/system/icon/status_icons/arousal_high.png"></a></td>'
 	elseif pcs_horny > 60:
 		$statusIconBarTab += '<td><a href="exec:msg ''You are a little nervous, feeling itchy between your legs from arousal.''"><img title="You are feeling aroused." height = <<set_siconht>> src="images/system/icon/status_icons/arousal_med.png"></a></td>'
 	elseif pcs_horny > 30:
@@ -959,7 +959,7 @@ if cheatStatusIcons = 0:
 		$stat_STD_msg += 'Your vagina is red and very itchy. You have genital herpes.'
 	elseif Gerpes >= 3 and Orerpes = 1:
 		stat_STD_count += 1
-		$stat_STD_msg += 'You have cold Sores on your lips. You have oral herpes.'
+		$stat_STD_msg += 'You have cold sores on your lips. You have oral herpes.'
 	end
 	if Gerpes >= 20 and GenHerpes = 1:
 		stat_STD_count += 1
@@ -978,7 +978,7 @@ if cheatStatusIcons = 0:
 	if Triper > 2:
 		stat_STD_count += 1
 		if stat_STD_count > 1: $stat_STD_msg += '<br>'
-		$stat_STD_msg += 'It stings, when you''re urinating. You have gonorrhea.'
+		$stat_STD_msg += 'It stings when you''re urinating. You have gonorrhea.'
 	end
 	if Kandidoz > 30:
 		stat_STD_count += 1
@@ -1099,7 +1099,7 @@ if cheatStatusIcons = 0:
 
 	if mentats_dose >= 1: $statusIconBarTab += '<td><a href="exec:msg ''You feel sharp and focused.''"><img title="You feel sharp and focused." height = <<set_siconht>> src="images/system/icon/status_icons/drugs.png"></a></td>'
 
-	if aphrodisiac_timer > 0: $statusIconBarTab +='<td><a href="exec:msg ''You are feeling hot and every move causes your groin to tingle.''"><img title="You are feeling hot." height = <<set_siconht>> src="images/system/icon/status_icons/aphro_gum.png"></a></td>'
+	if aphrodisiac_timer > 0: $statusIconBarTab +='<td><a href="exec:msg ''You are feeling hot, and every move causes your groin to tingle.''"><img title="You are feeling hot." height = <<set_siconht>> src="images/system/icon/status_icons/aphro_gum.png"></a></td>'
 
 	if $stat_frost_msg ! '': $statusIconBarTab += '<td><a href="exec:msg $stat_frost_msg"><img title="<<$stat_frost_msg>>" height = <<set_siconht>> src="images/system/icon/status_icons/hypothermia.png"></a></td>'
 
@@ -1109,7 +1109,7 @@ if cheatStatusIcons = 0:
 
 	if bcream_used = 1: $statusIconBarTab += '<td><a href="exec:msg ''Your breasts feel hot and tingly.''"><img title="Your breasts feel hot and tingly." height = <<set_siconht>> src="images/system/icon/status_icons/breast_cream.png"></a></td>'
 
-	if cumcondslip > 0: $statusIconBarTab += '<td><a href="exec:msg ''You feel sick and you are wondering about the used condom you never found. Maybe those two things are related?''"><img title="You feel sick. Click to find out more." height = <<set_siconht>> src="images/system/icon/status_icons/stuck_condom.png"></a></td>'
+	if cumcondslip > 0: $statusIconBarTab += '<td><a href="exec:msg ''You feel sick, and you are wondering about the used condom you never found. Maybe those two things are related?''"><img title="You feel sick. Click to find out more." height = <<set_siconht>> src="images/system/icon/status_icons/stuck_condom.png"></a></td>'
 		
 	if $stat_writing_msg ! '': $statusIconBarTab += '<td><a href="exec:msg $stat_writing_msg"><img title="<<$stat_writing_msg>>" height = <<set_siconht>> src="images/system/icon/status_icons/body_writing.png"></a></td>'
 	
@@ -1490,7 +1490,7 @@ if enable_extra_msg = 1:
 	if $pcs_mood ! '': $stat_msg += '<BR><font color="green"><b><<$pcs_mood>></b></font>'
 	if mentats_dose >= 1: $stat_msg += '<BR><font color = green>You feel sharp and focused.</font>'
 	if bcream_used = 1: $stat_msg += '<BR><font color = #DB7093>Your breasts are feeling hot and tingly.</font>'
-	if aphrodisiac_timer > 0: $stat_msg += '<BR><font color = #DB7093>You are feeling hot and every move causes your groin to tingle.</font>'
+	if aphrodisiac_timer > 0: $stat_msg += '<BR><font color = #DB7093>You are feeling hot, and every move causes your groin to tingle.</font>'
 
 	if cheatNoEat = 0 and $stat_hunger_msg ! '' and pcs_energy < 5:
 		$stat_msg += '<BR><font color="red"><b><<$stat_hunger_msg>></b></font>'
@@ -1528,9 +1528,9 @@ if enable_extra_msg = 1:
 		elseif pcs_horny < 90 and $pantyworntype = 'none':
 			$stat_msg += '<BR><font color = #DB7093>You are a little nervous, feeling nice between your legs <a href="exec:view''images/pc/body/pussy/aroused/none_low.jpg''">itchy</a> from arousal.</font>'
 		elseif $pantyworntype ! 'none':
-			$stat_msg += '<BR><font color = #FF1493>You can''t stop thinking about sex, between your legs you are <a href="exec:view''images/pc/body/pussy/aroused/panties_high.jpg''">soaked</a> from your juices.</font>'
+			$stat_msg += '<BR><font color = #FF1493>You can''t stop thinking about sex. Between your legs, you are <a href="exec:view''images/pc/body/pussy/aroused/panties_high.jpg''">soaked</a> from your juices.</font>'
 		else
-			$stat_msg += '<BR><font color = #FF1493>You can''t stop thinking about sex, between your legs you are <a href="exec:view''images/pc/body/pussy/aroused/none_high.jpg''">soaked</a> from your juices.</font>'
+			$stat_msg += '<BR><font color = #FF1493>You can''t stop thinking about sex. Between your legs, you are <a href="exec:view''images/pc/body/pussy/aroused/none_high.jpg''">soaked</a> from your juices.</font>'
 		end
 	end
 
@@ -1588,7 +1588,7 @@ if enable_extra_msg = 1:
 	elseif Gerpes >= 5 and GenHerpes =1:
 		$stat_msg += '<BR><b><font color="red">Your vagina is red and very itchy. You have genital herpes.</font></b>'
 	elseif Gerpes >= 3 and Orerpes = 1:
-		$stat_msg += '<BR><b><font color="red">You have cold Sores on your lips. You have oral herpes.</font></b>'
+		$stat_msg += '<BR><b><font color="red">You have cold sores on your lips. You have oral herpes.</font></b>'
 	end
 	if Gerpes >= 20 and GenHerpes =1:$stat_msg += '<BR> <b><font color="red">The herpes sores also cover your ass.</font></b>'
 	if Sifilis >= 50:
@@ -1643,9 +1643,9 @@ end
 if fingal > 0:$stat_msg += '<BR><b><font color="red">You have a black eye.</font></b>'
 
 if mosol >= 50:
-	$stat_msg += '<BR><b><font color="red">Your pussy itches a great deal and is affecting your mood, you should use some cream or stop wearing pants without underwear.</font></b>'
+	$stat_msg += '<BR><b><font color="red">Your pussy itches a great deal and is affecting your mood. You should use some cream or stop wearing pants without underwear.</font></b>'
 elseif mosol >= 30:
-	$stat_msg += '<BR><b><font color="red">Your pussy feels a little itchy, it seems to be from rubbing against your clothing.</font></b>'
+	$stat_msg += '<BR><b><font color="red">Your pussy feels a little itchy. It seems to be from rubbing against your clothing.</font></b>'
 end
 
 if $pantyworntype ! 'none' and clit_size >= 25: $stat_msg += '<BR><font color = #FF1493>Your panties keep rubbing against your clit and making you horny.</font>'
@@ -1673,12 +1673,12 @@ if StoryLine = 1 and sisboyday + 1 = daystart and hour < 19 and (npc_QW['A33'] =
 if StoryLine = 1 and sisboyday + 1 = daystart and hour < 19 and sisboytrioQW = 1:$stat_msg += '<BR>' & $stat_msg += '<BR>You promised your sister to meet her in your room at 18:00.'
 
 if StoryLine = 1 and day = nyp_day and month = 12 and SchoolAtestat = 0 and hour >= 5 and hour <= 14 and StoryLine = 1:
-	$stat_msg += '<BR>At 14:00 your school''s New Year''s party will start.'
+	$stat_msg += '<BR>At 14:00, your school''s New Year''s party will start.'
 elseif StoryLine = 1 and InvitationToDimkaNYparty = 1 and month = 12 and day = 31:
 	$stat_msg += '<BR><b>Go to the residential area between 15:00 and 18:00 to go to Dimka''s New Year party.</b>'
 end
-if StoryLine = 1 and gopnik_initiation = 1 and gopnik_initiation_day = daystart and hour > 15 and hour < 21: $stat_msg += '<BR><b>Meet Lena and Lera at the apartment garages at eight</b>'
-if StoryLine = 1 and nerd_night_game = 1 and nerd_night_game_day = daystart and hour > 15 and hour < 21: $stat_msg += '<BR><b>Join nerds at the community center at eight</b>'
+if StoryLine = 1 and gopnik_initiation = 1 and gopnik_initiation_day = daystart and hour > 15 and hour < 21: $stat_msg += '<BR><b>Meet Lena and Lera at the apartment garages at eight.</b>'
+if StoryLine = 1 and nerd_night_game = 1 and nerd_night_game_day = daystart and hour > 15 and hour < 21: $stat_msg += '<BR><b>Join nerds at the community center at eight.</b>'
 
 !!--------------- Storyline = 1 Events (End) ------------------------
 
@@ -1692,7 +1692,7 @@ end
 
 if $nichStatMsg ! '': $stat_msg += '<br><b><<$nichStatMsg>></b>'
 
-if npc_QW['A113'] = 1: $stat_msg += '<br>You owe Vadim Bely <<belgangpay>> <b><b>₽</b></b> and you need to pay him <<belgangpayweek>> <b>₽</b></b> this week.'
+if npc_QW['A113'] = 1: $stat_msg += '<br>You owe Vadim Bely <<belgangpay>> <b><b>₽</b></b>, and you need to pay him <<belgangpayweek>> <b>₽</b></b> this week.'
 
 !!------------------ Things without an icon (End) -------------------
 
@@ -1701,7 +1701,7 @@ if display_bb = 1:
 	if boletus + boletus_cooked + bilberry > 0:
 		$stat_msg += '<br> '
 		if boletus + boletus_cooked + bilberry >= 5:
-			$stat_msg +='<br><font color = Olive>Your basket is full and you cannot carry more. </font> '
+			$stat_msg +='<br><font color = Olive>Your basket is full, and you cannot carry more. </font> '
 		else
 			$stat_msg +='<br><font color = Olive>Your basket is partially full. </font>'
 		end
@@ -1900,7 +1900,7 @@ if enable_extra_msg = 1:
 	elseif young_shop_work1 = 1 and hour = 9 and week >= 6 and inWorkYoungShop = 0 and misscheck ! daystart:
 		$stat_msg += '<BR><b><font color="red">You missed work.</font></b>'
 	elseif young_shop_work1 = 1 and (hour = 7 or hour = 8) and week >= 6:
-		$stat_msg += '<BR><b><font color="red">By 9:00 you have to be at Pussy-Cats to start work.</font></b>'
+		$stat_msg += '<BR><b><font color="red">By 9:00, you have to be at Pussy-Cats to start work.</font></b>'
 	end
 
 	if young_shop_work2 = 1 and hour = 9 and minut <= 5 and week < 6 and inWorkYoungShop = 0:
@@ -1908,13 +1908,13 @@ if enable_extra_msg = 1:
 	elseif young_shop_work2 = 1 and hour = 9 and week < 6 and inWorkYoungShop = 0 and misscheck ! daystart:
 		$stat_msg += '<BR><b><font color="red">You missed work.</font></b>'
 	elseif young_shop_work2 = 1 and (hour = 7 or hour = 8) and week < 6:
-		$stat_msg += '<BR><b><font color="red">By 9:00 you have to be at Pussy-Cats to start work.</font></b>'
+		$stat_msg += '<BR><b><font color="red">By 9:00, you have to be at Pussy-Cats to start work.</font></b>'
 	end
 
 	if workrin = 1 and (week = 2 or week = 4 or week = 6) and hour > 5 and hour < 8:
-		$stat_msg += '<BR><b><font color="red">At 8 o''clock you start work on the market.</font></b>'
+		$stat_msg += '<BR><b><font color="red">At 8 o''clock, you start work in the market.</font></b>'
 	elseif workrin = 1 and (week = 2 or week = 4 or week = 6) and hour = 8:
-		$stat_msg += '<BR><b><font color="red">You need to work on the market now.</font></b>'
+		$stat_msg += '<BR><b><font color="red">You need to work in the market now.</font></b>'
 	end
 	
 
@@ -1977,7 +1977,7 @@ if enable_extra_msg = 1:
 	if hour < 20 and week => 1 and week <= 5 and age < 18 and workFabrika = 1:$stat_msg += '<BR><b><font color = red>Today you have work in the garment factory in Pavlovsk. Shift starts at 16:00.</font></b>'
 	if hour < 16 and week => 1 and week <= 5 and age >= 18 and workFabrika = 1:$stat_msg += '<BR><b><font color = red>Today you have work in the garment factory in Pavlovsk. Shift starts at 8:00.</font></b>'
 	if hour < 16 and week > 1 and week <= 5 and workhosp = 1:$stat_msg += '<BR><b><font color="red">You work as a nurse in the city residential area clinic. Your shift starts at 8:00.</font></b>'
-	if hour < 10 and worksalon = 1 and (week = 1 or week = 3 or week = 5):$stat_msg += '<BR><b><font color = red>Today you have work as masseuse in beauty salon. Shift starts at 9:00.</font></b>'
+	if hour < 10 and worksalon = 1 and (week = 1 or week = 3 or week = 5):$stat_msg += '<BR><b><font color = red>Today you have work as masseuse in the beauty salon. Shift starts at 9:00.</font></b>'
 	if leonidVisit = 1 and hour < 21 and hour > 6: $stat_msg += '<br><b>You have to serve Leonid at 20:00 in his Pavlovsk office!</b>'
 	
 	if hypnoAddict > 0 and $stat_hypno_msg ! '' and hypnoWithdrawal = 1 and missCum >= timeTresh:

+ 1 - 1
locations/stol.qsrc

@@ -122,7 +122,7 @@ if $ARGS[0] = 'stolPar':
 	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
 	if traits['nerd_status'] = 2: will_cost = will_cost / 2
 	if lernHome > 0 and (will_cost <= pcs_willpwr or traits['nerd_status'] = 3):
-		'<br>You have to your homework. Finishing everything will take <<lernHome>> hours.'
+		'<br>You have to your homework. Finishing everything will take <<lernHome>> '+iif(lernHome = 1, 'hour.', 'hours.')
 		act 'Do your homework (1:00'+iif(traits['nerd_status'] = 3, '', ' and <<will_cost>> Willpower')+')':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/shared/apartment/homework.jpg"></center>'

+ 47 - 47
locations/stripclub.qsrc

@@ -16,7 +16,7 @@ if $ARGS[0] = 'start':
 	act 'Leave': gt 'city_industrial', 'redlight'
 
 	if hour = 2:
-		'The strip club is closing and security guard ushers everyone out.'
+		'The strip club is closing, and a security guard ushers everyone out.'
 	elseif hour > 2 and hour < 11:
 		'The strip club is closed. You notice a sign on the door: The business hours are between 18:00 - 02:00.'
 	else
@@ -29,7 +29,7 @@ if $ARGS[0] = 'start':
 				end
 			else
 				*nl
-				'You still owe a 50,000 <b>₽</b> fine for your illegal actions. You cannot return to the club until you have paid them off.'
+				'You still owe a 50,000 <b>₽</b> fine for your illegal actions. You cannot return to the club until you have paid it off.'
 			end
 		else
 			if age >= 18 or fakepassport = 1:
@@ -63,9 +63,9 @@ if $ARGS[0] = 'start':
 					end
 				end
 			else
-				'The security guard stops you, looking you up and down, he asks to see your ID.'
+				'The security guard stops you. Looking you up and down, he asks to see your ID.'
 				'You make a show of rummaging through your purse. "Sorry, I must have left my ID at home."'
-				'"You need to leave this establishment, be sure to come back when you are old enough." he tells you.'
+				'"You need to leave this establishment, be sure to come back when you are old enough," he tells you.'
 			end
 		end
 	end
@@ -76,20 +76,20 @@ if $ARGS[0] = 'manager':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/tryout.jpg"></center>'
 	minut += 15
 	gs 'stat'
-	'After you''ve introduced yourself the manager observes you for a while and asks, "Are you really 18 years old? I had a visit from the police last week and they found an under-aged girl working here. I was fortunate enough that the officers could be bribed."'
+	'After you''ve introduced yourself, the manager observes you for a while and asks, "Are you really 18 years old? I had a visit from the police last week, and they found an under-aged girl working here. I was fortunate enough that the officers could be bribed."'
 	*nl
 
 	if age >= 18 or fakepassport = 1:
 		if age >= 18:
-			'"Yes I am." You answer him.'
+			'"Yes I am," you answer him.'
 		else
-			'"Yes I am." you answer, handing him your fake passport.'
+			'"Yes I am," you answer, handing him your fake passport.'
 			'You see him frown as he checks your passport with suspicion. "Well, I guess everything is in order."'
 		end
-		'He leads you to one of the private boots and points to the pole. "Show me what you can do."'
+		'He leads you to one of the private booths and points to the pole. "Show me what you can do."'
 		if pcs_dancero >= 40 and pcs_dancpol >= 30:
 			'You dance sensually, clearly he''s smitten by you. He asks you to sit down. "Our business hours are between 18:00 to 02:00. Some days there are only male strippers performing. We don''t pay strippers, but the customers tip generously. Think of it as an incentive, perform well and you''ll earn a tip."'
-			'"Strippers can perform lap dances for clients at their request for 1000 <b>₽</b> per lap dance, the stripper gets 400 <b>₽</b>, and the rest belongs to the club. They may want further entertainment, as the club doesn''t operate as a brothel we don''t really accept that kind of business but we usually turn a blind eye to it."'
+			'"Strippers can perform lap dances for clients at their request for 1000 <b>₽</b> per lap dance. The stripper gets 400 <b>₽</b>, and the rest belongs to the club. They may want further entertainment. As the club doesn''t operate as a brothel, we don''t really accept that kind of business, but we usually turn a blind eye to it."'
 			'"One last thing that I nearly forgot, dancing on stage involves a lot of work on the pole. Unless you do that, it is unlikely you will earn anything. There is no set schedule, the employees choose when they want to come to work. So what do you say, are you interested?"'
 			act 'Accept his offer':
 				*clr & cla
@@ -99,11 +99,11 @@ if $ARGS[0] = 'manager':
 				'The manager leads you to the dressing room and tells a woman responsible for the costumes that you''re going to join the club. He also introduces you to the chief of security, who takes your picture and makes you sign some documents.'
 				if $pcs_stagename = '':
 					'Most of our girls don''t perform under their own name for obvious reasons. What would you like your stripper name to be?'
-						$pcs_stagename = input("Which name would you like to use at the stripclub? (Leave blank for <<$pcs_nickname>>)")
+						$pcs_stagename = input("Which name would you like to use at the strip club? (Leave blank for <<$pcs_nickname>>)")
 					if $pcs_stagename = '':$pcs_stagename = '<<$pcs_nickname>>'
 				end
-				'After you''re done with the forms you are sent back to the manager''s office.'
-				'"Before you go on stage your first time I expect you to drop by my office so that I can check if you are up to our club standards, <<$pcs_stagename>>. It''s just a routine check to make sure that the club''s reputation stays intact. Nothing to worry about." He tells you before ushering you out of his office again.'
+				'After you''re done with the forms, you are sent back to the manager''s office.'
+				'"Before you go on stage your first time, I expect you to drop by my office so that I can check if you are up to our club standards, <<$pcs_stagename>>. It''s just a routine check to make sure that the club''s reputation stays intact. Nothing to worry about," he tells you before ushering you out of his office again.'
 
 				if cfnm = 0:act 'Head to the dressing room':gt 'stwork', 'start'
 					if cfnm = 1:
@@ -115,22 +115,22 @@ if $ARGS[0] = 'manager':
 			act 'Reject his offer':
 				*clr & cla
 				gs 'stat'
-				'You thank him for the offer but you''re not ready to commit to anything yet.'
-				'You can see on his face that he''s disappointed but he can''t really do anything about your decision. He thanks you and tells you if you ever change your mind you''re welcome back.'
+				'You thank him for the offer, but you''re not ready to commit to anything yet.'
+				'You can see on his face that he''s disappointed, but he can''t really do anything about your decision. He thanks you and tells you if you ever change your mind you''re welcome back.'
 				act 'Leave':gt 'stripclub', 'work_leave'
 			end
 		elseif pcs_dancero >= 40:
-			'After a minute he stops you and shakes his head. "Your poledancing is still lacking <<$pcs_nickname>>. If you want this job you''ll have to take some dance classes first. I believe you can do that at the gym."'
-			'"Come back when you can handle the pole and I''ll give you another chance."'
+			'After a minute, he stops you and shakes his head. "Your poledancing is still lacking <<$pcs_nickname>>. If you want this job, you''ll have to take some dance classes first. I believe you can do that at the gym."'
+			'"Come back when you can handle the pole, and I''ll give you another chance."'
 			act 'Leave':gt 'stripclub', 'work_leave'
 		else
-			'After a minute he stops you and shakes his head. "Your dancing is very lacking <<$pcs_nickname>>. If you want this job you''ll have to take some dance classes first. I believe you can do that at the gym."'
-			'"Come back when you can dance on stage without me having to worry you''ll fall off and I''ll give you another chance."'
+			'After a minute he stops you and shakes his head. "Your dancing is very lacking <<$pcs_nickname>>. If you want this job, you''ll have to take some dance classes first. I believe you can do that at the gym."'
+			'"Come back when you can dance on stage without me having to worry you''ll fall off, and I''ll give you another chance."'
 			act 'Leave':gt 'stripclub', 'work_leave'
 		end
 	else
-		'"Nearly..." you say dejectingly.'
-		'"Right. You need to leave this establishment, be sure to come back when you are old enough." he tells you.'
+		'"Nearly..." you say dejectedly.'
+		'"Right. You need to leave this establishment, be sure to come back when you are old enough," he tells you.'
 
 		act 'Leave':gt 'city_industrial', 'redlight'
 	end
@@ -170,7 +170,7 @@ if $ARGS[0] = 'forman':
 	if pcs_dancero > 0 and stripwork = 0 and pcs_inhib >= 60:
 		act 'See the manager for work': gt 'stripclub', 'manager'
 	elseif stripwork = 0 and pcs_inhib < 60:
-		'You could ask the manager for a job, but you don''t feel confident enough to be a stripper, you should get more used to showing off your body first.'
+		'You could ask the manager for a job, but you don''t feel confident enough to be a stripper. You should get more used to showing off your body first.'
 	end
 end
 
@@ -185,14 +185,14 @@ if $ARGS[0] = 'privat':
 
 	if privrand = 0:
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/sex/priv2.jpg"></center>'
-		'During the striptease the girls seem to be enjoying the female company and begin to caress you openly, making the male customers a bit jealous as they don''t get to enjoy the same attention as you''re getting.'
+		'During the striptease, the girls seem to be enjoying the female company and begin to caress you openly, making the male customers a bit jealous as they don''t get to enjoy the same attention as you''re getting.'
 
 		act 'Finish':gt 'stripclub', 'forman'
 		act 'Let them continue on':gt 'stripclub', 'privsex'
 
 	elseif privrand > 0:
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/privat.jpg"></center>'
-		'There are some very hot girls dancing around you, your feel your pulse rise, their movements are just like an aphrodisiac.'
+		'There are some very hot girls dancing around you. You feel your pulse rise. Their movements are just like an aphrodisiac.'
 
 		act 'Finish':gt 'stripclub', 'forman'
 		if money >= 1000: act 'Order another dance (1,000 <b>₽</b>)':gt 'stripclub', 'privat'
@@ -210,7 +210,7 @@ if $ARGS[0] = 'stol':
 		gs 'stat'
 		minut += 15
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/stripclub4.jpg"></center>'
-		'The girl dances in front of you clearly hoping you''ll give her a tip.'
+		'The girl dances in front of you, clearly hoping you''ll give her a tip.'
 
 		if money >= 50:
 			act 'Give her 50 <b>₽</b>':
@@ -219,7 +219,7 @@ if $ARGS[0] = 'stol':
 				minut += 10
 				money -= 50
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/stripclub6.jpg"></center>'
-				'You stick 50 <b>₽</b> in the strippers panties and she invitingly starts wagging her hips and shaking her tits in front of you, you feel yourself slowly getting excited.'
+				'You stick 50 <b>₽</b> in the strippers panties, and she invitingly starts wagging her hips and shaking her tits in front of you. You feel yourself slowly getting excited.'
 
 				act 'Further':gt 'stripclub', 'stol'
 			end
@@ -229,7 +229,7 @@ if $ARGS[0] = 'stol':
 			*clr & cla
 			pcs_horny -= 5
 			minut += 15
-			'You decided not to give any money to the stripper and look away from her. You feel a little ashamed as your arousal goes down a bit.'
+			'You decide not to give any money to the stripper and look away from her. You feel a little ashamed as your arousal goes down a bit.'
 
 			act 'Further':gt 'stripclub', 'stol'
 		end
@@ -251,29 +251,29 @@ if $ARGS[0] = 'forwoman':
 	if hour ! 2 and zenit > 0 and minifoto = 0:
 		act 'Photograph':
 			minut += 10
-			'As soon as you take the camera out you are immediately approached by a security guard that informs you that there is no photography allowed, you apologize and put the camera back in your purse.'
+			'As soon as you take the camera out, you are immediately approached by a security guard that informs you that there is no photography allowed. You apologize and put the camera back in your purse.'
 		end
 
 	elseif hour ! 2 and minifoto > 0:
 		act 'Photograph':
 			*clr & cla
 			minut += 60
-			'You put on the mini camera, keeping it half hidden by your chest and discreetly start walking through the club.'
+			'You put on the mini camera, keeping it half hidden by your chest, and discreetly start walking through the club.'
 			stripfotorand = rand(0, 10)
 
 			if stripfotorand < 2:
 				minifoto = 0
 				stripdolg = 1
-				'You fail to hide the camera well enough and get spotted out by the security guard. He grabs you by the hand and leads you to his office, already waiting there for you is the owner, he takes your camera, and says that you owe him 50,000 <b>₽</b> for snooping around and until you pay up you are barred from the club.'
+				'You fail to hide the camera well enough and get spotted out by the security guard. He grabs you by the hand and leads you to his office. Already waiting there for you is the owner. He takes your camera and says that you owe him 50,000 <b>₽</b> for snooping around and until you pay up you are barred from the club.'
 
 				act 'Leave':gt 'stripclub', 'start'
 			elseif stripfotorand >= 2 and stripfotorand < 6:
 				shantfoto += 1
-				'You struggle to take a normal picture, the girls surrounding you are moving obscurly while they strip, and the guard is very close so you have to be careful. You finally manage to take a normal picture in the end.'
+				'You struggle to take a normal picture. The girls surrounding you are moving obscurely while they strip, and the guard is very close, so you have to be careful. You finally manage to take a normal picture in the end.'
 
 				act 'Return':gt 'stripclub', 'forwoman'
 			elseif stripfotorand >= 6:
-				'You struggle to take a normal picture, the girls surrounding you are moving obscurly while they strip, and the guard is very close so you decide that you don''t want to risk anything.'
+				'You struggle to take a normal picture. The girls surrounding you are moving obscurely while they strip, and the guard is very close, so you decide that you don''t want to risk anything.'
 
 				act 'Return':gt 'stripclub', 'forwoman'
 			end
@@ -284,7 +284,7 @@ if $ARGS[0] = 'forwoman':
 	if pcs_dancero > 0 and stripwork = 0 and pcs_inhib >= 60:
 		act 'See the manager for work': gt 'stripclub', 'manager'
 	elseif stripwork = 0 and pcs_inhib < 60:
-		'You could ask the manager for a job, but you don''t feel confident enough to be a stripper, you should get more used to showing off your body first.'
+		'You could ask the manager for a job, but you don''t feel confident enough to be a stripper. You should get more used to showing off your body first.'
 	end
 end
 
@@ -293,7 +293,7 @@ if $ARGS[0] = 'stolW':
 	stripguy = 0
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/stripw.jpg"></center>'
-	'There are some athletic guys performing on the stage, the women are all excited, squealing and shoving money down their pants.'
+	'There are some athletic guys performing on the stage. The women are all excited, squealing and shoving money down their pants.'
 
 	if hour < 23:
 		act 'Watch a striptease':
@@ -311,7 +311,7 @@ if $ARGS[0] = 'stolW':
 					money -= 50
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/stripw2.jpg"></center>'
-					'You shove 50 <b>₽</b> down his pants and he leads you over to sit on a chair starts dancing in front of you. Before you know it he is completely naked and you have a great view of his cock. The stripper gropes your chest, trying to get your breasts out from under your blouse.'
+					'You shove 50 <b>₽</b> down his pants, and he leads you over to sit on a chair and starts dancing in front of you. Before you know it, he is completely naked, and you have a great view of his cock. The stripper gropes your chest, trying to get your breasts out from under your blouse.'
 
 					act 'Stop':gt 'stripclub', 'stolW'
 					!!act 'Touch his hand member':gt 'cfnm', 'start'
@@ -323,7 +323,7 @@ if $ARGS[0] = 'stolW':
 				cla
 				pcs_horny -= 5
 				minut += 15
-				'You decided not to give any money to the stripper and look away from him. You feel a little ashamed as your arousal goes down a bit.'
+				'You decide not to give any money to the stripper and look away from him. You feel a little ashamed as your arousal goes down a bit.'
 
 				act 'Further':gt 'stripclub', 'stolW'
 			end
@@ -341,7 +341,7 @@ if $ARGS[0] = 'privsex':
 	$orgasm_or = 'yes'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/sex/priv3.jpg"></center>'
-	'The girls lead you away from the center stage into a private booth. Before you know it they''ve taken off your clothes and have you widely spreading your legs as one of them licks your pussy, bringing you to orgasm, while the other girl continues to caress your body.'
+	'The girls lead you away from the center stage into a private booth. Before you know it, they''ve taken off your clothes and have you widely spreading your legs as one of them licks your pussy, bringing you to orgasm, while the other girl continues to caress your body.'
 
 	act 'Finish':gt 'stripclub', 'forman'
 	act 'More':gt 'stripclub', 'privsex1'
@@ -357,7 +357,7 @@ if $ARGS[0] = 'privsex1':
 	gs 'arousal', 'end'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/sex/priv<<privpicrand>>.jpg"></center>'
-	'The other girl lets out a sigh, "You''ve already made her orgasm... I don''t care I also want in on the action..." as she gently pushes her friend away and begins eating you out. It doesn''t take long before you reach an orgasm once again. As you manage to calm down you notice that you''re all alone in the booth.'
+	'The other girl lets out a sigh, "You''ve already made her orgasm... I don''t care I also want in on the action..." as she gently pushes her friend away and begins eating you out. It doesn''t take long before you reach an orgasm once again. As you manage to calm down, you notice that you''re all alone in the booth.'
 
 	act 'Finish':gt 'stripclub', 'forman'
 end
@@ -368,7 +368,7 @@ if $ARGS[0] = 'stpr1':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/sex/prsex1.jpg"></center>'
 	'You wait for a moment before the security guard walks up to you and tells you to follow him.'
-	'He leads you to a room and as you enter you notice a girl fucking another one with a strap-on. You sit down and enjoy the moans coming from the girl getting fucked for a moment.'
+	'He leads you to a room, and as you enter, you notice a girl fucking another one with a strap-on. You sit down and enjoy the moans coming from the girl getting fucked for a moment.'
 
 	act 'Leave':gt 'stripclub', 'forman'
 
@@ -379,7 +379,7 @@ if $ARGS[0] = 'stpr1':
 		gs 'arousal', 'bj', 10, 'lesbian', 'sub', 'group'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/sex/prsex2.jpg"></center>'
-		'Wanting in on the action, you start to undress and tell the other girl to put on a strap-on. As the girl finishes you kneel in front of them as they stand beside you and rest their strap-ons against your face, you start greedily sucking, licking the remnants of one of the girl''s juices while lubing the other cock.'
+		'Wanting in on the action, you start to undress and tell the other girl to put on a strap-on. As the girl finishes, you kneel in front of them as they stand beside you and rest their strap-ons against your face. You start greedily sucking, licking the remnants of one of the girl''s juices while lubing the other cock.'
 
 		act 'Doggy-Style':
 			*clr & cla
@@ -388,7 +388,7 @@ if $ARGS[0] = 'stpr1':
 			minut -= 10
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/sex/prsex3.jpg"></center>'
-			'The girls chuckle a little as they see you this submisive and after they deemed you''ve sucked enough they push you onto your hands and knees as one of them stands behind you and enters your moist pussy while you continue to suck the other.'
+			'The girls chuckle a little as they see you this submissive, and after they deem you''ve sucked enough, they push you onto your hands and knees as one of them stands behind you and enters your moist pussy while you continue to suck the other.'
 
 			act 'Two Smoking Barrels':
 				*clr & cla
@@ -399,7 +399,7 @@ if $ARGS[0] = 'stpr1':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/sex/prsex4.jpg"></center>'
 				'You look up at the girl in front of you and lustily plead, "I want both of you inside me." It appears they were thinking the same thing as one of the girls quickly slides underneath you, while the other girl standing behind you eases her way into your ass.'
-				'They begin to fuck you in full force and it doesn''t take long before they bring you to orgasm.'
+				'They begin to fuck you in full force, and it doesn''t take long before they bring you to orgasm.'
 
 				act 'Further':
 					*clr & cla
@@ -409,7 +409,7 @@ if $ARGS[0] = 'stpr1':
 					gs 'arousal', 'end'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/sex/prsex5.jpg"></center>'
-					'As you finish, the girls pull out and stand over you and jerk their strap-on until a liquid pours out that tastes much like sperm. The liquid covers your mouth, face and chest.'
+					'As you finish, the girls pull out, stand over you and jerk their strap-ons until a liquid pours out that tastes much like sperm. The liquid covers your mouth, face and chest.'
 
 					act 'Finish':gt 'stripclub', 'forman'
 				end
@@ -426,7 +426,7 @@ if $ARGS[0] = 'stpr2':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/sex/prsex6.jpg"></center>'
 	'You wait for a moment before the security guard walks up to you and tells you to follow him.'
-	'He leads you to a room and as you enter you notice two girls each holding a strap-on in their hands. Without any hesitation they walk over to you and strip you down and await further instructions.'
+	'He leads you to a room, and as you enter, you notice two girls, each holding a strap-on in their hands. Without any hesitation, they walk over to you, strip you down and await further instructions.'
 	gs 'willpower', 'sex', 'force', 'medium'
 	if will_cost <= pcs_willpwr:
 		act 'Have them suck you off (<<will_cost>> Willpower)':
@@ -435,7 +435,7 @@ if $ARGS[0] = 'stpr2':
 			gs 'arousal', 'foreplay', 10, 'lesbian', 'dom', 'group'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/sex/prsex7.jpg"></center>'
-			'You tell one of the girls to hand over her strap-on which you put on. You command the girls to kneel and stick the cock in front of their faces. Not needed a cue they start sucking on it lubing the best they can.'
+			'You tell one of the girls to hand over her strap-on, which you put on. You command the girls to kneel and stick the cock in front of their faces. Not needing a cue, they start sucking on it, lubing it up the best they can.'
 
 			act 'Fuck them':
 				*clr & cla
@@ -445,7 +445,7 @@ if $ARGS[0] = 'stpr2':
 				gs 'stat'
 				prsexrand = rand(9, 13)
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/sex/prsex<<prsexrand>>.jpg"></center>'
-				'After a while you get a bit bored by as you smirk and tell them that you want to fuck them. They eagerly position themselves, ready for you fake cock. You fuck them as your heart desires, eventually stopping after you have your first orgasm, as for them, hmm... you''ve lost count and all you hear is panting.'
+				'After a while, you get a bit bored of this and, smirking, tell them that you want to fuck them. They eagerly position themselves, ready for your fake cock. You fuck them as your heart desires, eventually stopping after you have your first orgasm. As for them, hmm... you''ve lost count, and all you hear is panting.'
 
 				act 'Finish':gt 'stripclub', 'forman'
 			end
@@ -458,7 +458,7 @@ if $ARGS[0] = 'stpr2':
 		gs 'arousal', 'bj', 10, 'lesbian', 'sub', 'group'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/sex/prsex8.jpg"></center>'
-		'You want to get used today so you order them to put on the strap-ons as you get on your knees and joyfully begin sucking them off.'
+		'You want to get used today, so you order them to put on the strap-ons as you get on your knees and joyfully begin sucking them off.'
 
 		act 'Have them fuck you':
 			*clr & cla
@@ -471,7 +471,7 @@ if $ARGS[0] = 'stpr2':
 			prsexrand = rand(14, 19)
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/sex/prsex<<prsexrand>>.jpg"></center>'
 			'You yearn to have your holes filled as you stop sucking them and order them to fill your orifices. The girls quickly position themselves and start fucking you.'
-			'Losing yourselves to the moment it is no longer clear who is the customer and who isn''t, as they fuck you in different positions and orifices, you lose count of how many times you orgasm, at the end you are all quite satisfied.'
+			'Losing yourselves to the moment, it is no longer clear who is the customer and who isn''t. As they fuck you in different positions and orifices, you lose count of how many times you orgasm. In the end, you are all quite satisfied.'
 
 			act 'Finish':gt 'stripclub', 'forman'
 		end

+ 18 - 18
locations/stwork.qsrc

@@ -20,7 +20,7 @@ if $ARGS[0] = 'start':
 	''
 	'There are several <a href="exec:gt ''mirror'', ''start''">mirrors</a> hanging on the wall, where you can <a href="exec:gt ''mirror'', ''brush''">brush</a> your hair, and a selection of <a href="exec:gt ''wardrobe'', ''start''">clothes</a> hanging on rails for the girls to dress in.'
 	'There are some stairs leading to the <a href="exec:gt ''stwork'', ''stripgirl''">stage</a> where you can head out to perform.'
-	'To the side there''s a <a href="exec:stripMir = 0 & gt ''stripclub'', ''start''">steel door</a> which overlooks the back yard and the staff uses as an entrance, to save them from meeting scummy customers. Standing by this entrance, there''s always <a href="exec:gt ''stwork'', ''guard''">security</a> keeping the talent safe.'
+	'To the side, there''s a <a href="exec:stripMir = 0 & gt ''stripclub'', ''start''">steel door</a> which overlooks the back yard and the staff uses as an entrance to save them from meeting scummy customers. Standing by this entrance, there''s always <a href="exec:gt ''stwork'', ''guard''">security</a> keeping the talent safe.'
 	'Near the exit door is a vending machine selling '+iif(money >= 100,'<a href="exec:money -= 100 & gt ''food'', ''snack''">snacks</a>','snacks')+' and a <a href="exec:gt ''beverage'', ''bev_wat''">water cooler</a>, which is heavily used by staff after coming off stage'
 	'A wooden door leads to the <a href="exec:gt ''stwork'', ''toilet''">staff bathroom</a>.'
 	*nl
@@ -101,19 +101,19 @@ if $ARGS[0] = 'start':
 						act 'Go see the manager':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/stripinspection.jpg"></center>'
-							'Before going on the stage you go see the manager in his office for your inspection.'
-							'"Take off your clothes." He tells you matter of factly.'
+							'Before going on stage, you go see the manager in his office for your inspection.'
+							'"Take off your clothes," he tells you matter of factly.'
 							'When you''re done undressing, he walks up to you and inspects you closely.'
 							if pcs_sweat < 20:
-								'"Good, you have a clean sent. That is very important in this business."'
+								'"Good, you have a clean scent. That is very important in this business."'
 								'He briefly runs his hand over your legs.'
 								if pcs_leghair <= 3:
 									'"Smooth legs. Very good."'
-									'He walks around you looking you up and down from every side.'
+									'He walks around you, looking you up and down from every side.'
 									if fingal <= 0:
 										'"No bruises. Good. The better you look, the easier it is to make money once you are on that stage."'
 										'"And the last thing. I need to check if you''ve rid yourself of all your pubic hair."'
-										'"I suppose that''s a reasonable thing to check." You think to yourself as you show him your naked pussy.'
+										'"I suppose that''s a reasonable thing to check," you think to yourself as you show him your naked pussy.'
 										'He puts his hand right above your pussy lips and slowly rubs the skin there, taking a bit longer than he did on your legs.'
 										'You feel your pussy get a bit wet from his touch and hope that he doesn''t notice.'
 										gs 'arousal', 'foreplay', 2
@@ -121,12 +121,12 @@ if $ARGS[0] = 'start':
 !! This allows different pubic styles but anything from small bush up is still not permitted.
 										if (pubestyle = 1 and pcs_pubes <= 3) or lashair = 1:
 											strippermission = 1
-											'"That''s very smooth. Looks like you are ready to get on the stage. You can get to work." He says and ushers you out of his office.'
+											'"That''s very smooth. Looks like you are ready to get on the stage. You can get to work," he says and ushers you out of his office.'
 											stpredmet = 3
 											act 'Perform': gt 'stwork2', 'strip'
 										elseif (pubestyle >= 2 and pubestyle <=7) and pcs_pubes <= 11:
 											strippermission = 1
-											'"Very cute pubic hair, I''m sure the customers will appreciate it, now get on stage. You can work" He says and ushers you out of his office.'
+											'"Very cute pubic hair, I''m sure the customers will appreciate it, now get on stage. You can work," he says and ushers you out of his office.'
 											stpredmet = 3
 											act 'Perform': gt 'stwork2', 'strip'
 										else
@@ -142,7 +142,7 @@ if $ARGS[0] = 'start':
 									act 'Go to the dressing room': gt 'stwork', 'start'
 								end
 							else
-								'"Damn it <<$pcs_stagename>>, you stink. Grab a shower we can''t have the club smelling like a locker room."'
+								'"Damn it <<$pcs_stagename>>, you stink. Grab a shower. We can''t have the club smelling like a locker room."'
 								act 'Go to the dressing room': gt 'stwork', 'start'
 							end
 						end
@@ -152,7 +152,7 @@ if $ARGS[0] = 'start':
 						end
 					end
 				else
-					'You aren''t allowed on stage, because of the black eye.'
+					'You aren''t allowed on stage because of your black eye.'
 				end
 			else
 				'Nobody wants to see a stripper with hairy legs and untrimmed pubes. Have a shave before you go on stage!'
@@ -201,17 +201,17 @@ if $ARGS[0] = 'stripgirl':
 	gs 'stat'
 	striptalkrand = rand(0, 10)
 
-	if striptalkrand = 0:$striptalk = 'Have you heard about that new girl? She''s really good-looking and all, but she got booed off-stage, apperantly she was worthless.'
+	if striptalkrand = 0:$striptalk = 'Have you heard about that new girl? She''s really good-looking and all, but she got booed off-stage. Apparently, she was worthless.'
 	if striptalkrand = 1:$striptalk = 'I''m telling you, girls with tattoos are a huge turn-on to men.'
-	if striptalkrand = 2:$striptalk = 'Working the pole is much more profitable than just dancing, it''s easier to excite the customer, but it also demands more from the person doing it.'
+	if striptalkrand = 2:$striptalk = 'Working the pole is much more profitable than just dancing. It''s easier to excite the customer, but it also demands more from the person doing it.'
 	if striptalkrand = 3:$striptalk = 'Phew, you really have to leave it all out on the stage, getting back all sweaty, with disheveled hair and makeup ruined. The cost in cosmetics is enough to bankrupt you.'
 	if striptalkrand = 4:$striptalk = 'You know what, those private dances might be guaranteed money, but the real cash is in the extras.'
-	if striptalkrand = 5:$striptalk = 'Remember that ugly girl? She got on stage and got booed off the stage by the customers, but as soon as she started working the pole, their jaws dropped, and she made a fortune in tips.'
+	if striptalkrand = 5:$striptalk = 'Remember that ugly girl? She got on stage and got booed hard by the customers, but as soon as she started working the pole, their jaws dropped, and she made a fortune in tips.'
 	if striptalkrand = 6:$striptalk = 'Why doesn''t the manager ever says if it''s a male or female day? I recently rushed to work, even broke a nail, then I get here and there''s these bears up on stage. Had to turn around and head back home.'
-	if striptalkrand = 7:$striptalk = 'That cute security guard was telling me about the problems the girls face with this job. Half of them turn up whores in the end, the money is better.'
+	if striptalkrand = 7:$striptalk = 'That cute security guard was telling me about the problems the girls face with this job. Half of them become whores in the end, the money is better.'
 	if striptalkrand = 8:$striptalk = 'There was a fat woman trying to dance on the pole, she fell face first on the floor. I thought she had knocked herself out, you should have seen the black eye she got.'
-	if striptalkrand = 9:$striptalk = 'Recently we had a comedian working here. She was a pretty little thing and she danced well, but it''s not with jokes you earn tips here.'
-	if striptalkrand = 10:$striptalk = 'I heard about clubs abroad where the tips are so good, that the strippers pay for the right to work there.'
+	if striptalkrand = 9:$striptalk = 'Recently, we had a comedian working here. She was a pretty little thing, and she danced well, but it''s not with jokes you earn tips here.'
+	if striptalkrand = 10:$striptalk = 'I heard about clubs abroad where the tips are so good that the strippers pay for the right to work there.'
 
 	'The girls are doing their makeup and hair in the mirror, laughing and gossiping.'
 	'<<$striptalk>>'
@@ -222,7 +222,7 @@ end
 if $ARGS[0] = 'guard':
 	*clr & cla
 	gs 'stat'
-	'A bored looking, security guard stands by the door. Seeing you he lazily nods, "Hello <<$pcs_nickname>>."'
+	'A bored looking security guard stands by the door. Seeing you, he lazily nods, "Hello <<$pcs_nickname>>."'
 
 	act 'Move away':gt 'stwork', 'start'
 end
@@ -239,7 +239,7 @@ if $ARGS[0] = 'toilet':
 	'You enter a dirty and smelly staff bathroom that''s probably never been cleaned.'
 	'There is no mirror, only a grimy shower, toilet, and basin'
 	*nl
-	'Your razor will last <b><<stanok>></b> more shaves. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
+	'Your razor will last <b><<stanok>></b> more ' + iif(stanok = 1, 'shave', 'shaves') + '. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
 
 	act 'Leave the bathroom':gt 'stwork', 'start'
 !	if kosmetica >= 3:

+ 31 - 31
locations/stwork2.qsrc

@@ -9,7 +9,7 @@ if $ARGS[0] = 'strip':
 	if striptip < 10:$pubhot = 'booing you, you hear someone shout, "Get this stupid cow off the stage."'
 	if striptip >= 10 and striptip < 20:$pubhot = 'clearly showing discontent with your dancing. They want you off the stage as quickly as possible.'
 	if striptip >= 20 and striptip < 30:$pubhot = 'clearly looking bored, drinking and talking among themselves, ignoring you.'
-	if striptip >= 30 and striptip < 60:$pubhot = 'sometime looking at you, smiling and enjoy the performance.'
+	if striptip >= 30 and striptip < 60:$pubhot = 'sometimes looking at you, smiling and enjoy the performance.'
 	if striptip >= 60 and striptip < 70:$pubhot = 'watching you with genuine interest while conversing with each other over their beers.'
 	if striptip >= 70 and striptip < 80:$pubhot = 'having their attention focused on you.'
 	if striptip >= 80 and striptip < 90:$pubhot = 'with strained faces, sweat beading on their foreheads, their arousal clearly showing.'
@@ -50,10 +50,10 @@ if $ARGS[0] = 'strip':
 							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/stripclo' + rand(4,5) + '.jpg"></center>'
 							if custboo = 0:
 								pcs_mood += 5
-								'Urged on by the audience you take off your blouse and let it drop to the stage while you keep teasing them.'
+								'Urged on by the audience, you take off your blouse and let it drop to the stage while you keep teasing them.'
 							else
 								pcs_mood -= 5
-								'Ignoring the comments from the audience you take off your blouse and let it drop to the stage while you keep teasing them.'
+								'Ignoring the comments from the audience, you take off your blouse and let it drop to the stage while you keep teasing them.'
 							end
 							gs 'stwork2', 'custboo'
 							gs 'stat'
@@ -62,10 +62,10 @@ if $ARGS[0] = 'strip':
 								'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/stripclo' + rand(6,7) + '.jpg"></center>'
 								if custboo = 0:
 									pcs_mood += 5
-									'The positive responses make you smile even broader as you unzip your skirt and let it drop to your ankles before kicking it off and laying down on the stage, rolling around and looking several customers straight in the eyes. Some of them throw some bills your way and you take care to pay them some extra attention.'
+									'The positive responses make you smile even broader as you unzip your skirt and let it drop to your ankles before kicking it off and lying down on the stage, rolling around and looking several customers straight in the eyes. Some of them throw some bills your way, and you take care to pay them some extra attention.'
 								else
 									pcs_mood -= 5
-									'The negative comments make you feel a bit uncomfortable as you unzip your skirt and let it drop to your ankles before kicking it off and laying down on the stage, rolling around and looking several customers straight in the eyes.'
+									'The negative comments make you feel a bit uncomfortable as you unzip your skirt and let it drop to your ankles before kicking it off and lying down on the stage, rolling around and looking several customers straight in the eyes.'
 								end
 								gs 'stwork2', 'custboo'
 								gs 'stat'
@@ -75,15 +75,15 @@ if $ARGS[0] = 'strip':
 										'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/stripclo' + rand(9,15) + '.jpg"></center>'
 										if custboo = 0:
 											pcs_mood += 5
-											'The men in the first row go wild when you take off your bra. Shouting "Show your pussy! Show your pussy!"'
-											'As you hook your fingers into your panties a few customers start throwing money on the stage. You walk over to one of them and bend over, giving him a great view of your ass as you pull your panties off.'
+											'The men in the first row go wild when you take off your bra, shouting "Show your pussy! Show your pussy!"'
+											'As you hook your fingers into your panties, a few customers start throwing money on the stage. You walk over to one of them and bend over, giving him a great view of your ass as you pull your panties off.'
 											'After that you dance as seductively as you can, trying to spread your attention over the audience, but paying extra attention to the ones who give you more money.'
 										else
-											'The negative comments make you feel a bit uncomfortable as you take off your bra, but as soon as soon as they can see your tits the audience becomes a lot more appreciative.'
-											'This gives you the courage to take off your panties as well. Once you are naked some customers start throwing money on the stage.'
+											'The negative comments make you feel a bit uncomfortable as you take off your bra, but as soon as soon as they can see your tits, the audience becomes a lot more appreciative.'
+											'This gives you the courage to take off your panties as well. Once you are naked, some customers start throwing money on the stage.'
 											'You dance as seductively as you can, trying to spread your attention over the audience, but paying extra attention to the ones who give you more money.'
 										end
-										'When the music starts winding down you collect your tips and pick up your clothes, waving a few kisses to your audience before going backstage again.'
+										'When the music starts winding down, you collect your tips and pick up your clothes, blowing a few kisses to your audience before going backstage again.'
 										gs 'exhibitionism', 3
 										stprivatechance = 1
 										gs 'stat'
@@ -94,9 +94,9 @@ if $ARGS[0] = 'strip':
 										*clr & cla
 										'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/stripclo8.jpg"></center>'
 										pcs_mood -= 5
-										'Not sure what you could do to please your audience you take off your bra and toss it with the rest of your clothes. Even this doesn''t seem to get any positive responses.'
-										'All you can hear is mockery as you try to ignore them and continue your act. The cutting remarks keep coming however and soon you are close to tears.'
-										'Before the music stops you start collecting your meager tips and clothes and flee backstage.'
+										'Not sure what you could do to please your audience, you take off your bra and toss it with the rest of your clothes. Even this doesn''t seem to get any positive responses.'
+										'All you can hear is mockery as you try to ignore them and continue your act. The cutting remarks keep coming however, and soon you are close to tears.'
+										'Before the music stops, you start collecting your meager tips and clothes and flee backstage.'
 										gs 'exhibitionism', 1
 										stprivatechance = 0
 										gs 'stat'
@@ -114,10 +114,10 @@ if $ARGS[0] = 'strip':
 							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/stripund' + rand(4,8) + '.jpg"></center>'
 							if custboo = 0:
 								pcs_mood += 5
-								'Urged on by the audience you slowly take off your bra and let it drop to the stage while you keep teasing them.'
+								'Urged on by the audience, you slowly take off your bra and let it drop to the stage while you keep teasing them.'
 							else
 								pcs_mood -= 5
-								'Ignoring the comments from the audience you slowly take off your bra and let it drop to the stage while you keep teasing them.'
+								'Ignoring the comments from the audience, you slowly take off your bra and let it drop to the stage while you keep teasing them.'
 							end
 							'You even perform a few easy moves on the pole.'
 							gs 'stwork2', 'custboo'
@@ -128,7 +128,7 @@ if $ARGS[0] = 'strip':
 								'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/stripund' + rand(9,12) + '.jpg"></center>'
 								if custboo = 0:
 									pcs_mood += 5
-									'The positive responses make you smile even broader as you playfully drop your panties to your ankles before kicking them off. You look several customers straight in the eyes as you do so. Some of them throw some bills your way and you take care to pay them some extra attention.'
+									'The positive responses make you smile even broader as you playfully drop your panties to your ankles before kicking them off. You look several customers straight in the eyes as you do so. Some of them throw some bills your way, and you take care to pay them some extra attention.'
 								else
 									pcs_mood -= 5
 									'The negative comments make you feel a bit uncomfortable as you playfully drop your panties to your ankles before kicking them off. You look several customers straight in the eyes as you do so.'
@@ -142,13 +142,13 @@ if $ARGS[0] = 'strip':
 										'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/stripund' + rand(13,14) + '.jpg"></center>'
 										if custboo = 0:
 											pcs_mood += 5
-											'The men in the first row go wild as soon as you are fully nude. Shouting out their approval. Several of them are tipping generously.'
+											'The men in the first row go wild as soon as you are fully nude, shouting out their approval. Several of them are tipping generously.'
 											'You dance as seductively as you can, trying to spread your attention over the audience, but paying extra attention to the ones who give you more money.'
 										else
-											'The negative comments make you feel a bit uncomfortable. Not wanting to give up you put all your effort into your dancing. This seems to please some of them and they start tipping you after all.'
+											'The negative comments make you feel a bit uncomfortable. Not wanting to give up, you put all your effort into your dancing. This seems to please some of them, and they start tipping you after all.'
 											'You dance as seductively as you can, trying to spread your attention over the audience, but paying extra attention to the ones who give you more money.'
 										end
-										'When the music starts winding down you collect your tips and pick up your clothes, waving a few kisses to your audience before going backstage again.'
+										'When the music starts winding down, you collect your tips and pick up your clothes, blowing a few kisses to your audience before going backstage again.'
 										gs 'exhibitionism', 3
 										stprivatechance = 1
 										gs 'stat'
@@ -160,8 +160,8 @@ if $ARGS[0] = 'strip':
 										'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/stripund' + rand(13,14) + '.jpg"></center>'
 										pcs_mood -= 5
 										'Even being completely naked doesn''t seem to get any positive responses.'
-										'All you can hear is mockery as you try to ignore them and continue your act. The cutting remarks keep coming however and soon you are close to tears.'
-										'Before the music stops you start collecting your meager tips and clothes and flee backstage.'
+										'All you can hear is mockery as you try to ignore them and continue your act. The cutting remarks keep coming however, and soon you are close to tears.'
+										'Before the music stops, you start collecting your meager tips and clothes and flee backstage.'
 										gs 'exhibitionism', 3
 										stprivatechance = 0
 										gs 'stat'
@@ -194,25 +194,25 @@ if $ARGS[0] = 'strip':
 				
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/strippole.jpg"></center>'
-				'You step up on the stage and the music starts. You grab hold of the pole and acrobatically slide around it while you teasingly undress.'
+				'You step up on the stage, and the music starts. You grab hold of the pole and acrobatically slide around it while you teasingly undress.'
 
 				if pcs_weight > pcs_hgt - 90:
 					vesrand = rand(0, 100)
 
 					if vesrand >= 75:
-						'Performing another trick on the pole you can not support your weight and fall flat to the floor. The crowd laughs, "Hey, hippopotamus, stomp back to the swamp where you came from."'
+						'Performing another trick on the pole, you can not support your weight and fall flat on your face. The crowd laughs, "Hey, hippopotamus, stomp back to the swamp where you came from."'
 						striptip -= 15
 						fingalrand = rand(0, 100)
 						if fingalrand >= 75:
 							fingal += rand(2, 5)
 							gs 'pain', 4, 'cheeks', 'Slam'
 							gs 'stat'
-							'As you fall, you hit the floor really hard and you can feel a bruise forming on your face.'
+							'As you fall, you hit the floor really hard, and you can feel a bruise forming on your face.'
 						end
 					end
 					if vesrand >= 50:
 						striptip -= rand(5, 10)
-						'You overhear some of the customers right next to the stage, "Look at her fat hanging out. Her gut and ass shaking like jelly."'
+						'You overhear some of the customers right next to the stage, "Look at her fat hanging out. Her gut and ass are shaking like jelly."'
 					end
 				end
 
@@ -250,7 +250,7 @@ if $ARGS[0] = 'custboo':
 			custbooing += 1
 			resprand = rand(0,3)
 			if resprand = 0:
-				'You overhear some of the customers right next to the stage, "Look at her fat hanging out. Her gut and ass shaking like jelly."'
+				'You overhear some of the customers right next to the stage, "Look at her fat hanging out. Her gut and ass are shaking like jelly."'
 			elseif resprand = 1:
 				'You overhear some of the customers right next to the stage, "What a cow. Someone should roll her off the stage."'
 			elseif resprand = 2:
@@ -309,7 +309,7 @@ if $ARGS[0] = 'tipcalculator':
 		end
 	else
 		if rand(0,15) = 0:
-			'The customers were mesmerized by your dancing but no one tipped you.'
+			'The customers were mesmerized by your dancing, but no one tipped you.'
 		else
 			paymoneyrand = rand(10,100) * 5
 			money += paymoneyrand
@@ -334,7 +334,7 @@ if $ARGS[0] = 'privatdance':
 
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/privatstrip.jpg"></center>'
-	'You walk over to a smaller private room where you put on some music before the customer walks in. As the customer walks in you tell him to sit down and enjoy the show. You spend half an hour showing off your dancing skills, and every time you grind against him you can feel his rock hard cock.'
+	'You walk over to a smaller private room where you put on some music before the customer walks in. As the customer walks in, you tell him to sit down and enjoy the show. You spend half an hour showing off your dancing skills, and every time you grind against him, you can feel his rock hard cock.'
 
 	stprrand = rand(0,15)
 	if stprrand = 0:
@@ -351,7 +351,7 @@ end
 if $ARGS[0] = 'pr1':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/pr1.jpg"></center>'
-	'Just as you start to dance, you hear a knock on the door. His friends are waiting outside wanting to join in on the dance. Feeling trapped you agree and start dancing, after a while they tell you to stop and ask if you''re willing to go all the way for 4000 <b>₽</b>.'
+	'Just as you start to dance, you hear a knock on the door. His friends are waiting outside wanting to join in on the dance. Feeling trapped, you agree and start dancing. After a while, they tell you to stop and ask if you''re willing to go all the way for 4000 <b>₽</b>.'
 
 	act 'Reject them':gt 'stwork', 'start'
 
@@ -378,7 +378,7 @@ end
 if $ARGS[0] = 'pr2':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/pr2.jpg"></center>'
-	'The man you''re dancing is mesmerized by you and can''t stop touching himself, after a while he asks you if he can fuck you for 2000 <b>₽</b>.'
+	'The man you''re dancing for is mesmerized by you and can''t stop touching himself. After a while, he asks you if he can fuck you for 2000 <b>₽</b>.'
 	
 	gs 'willpower', 'sex', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -404,7 +404,7 @@ end
 if $ARGS[0] = 'pr3':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/pr3.jpg"></center>'
-	'It''s a bit different dancing for a woman, it''s not often you have the pleasure doing that so you''re feeling a bit more frisky than usual. As you finish the dance she gives you an kiss and you start making out. She stops and offers you 1000 <b>₽</b> to continue on.'
+	'It''s a bit different dancing for a woman. It''s not often you have the pleasure of doing that, so you''re feeling a bit more frisky than usual. As you finish the dance, she gives you a kiss, and you start making out. She stops and offers you 1000 <b>₽</b> to continue on.'
 
 	gs 'willpower', 'sex', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:	

+ 1 - 1
locations/subkid.qsrc

@@ -19,7 +19,7 @@ if kid > 0:
 		elseif kidage[kidI] >= 7 and kidage[kidI] < 18 and ($locclass = 'livingr' or $locclass = 'singleroom') and ( hour >= 7 and hour <= 9):
 			'<a href="exec:gt ''kid'',''start'' "><<$kidname[kidI]>> is getting ready for school.</a>'
 		elseif kidage[kidI] >= 7 and kidage[kidI] < 18 and ($locclass = 'livingr' or $locclass =  'singleroom' or $locclass = 'bedr') and ( hour >= 9 and hour <= 16):
-			'<<$kidname[kidI]>> is at school'
+			'<<$kidname[kidI]>> is at school.'
 		elseif kidage[kidI] >= 7 and kidage[kidI] < 18 and ($locclass = 'livingr' or $locclass = 'singleroom') and ( hour >= 16 and hour <= 18):
 			'<a href="exec:gt ''kid'', ''start''"><<$kidname[kidi]>> is working on homework.</a>'
 		elseif kidage[kidI] >= 7 and kidage[kidI] < 18 and ($locclass = 'livingr' or $locclass = 'singleroom') and ( hour >= 18 and hour <= 21):

+ 33 - 33
locations/succubus.qsrc

@@ -53,11 +53,11 @@ end
 
 if $ARGS[0] = 'firsttime':
 	if scfwon = 1:
-		'As the exhilaration from the fight won and the fear of what could have happened fully sets in time seems to stop.'
+		'As the exhilaration from the fight won and the fear of what could have happened fully sets in, time seems to stop.'
 	elseif scfwon = 0:
-		'As the fear of what is about to happen to you fully sets in time seems to stop.'	
+		'As the fear of what is about to happen to you fully sets in, time seems to stop.'	
 	end
-	'You feel, from the same core of power that has been in you since you embraced fairy''s energy, something start to...'
+	'You feel, from the same core of power that has been in you since you embraced the fairy''s energy, something start to...'
 	''
 	'<i>uncoil...</i>'
 	''
@@ -100,8 +100,8 @@ if $ARGS[0] = 'RapistFight':
 	cls
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/pc/body/succubusself.jpg"></center>'
-	'Instinctively you are barely aware of what causes your power to reach out and take hold of your would-be rapist''s mind.'
-	'You see fear fill his eyes even as lust fills his loins and you feel his mind fighting your hold.'
+	'Instinctively, you are barely aware of what causes your power to reach out and take hold of your would-be rapist''s mind.'
+	'You see fear fill his eyes even as lust fills his loins, and you feel his mind fighting your hold.'
 	pcs_horny = 100
 	act 'Continue':
 		cla
@@ -140,7 +140,7 @@ if $ARGS[0] = 'RapistFight':
 			act 'Continue':
 				cla
 				'Finally, when your instincts tell you he has nothing left to give, you get off him and fix your clothes.'
-				'As you make ready to leave, you look down upon your would-be-rapist-turned-meal as he lays there utterly exhausted and wonder if this experience will discourage him from such activities in the future...'
+				'As you make ready to leave, you look down upon your would-be-rapist-turned-meal as he lies there utterly exhausted and wonder if this experience will discourage him from such activities in the future...'
 				guy += 1
 				pcs_horny = 0
 				orgasm += 1 + scfeed
@@ -157,7 +157,7 @@ if $ARGS[0] = 'RapistFight':
 		else
 			''
 			'And you feel his fear overcome his lust and your hold...'
-			'By the time you pull yourself back to the physical world he is long gone.'
+			'By the time you pull yourself back to the physical world, he is long gone.'
 			minut +=5
 			gs 'stat'
 			act 'Continue': gt $loc, $loc_arg
@@ -174,17 +174,17 @@ if $ARGS[0] = 'pavResfeed':
 	*clr
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/dk_night.jpg"></center>'
 	'The disco is in full swing, which means a lot of adolescents going to and from the community center. You find a spot down the street from the community center to lie in wait for your prey.'
-	'You hide for a few minutes watching groups of students pass you by as you wait for a lone victim to pounce on. You lie in wait for almost thirty minutes, thinking about the meal ahead, your hand finding its way between your legs a few times.'
+	'You hide for a few minutes, watching groups of students pass you by as you wait for a lone victim to pounce on. You lie in wait for almost thirty minutes, thinking about the meal ahead, your hand finding its way between your legs a few times.'
 	act 'Continue':
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/pc/body/succubusself.jpg"></center>'
-		'Just as you were starting to think no one would walk by alone, a young guy in a tracksuit walks right past you into the bushes. He pulls his pants down to take a piss.
-		"Wow, what do we have here?" you say from the darkness causing him to jump.
+		'Just as you are starting to think no one would walk by alone, a young guy in a tracksuit walks right past you into the bushes. He pulls his pants down to take a piss.
+		"Wow, what do we have here?" you say from the darkness, causing him to jump.
 		"Who the hell is there," he says as he pulls up his pants and searches for you in vain.
 		"Exposing yourself in public? What a pervert!"
 		"Says the girl watching. Where are you?"
-		"Right here," you say as sneak up behind him and reach around and stick a hand into his pants. You spend some time groping him and trying to find out what he is packing.
+		"Right here," you say as you sneak up behind him and reach around and stick a hand into his pants. You spend some time groping him and trying to find out what he is packing.
 		"Find something you like?" he asks in a cocky tone. You don''t know why. He doesn''t have anything that impressive down there.'
 		act 'Warm him up':
 			*clr & cla
@@ -192,8 +192,8 @@ if $ARGS[0] = 'pavResfeed':
 			'"Meh, it will have to do," you tell him. He drags you into the bushes and pushes you down to your knees. You decide to play along for now and place your lips around his cock and work your magic. Literally. You give him the kind of blowjob only a succubus like yourself can give. It isn''t long before he cums in your mouth. You swallow it, savoring the appetizer before the main course with a smile on your face. He grabs your chin and looks at you with contempt.
 			"What a slut, if you enjoy cum that much, maybe I should call my friends to give you all you can eat. Would you like that, whore?"'
 			'<center><img <<$set_imgh>> src="images/pc/body/succubusself.jpg"></center>'
-			'Your contented smile turns into a confident grin as you pull the guy''s legs out from under him. He tries to get up, but you push him back down with unnatural strength. You let instict take over as you undress and lower yourself on top of his hardening member. You ride him hard, trying to milk him as fast as you can. He cums once, then twice, then three times, then more. He begs you to stop, but you aren''t listening.'
-			'Eventually he runs out of energy to give, and you lift yourself off of him. He lies on the ground unconscious with a pained expression on his face. Now to make him pay for that whore comment. You check his pockets for valuables and find a cellphone and some loose change.'
+			'Your contented smile turns into a confident grin as you pull the guy''s legs out from under him. He tries to get up, but you push him back down with unnatural strength. You let instinct take over as you undress and lower yourself on top of his hardening member. You ride him hard, trying to milk him as fast as you can. He cums once, then twice, then three times, then more. He begs you to stop, but you aren''t listening.'
+			'Eventually, he runs out of energy to give, and you lift yourself off of him. He lies on the ground unconscious with a pained expression on his face. Now to make him pay for that whore comment. You check his pockets for valuables and find a cellphone and some loose change.'
 			'You pocket the money and crush the phone in your hand. Then, after making sure the coast is clear, you drag him back to the sidewalk and leave him there, unconscious with no pants for someone to find. He won''t remember this punishment or most of the night, but you sure had fun.'
 			money += rand(250,500)
 			scfeed = succublvl + rand(1,4)
@@ -226,10 +226,10 @@ if $ARGS[0] = 'tatianaask':
 	if sucpcinfo = 2:
 		minut += 10
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/lab/event/main1.jpg"></center>'
-		'You undress and lie down on the couch and Tatiana begins to examine you.'
+		'You undress and lie down on the couch, and Tatiana begins to examine you.'
 		'This time, as she uses her charms and strange devices, you actually feel her power reach into you and move around inside, poking and prodding.'
-		if succubusQW = 4: 'Something in you panics at this and the fear overtakes your mind.'
-		'Distantly you hear Tatiana mutter, "Huh, what''s this?" and her power pokes <<$sucself1>>.'
+		if succubusQW = 4: 'Something in you panics at this, and the fear overtakes your mind.'
+		'Distantly, you hear Tatiana mutter, "Huh, what''s this?" and her power pokes <<$sucself1>>.'
 		$sclocrt = 'succubus' & $scargrt = 'tatianaask'
 		$scsubloc = 'tatianasex' & scpopt = 1
 		sucpcinfo = 3
@@ -251,7 +251,7 @@ if $ARGS[0] = 'tatianaask':
 	minut += 10
 	'<center><img <<$set_imgh>> src="images/system/intro/shared/karinpre.jpg"></center>'
 	if sucpcinfo >= 4 and ARGS[1] = 0:
-		'"You are a Succubus. Now, the succubae are not demons that impression is a byproduct of the masking spell; they are instead a type of Fae, like that Fairy you told me about, and they are native to this plane of existence. As Fae, Succubae have nothing to do with "souls", but they do feed on the energy released during sex. The most efficient means of getting this energy is semen taken internally, but a lot is gained by lesbian orgasm if the Succubus is in sexual contact with the woman as she cums."'
+		'"You are a Succubus. Now, the Succubae are not demons, that impression is a byproduct of the masking spell; they are instead a type of Fae, like that Fairy you told me about, and they are native to this plane of existence. As Fae, Succubae have nothing to do with "souls", but they do feed on the energy released during sex. The most efficient means of getting this energy is semen taken internally, but a lot is gained by lesbian orgasm if the Succubus is in sexual contact with the woman as she cums."'
 		if tatisucsex ! 0:
 			'She then gives you a coy smile and says, "I can tell you that sex with a willing Succubus is an <i>amazing experience</i>."'
 		else
@@ -265,8 +265,8 @@ if $ARGS[0] = 'tatianaask':
 	end
 	if sucpcinfo >= 5 and (ARGS[1] = 0 or ARGS[1] = 1):
 		minut += 5
-		'"Succubae can exceed normal human limitations in a way similar to the way Gustav does, but unlike Gustav since they are Fae the masking spell ignores them.'
-		'"They automatically store sexual energy in excess of what they need to survive internally and when this energy builds up enough, let''s call that point 100 units, their body will automatically use this energy to improve itself; increasing their physical and mental abilities, keeping itself young looking, and providing a reserve in case she can''t find food.'
+		'"Succubae can exceed normal human limitations in a way similar to the way Gustav does, but unlike Gustav, since they are Fae, the masking spell ignores them.'
+		'"They automatically store sexual energy in excess of what they need to survive internally, and when this energy builds up enough, let''s call that point 100 units, their bodies will automatically use this energy to improve themselves; increasing their physical and mental abilities, keeping themselves young looking, and providing a reserve in case they can''t find food.'
 		'"While lower level Succubae lose any energy not used for improvements, higher level Succubae can store this unused energy in excess of that 100 unit mark.'
 		if sucskill >= 2:
 			'"As you know, they can learn to store energy before their body uses it as well as increase their storage capacity, as long as they have some reserves."'
@@ -276,13 +276,13 @@ if $ARGS[0] = 'tatianaask':
 	end
 	if sucpcinfo >= 6 and (ARGS[1] = 0 or ARGS[1] = 2):
 		if sucskill >= 3:
-			'"Also learning, as you have to be more efficient with the sexual energy, increasing the amount of energy they have available for survival and storage."'
+			'"They also learned, as you have, to be more efficient with the sexual energy, increasing the amount of energy they have available for survival and storage."'
 		else
 			minut += 5
-			'"They have found, after what she described as a "multiday sex bender", that a Succubus can learn to be more efficient with the energy; increasing the amount of energy they have available for survival and storage. She then worked out how they did it and passed that to me. In order for this training to not take several days of non-stop sex, I''ll need to buy several components worth 5000 <b>₽</b> and I will need 7 days to build up my own power reserves and you will need to have at least 3 days of reserve and have at least 100 units of stored energy.'
-			'"Even with these preparations the training is still going to take 8 to 10 hours of... Non... Stop... Sex..."'
+			'"They have found, after what she described as a "multiday sex bender", that a Succubus can learn to be more efficient with the energy, increasing the amount of energy they have available for survival and storage. She then worked out how they did it and passed that to me. In order for this training to not take several days of non-stop sex, I''ll need to buy several components worth 5000 <b>₽</b> and 7 days to build up my own power reserves, and you will need to have at least 3 days of reserve and at least 100 units of stored energy.'
+			'"Even with these preparations, the training is still going to take 8 to 10 hours of... Non... Stop... Sex..."'
 			if tatisucsex <= 0:
-				'She says those last three words in a tone that is equal parts anticipation and trepidation and the look in her eyes mirror this.'
+				'She says those last three words in a tone that is equal parts anticipation and trepidation, and the look in her eyes mirror this.'
 			else
 				'She says those last three words in a tone that is pure seduction with a look that is equal parts anticipation and lust.'
 !!				Hopefully can add an arousal call here
@@ -291,12 +291,12 @@ if $ARGS[0] = 'tatianaask':
 	end
 	if sucpcinfo >= 7 and (ARGS[1] = 0 or ARGS[1] = 3):
 		minut += 5
-		'"Succubae are somewhat territorial when hungry, but when sated the impulse is weak enough to suppress easily. They seem to have established neutral territories in the flesh-pots of the world, like Amsterdam, Morocco, and Las Vegas. Places like that are claimed by not one Succubus, instead groups of them have made their homes there.'
+		'"Succubae are somewhat territorial when hungry, but when sated, the impulse is weak enough to suppress easily. They seem to have established neutral territories in the flesh-pots of the world, like Amsterdam, Morocco, and Las Vegas. Places like that are not claimed by one Succubus, instead groups of them have made their homes there.'
 		'"A Succubae''s body can learn to expend a bit of power to accommodate nearly any size of... implement." She gives you a smug grin with that.'
 		if sucskill < 4: 'And I can teach you, just go get the biggest dildo they sell at that shop down the street, then bring it and 100 units of stored energy back here.'
 	end
 	if ARGS[1] = 0:
-		'"They likely have other abilities and weaknesses, but the few succubae I have encountered were not that willing to part with information, though I have put out requests for more information from my contacts.'
+		'"They likely have other abilities and weaknesses, but the few Succubae I have encountered were not that willing to part with information, though I have put out requests for more information from my contacts.'
 		'"As far as I know, you are the only Succubus in the region."'
 		act 'Ask if she knows more':
 			cla
@@ -323,7 +323,7 @@ if $ARGS[0] = 'tatianasex':
 	if sucpcinfo < 4:
 		tatisucsex -= 2
 		'Your power reaches through the connection to Tatiana, enflaming her lust even as <<$sucself1>> grabs ahold of her power.'
-		'At this point you gain some control back and cause her power to cycle through you, as <<$sucself1>> cycles through her making her passion and yours move together.'
+		'At this point, you gain some control back and cause her power to cycle through you, as <<$sucself1>> cycles through her making her passion and yours move together.'
 		'Tatiana quickly strips down and moves between your legs...'
 	else
 		'You take control of <<$sucself1>> and, as you softly kiss her, <<$sucself1>> gently flows into Tatiana even as you coax her power to flow into you.'
@@ -341,13 +341,13 @@ if $ARGS[0] = 'tatianasex':
 			cls
 			cla
 			'<center><img <<$set_imgh>> src="images/characters/city/tatiana/sex/karinsucsex2.jpg"></center>'
-			'You pleasure each other for some time, orgasming together and then at some point you flip over.'
+			'You pleasure each other for some time, orgasming together, and then at some point you flip over.'
 			act 'Continue':
 				if sucpcinfo >= 6 and sucskill < 3 and sctrainprep = 1: gt 'succubus', 'training3sex'
 				cls
 				cla
 				'<center><img <<$set_imgh>> src="images/characters/city/tatiana/sex/karinsucsex3.jpg"></center>'
-				'You continue this way for some time, flipping back and forth; having multiple simultaneous orgasms, until you sense her body is tiring even though her power level is a bit higher than when you two started.'
+				'You continue this way for some time, flipping back and forth, having multiple simultaneous orgasms until you sense her body is tiring even though her power level is a bit higher than when you two started.'
 				act 'Finish':
 					cla
 					scfeed = 2 + succublvl + rand(1,4)
@@ -384,9 +384,9 @@ if $ARGS[0] = 'training3sex':
 	cls
 	cla
 	'<center><img <<$set_imgh>> src="images/characters/city/tatiana/sex/karinsucsex3.jpg"></center>'
-	'You continue this way for hours, changing position occasionally, and the whole time you both are causing the massive amount of energy between you to cycle faster and faster, until it almost feels as if you and Tatiana are sharing one body that is having a continuous orgasm.'
+	'You continue this way for hours, changing position occasionally, and the whole time you both are causing the massive amount of energy between you to cycle faster and faster until it almost feels as if you and Tatiana are sharing one body that is having a continuous orgasm.'
 	'You lose track of time and are only barely able to perform the tasks Tatiana said you needed to do.'
-	'Eventually you sense that the excess energy is depleted, your energy handling channels are significantly improved, and Tatiana, while exhausted, has had a major boost to her own power.'
+	'Eventually, you sense that the excess energy is depleted, your energy handling channels are significantly improved, and Tatiana, while exhausted, has had a major boost to her own power.'
 	act 'Finish':
 		cla
 		sucskill = 3
@@ -410,7 +410,7 @@ if $ARGS[0] = 'training3sex':
 		pcs_energy = 100 & pcs_sleep = 40
 		gs 'stat'
 		'As you both put yourselves back together, Tatiana says, "Wow... just wow! That was... indescribable! I have never felt <i>anything</i> like that!" She gives you a gentle kiss before adding, "Thank You!"'
-		'She then lays down on the couch and immediately drops off to sleep, you toss the blanket over her and prepare to leave.'
+		'She then lies down on the couch and immediately drops off to sleep. You toss the blanket over her and prepare to leave.'
 		act 'Leave': gt 'city_center'
 	end
 end
@@ -423,7 +423,7 @@ if $ARGS[0] = 'kompresearch':
 	sucpcinfo = 1
 	'<center><img <<$set_imgh>> src="images/shared/accessories/computer/succresrch.jpg"></center>'
 	'Other than a host of internet stories, the thing you find that matches closest to what you have been feeling is a succubus, a demonic creature that destroys or corrupts men''s souls through sex.'
-	'However, you don''t feel like you have been corrupting anything and the match isn''t that great...'
+	'However, you don''t feel like you have been corrupting anything, and the match isn''t that great...'
 	'Maybe you should go ask Tatiana...'
 	act 'Continue': gt 'Komp', 'brows'
 end
@@ -905,7 +905,7 @@ if $args[0] = 'sucwalkinggo':
 		if pcs_hairbsh = 1 and pcs_makeup > 1: $scwrdtmp = ', your hair is brushed, and you''re wearing makeup.'
 		'Instead, you are fully dressed<<$scwrdtmp>>'
 		if scwalkmon > 0:
-			'You find <<scwalkmon>> <b>₽</b> stuffed in your cleavage (which you place in your wallet)'
+			'You find <<scwalkmon>> <b>₽</b> stuffed in your cleavage (which you place in your wallet).'
 			money += scwalkmon
 		end
 		'And you feel absolutely <i>bursting</i> with energy.'

+ 55 - 55
locations/svidboy.qsrc

@@ -16,14 +16,14 @@ if $ARGS[0] = 'kinosvid':
 	gs 'stat'
 	'<center><b>Cinema</b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/kino0.jpg"></center>'
-	'<<$loverdesc[lover_number]>> you bought the tickets and took their seats ready for viewing'
+	'<<$loverdesc[lover_number]>> buys the tickets, and you take your seats ready for viewing'
 
-	act 'Watch a movie':
+	act 'Watch the movie':
 		cla
 		*clr
 		minut += 90
 		'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/kino1.jpg"></center>'
-		'During the session <<$loverdesc[lover_number]>> looked around and making sure that you are in the room except no one is turned to you and started to kiss his hand slipped under your clothes, you started to caress his chest.'
+		'During the screening, <<$loverdesc[lover_number]>> looks around and, making sure that you are alone in the theater, turns and starts to kiss you. His hand slips under your clothes, and you start to caress his chest.'
 		
 		gs 'willpower', 'bj', 'resist'
 		if will_cost <= pcs_willpwr:
@@ -33,8 +33,8 @@ if $ARGS[0] = 'kinosvid':
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/kino0.jpg"></center>'
-				'You removed his hand with the words "Well, not here"'
-				'When the movie ended <<$loverdesc[lover_number]>> said that he has to run and left.'
+				'You remove his hand with the words, "Not here."'
+				'When the movie ends, <<$loverdesc[lover_number]>> says that he has to run and leaves.'
 
 				act 'Leave':gt $svidboy_home
 			end
@@ -50,7 +50,7 @@ if $ARGS[0] = 'kinosvid':
 			loverrelation[lover_number] += 5
 			gs 'boyStat', $lover[lover_number]
 			'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/kino2.jpg"></center>'
-			'You unbutton his pants and pulled out already erection begin to stroke his hand <<$loverdesc[lover_number]>> lays down the hands on your shoulders and begins to press down gently guiding your head to its members.'
+			'You unbutton his pants and pull out his already erect cock, beginning to stroke it in your hand. <<$loverdesc[lover_number]>> lays his hands on your shoulders and begins to press down gently, guiding your head to his member.'
 
 			act 'Take by mouth':gt 'sex', 'minet'
 		end
@@ -85,7 +85,7 @@ if $ARGS[0] = 'parksvid':
 		*clr
 		minut += 60
 		'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/sex_park1.jpg"></center>'
-		'When you come into the park <<$loverdesc[lover_number]>> caught you in his arms and began to circle, "Stop, stop, else you will drop" you laughed. <<$loverdesc[lover_number]>> put you on the ground.'
+		'When you come into the park, <<$loverdesc[lover_number]>> catches you in his arms and begins to swing you. "Stop, stop, you will drop me," you laugh. <<$loverdesc[lover_number]>> put you on the ground.'
 		
 		gs 'willpower', 'kiss', 'resist'
 		if will_cost <= pcs_willpwr:
@@ -96,7 +96,7 @@ if $ARGS[0] = 'parksvid':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/sex_park0.jpg"></center>'
 				'You take his hand and walk away.'
-				'Soon <<$loverdesc[lover_number]>> said that he has to run and leaves.'
+				'Soon, <<$loverdesc[lover_number]>> says that he has to run and leaves.'
 
 				act 'Leave':gt $svidboy_home, $svidboy_home_arg
 			end
@@ -107,7 +107,7 @@ if $ARGS[0] = 'parksvid':
 		act 'Kiss him':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/sex_park2.jpg"></center>'
-			'You turn to him and kiss on the lips, he holds you and his hands begin to wander through your body, one on the chest, the second squeezes your buttocks.'
+			'You turn to him and kiss him on the lips. He holds you, and his hands begin to wander through your body, one on the chest, the second squeezing your buttocks.'
 
 			gs 'willpower', 'foreplay', 'resist'
 			if will_cost <= pcs_willpwr:
@@ -118,7 +118,7 @@ if $ARGS[0] = 'parksvid':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/sex_park0.jpg"></center>'
 					'You take his hand and walk away.'
-					'Soon <<$loverdesc[lover_number]>> said that he has to run and leaves.'
+					'Soon, <<$loverdesc[lover_number]>> says that he has to run and leaves.'
 
 					act 'Leave':gt $svidboy_home, $svidboy_home_arg
 				end
@@ -131,7 +131,7 @@ if $ARGS[0] = 'parksvid':
 				*clr
 				pcs_horny += 20
 				'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/sex_park3.jpg"></center>'
-				'You kiss him, <<$loverdesc[lover_number]>> starts at your lips, then moves lower, meanwhile he bares your chest and begins to squeeze, while his other hand moves to your pussy.'
+				'You kiss him. <<$loverdesc[lover_number]>> starts at your lips, then moves lower. Meanwhile, he bares your chest and begins to squeeze, while his other hand moves to your pussy.'
 				
 				gs 'willpower', 'cuni', 'resist'
 				if will_cost <= pcs_willpwr:
@@ -142,7 +142,7 @@ if $ARGS[0] = 'parksvid':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/sex_park0.jpg"></center>'
 						'You remove his hands and cover your bare breasts.'
-						'Soon <<$loverdesc[lover_number]>> said that he has to run and leaves.'
+						'Soon, <<$loverdesc[lover_number]>> says that he has to run and leaves.'
 
 						act 'Leave':gt $svidboy_home, $svidboy_home_arg
 					end
@@ -154,7 +154,7 @@ if $ARGS[0] = 'parksvid':
 					cla
 					*clr
 					'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/sex_park4.jpg"></center>'
-					'You enjoy the petting, as one hand fingers your pussy, when <<$loverdesc[lover_number]>> suddenly bends you over, exposing your ass. You glare at his tongue as it slides between your buttocks and your fingered pussy.'
+					'You enjoy the petting, as one hand fingers your pussy, when <<$loverdesc[lover_number]>> suddenly bends you over, exposing your ass. You glance at his tongue as it slides between your buttocks and your fingered pussy.'
 					'It feels quite sensitive, and you enjoy <<$loverdesc[lover_number]>>''s actions very much.'
 
 					act 'Continue':
@@ -175,10 +175,10 @@ if $ARGS[0] = 'parksvid2':
 	*clr
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/sex_park5.jpg"></center>'
-	'Walking through the park zakaulkam you notice black guy watching you'
+	'Walking through the park, you notice a black guy watching you.'
 
 	if izvrat = 1:
-		'<<$loverdesc[lover_number]>> also his remarks and turned to you rastegivat pants and says, "And let''s have a little show for this pervert"'
+		'<<$loverdesc[lover_number]>> also points him out. Turning to you, he unbuttons his pants and says, "And let''s have a little show for this pervert."'
 		
 		gs 'willpower', 'exhib', 'resist'
 		if will_cost <= pcs_willpwr:
@@ -188,8 +188,8 @@ if $ARGS[0] = 'parksvid2':
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/sex_park6.jpg"></center>'
-				'"Well, no, I will not do that, " you reply ego buttoning his pants, take his hand and move on.'
-				'Soon <<$loverdesc[lover_number]>> said that he has to run and left.'
+				'"Well, no, I will not do that, " you reply. Buttoning his pants, you take his hand and move on.'
+				'Soon, <<$loverdesc[lover_number]>> says that he has to run and leaves.'
 
 				act 'Leave':gt $svidboy_home, $svidboy_home_arg
 			end
@@ -207,14 +207,14 @@ if $ARGS[0] = 'parksvid2':
 			gt 'sex', 'minet'
 		end
 	elseif pcs_inhib >= 40 or exhibitionist_lvl > 1:
-		'You comes to mind crazy idea, to have sex with her boyfriend in front of spying.'
+		'A crazy idea comes to your mind: to have sex with your boyfriend in front of this spy.'
 
 		act 'Have sex':
 			cla
 			*clr
 			'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/sex_park9.jpg"></center>'
-			'You let go of his hand away a little guy back raschityvaya place so that African-would you have seen good and throwing off his clothes covenant her boyfriend, "I want you here and now"'
-			'"And I do not mind, " he says coming up to you and find rastegivaya fly.'
+			'You let go of his hand and stand back a little, determining a place where the African would have a good view. Throwing off your clothes you beckon to him to come over, saying, "I want you here and now."'
+			'"And I do not have a problem with that," he says, coming up to you and unfastening his fly.'
 
 			act 'Blowjob':
 				$svidboy_home = 'svidboy'
@@ -229,19 +229,19 @@ if $ARGS[0] = 'parksvid2':
 		
 		gs 'willpower', 'exhib', 'resist'
 		if will_cost <= pcs_willpwr:
-			act 'Discard this idea and move on. (<<will_cost>> Willpower)':
+			act 'Discard the idea and move on. (<<will_cost>> Willpower)':
 				*clr & cla
 				gs 'willpower', 'exhib', 'resist'
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/sex_park6.jpg"></center>'
-				'You drop this idea and move on.'
-				'Soon <<$loverdesc[lover_number]>> said that he has to run and left.'
+				'You drop the idea and move on.'
+				'Soon, <<$loverdesc[lover_number]>> says that he has to run and leaves.'
 
 				act 'Leave':gt $svidboy_home, $svidboy_home_arg
 			end
 		else
-			act 'Discard this idea and move on.  (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			act 'Discard the idea and move on.  (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 	else
 		act 'Leave':gt $svidboy_home, $svidboy_home_arg
@@ -260,9 +260,9 @@ if $ARGS[0] = 'parksvid21':
 	*clr
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/sex_park7.jpg"></center>'
-	'Once <<$loverdesc[lover_number]>> finished, he asks you, "Well this little Papuan still here?"'
-	'"Yes, actively Fingering." you reply, glancing toward African.'
-	'"If you can suck it, and I''ll see." says <<$loverdesc[lover_number]>>, clearly wanting something you agreed.'
+	'Once <<$loverdesc[lover_number]>> finishes, he asks you, "Well is our little friend still here?"'
+	'"Yes, actively jerking himself off," you reply, glancing toward African.'
+	'"Hey, what if you suck him while I watch?" asks <<$loverdesc[lover_number]>>, clearly wanting you to agree.'
 	
 	gs 'willpower', 'bj', 'resist'
 	if will_cost <= pcs_willpwr:
@@ -272,8 +272,8 @@ if $ARGS[0] = 'parksvid21':
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/sex_park6.jpg"></center>'
-			'"Well, no, I''m not going to suck him, enough with him and watching." you reply dressing, then take his hand and move on.'
-			'Soon <<$loverdesc[lover_number]>> said that he has to run and left.'
+			'"Well, no, I''m not going to suck him, enough with him and watching," you reply, dressing then taking his hand and moving on.'
+			'Soon, <<$loverdesc[lover_number]>> says that he has to run and leaves.'
 
 			act 'Leave':gt $svidboy_home, $svidboy_home_arg
 		end
@@ -288,12 +288,12 @@ if $ARGS[0] = 'parksvid21':
 		stat['bj'] += 1
 		swallow += 1
 		'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/sex_park8.jpg"></center>'
-		'You beckon African, he carefully approaches cautiously posmatrikaya on your guy.'
+		'You beckon the African over. He carefully approaches, cautiously glancing at your guy.'
 		'"Do not worry, took out personal belongings, now my slut suck you down to the bottom" grinned <<$loverdesc[lover_number]>>'
-		'You go down on his knees so that <<$loverdesc[lover_number]>> could see the whole process, and with styanuv Man briefs start sucking, you had to work not long, a minute later he came in your mouth. Happy man immediately ran away.'
-		'"Hey, if a slut does not take money it could even say thank you" threw him go <<$loverdesc[lover_number]>>'
-		'Not paying attention to his words, because you really behaved like the last whore, you got dressed and went down.'
-		'Soon <<$loverdesc[lover_number]>> said that he has to run and left.'
+		'You go down on your knees so that <<$loverdesc[lover_number]>> can see the whole process and, pulling off the man''s briefs, start sucking. You do not have to work long. A minute later, he comes in your mouth. Happy, the man immediately runs away.'
+		'"Hey, if a slut does not take money, you should at least say thank you," <<$loverdesc[lover_number]>> yells after him.'
+		'Not paying attention to his words, because you really behaved like a whore, you get dressed and move on.'
+		'Soon, <<$loverdesc[lover_number]>> says that he has to run and leaves.'
 
 		act 'Leave':gt $svidboy_home, $svidboy_home_arg
 	end
@@ -310,7 +310,7 @@ if $ARGS[0] = 'parksvid22':
 	cla
 	*clr
 	'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/sex_park7.jpg"></center>'
-	'After <<$loverdesc[lover_number]>> finished, he notices you watching African "Damn, this pervert us spying" and noting both your lips slipped smile asked, "Did you know that he''s here, you''re here to fuck specially decided to show off in front of this Negro, you can also otsosesh him? "'
+	'After <<$loverdesc[lover_number]>> finishes, he notices you watching the African. "Damn, this pervert is spying on us," he fumes, then, noticing both your lips slipping into a smile, he asks, "Did you know that he was here? Did you decide to fuck here specifically to show off in front of this Negro? Do you also want to suck him off?"'
 	
 	gs 'willpower', 'bj', 'resist'
 	if will_cost <= pcs_willpwr:
@@ -320,8 +320,8 @@ if $ARGS[0] = 'parksvid22':
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/sex_park6.jpg"></center>'
-			'"Of course I did not know anything, do you think that I could have sex with you in front of this" you make pained face and dressed quickly go away after a few seconds <<$loverdesc[lover_number]>> catching up with you, "I''m sorry, honey, not mean to offend you, I said sgorecha "he izvenyayus you take him by the hand, saying that you forgive and move on.'
-			'Soon <<$loverdesc[lover_number]>> said that he has to run and left.'
+			'"Of course I did not know anything, do you think that I could have sex with you in front of this..." you make a pained face and dress quickly, starting to walk away after a few seconds. <<$loverdesc[lover_number]>> catches up with you. "I''m sorry, honey, I did not mean to offend you." You take him by the hand, saying that you forgive him, and move on.'
+			'Soon, <<$loverdesc[lover_number]>> says that he has to run and leaves.'
 
 			act 'Leave':gt $svidboy_home, $svidboy_home_arg
 		end
@@ -337,10 +337,10 @@ if $ARGS[0] = 'parksvid22':
 		swallow += 1
 		balls += 1
 		'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/sex_park8.jpg"></center>'
-		'"If I want to suck and" threw you back.'
-		'"So what do you expect me to suck or call him, hey man come on here free whore sucks for so" cried <<$loverdesc[lover_number]>>'
-		'"Come on do not be afraid" you shouted guy African timidly walked up to you.'
-		'You go down on his knees so that <<$loverdesc[lover_number]>> could see the whole process, and with styanuv Man briefs start sucking, you had to work not long, a minute later he came in your mouth. But you''re not going to end so quickly when osobeno <<$loverdesc[lover_number]>> sitting next crimson with anger. You took the guy cock and continued to masturbate, that he finally fell, but themselves demonstratively turned to his, now ex-boyfriend, and a little tinkering with the sperm in her mouth to swallow it. Then you turned back to African and continued without deliv his cock out of hand you the language began to fondle his balls, then took them whole in his mouth and began to suck it out of his mouth one releasing it again absorbing both when a member of the African stood again, you switched on him, slow and metadichno you licking every inch of his phallus, and then began to suck the head, smacking loudly after you calmly and methodically started sucking him trying to absorb it into himself entirely and as a member was very modest size you manage it, and that would put an end to you shoved in his mouth and his balls. At this <<$loverdesc[lover_number]>> could not resist and shouting something about the fact that you as a whore and he wa hates escaped, you quietly completed the guy a blowjob and swallowing cum went away.'
+		'"And what if I do want to suck him off?" you snap back at him.'
+		'"Oh hey, let me call him over then. Hey man, come here, free whore sucks just for you," <<$loverdesc[lover_number]>> yells at the distant man.'
+		'"Come on, do not be afraid" you shout, and the African guy timidly walks up to you.'
+		'You go down on your knees so that <<$loverdesc[lover_number]>> can see the whole process, and pulling off the man''s briefs, start sucking. You do not have to work long. A minute later, he comes in your mouth. But you''re not going to let this end so quickly, especially with <<$loverdesc[lover_number]>> sitting next to you crimson with anger. You take the guy''s cock and continue to suck it until it finally falls from your mouth, then demonstratively turn to your now ex-boyfriend and tinker with the sperm in your mouth a little before swallowing it. You turn back to the African and without delay take his cock in your hand and begin to fondle his balls, then taking them into your mouth you begin to suck them, releasing them then taking them in again. As the African''s member rises again, you switch your attention to it. Slowly and methodically you lick every inch of his phallus and then begin to suck the head. Smacking loudly, you then try to get the full length inside your throat, and as his member is very modestly sized, you manage it. At this, <<$loverdesc[lover_number]>> can not resist shouting something about the fact that you a whore and he hates you. You quietly complete your blowjob and, swallowing the man''s cum, get up and start walking away.'
 
 		act 'Leave':gt $svidboy_home, $svidboy_home_arg
 	end
@@ -356,7 +356,7 @@ if $ARGS[0] = 'billsvid':
 	gs 'stat'
 	picrand = rand(51, 52)
 	'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/bil<<picrand>>.jpg"></center>'
-	'<<$loverdesc[lover_number]>> pays for a table at a booth and you go to play'
+	'<<$loverdesc[lover_number]>> pays for a table at a booth, and you go to play.'
 
 	act 'Play':
 		*clr & cla
@@ -364,7 +364,7 @@ if $ARGS[0] = 'billsvid':
 		gs 'stat'
 
 		'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/bil1<<picrand>>.jpg"></center>'
-		'During the game <<$loverdesc[lover_number]>> moves behind you and his hands gliding over your endeavors hips and lips are drawn to the neck.'
+		'During the game, <<$loverdesc[lover_number]>> moves behind you, his hands gliding over your hips and lips drawn to your neck.'
 		
 		gs 'willpower', 'foreplay', 'resist'
 		if will_cost <= pcs_willpwr:
@@ -375,8 +375,8 @@ if $ARGS[0] = 'billsvid':
 				gs 'stat'
 				$ImageNeededPlacholder
 				! WD: IMAGE NEEDED ~ '<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/bil0<<picrand>>.jpg"></center>'
-				'You removed his hand with the words "Well, not here."'
-				'When your time is up <<$loverdesc[lover_number]>> said that he has to run and left.'
+				'You remove his hands with the words, "Not here."'
+				'When your time is up, <<$loverdesc[lover_number]>> says that he has to run and leaves.'
 
 				act 'Leave':gt $svidboy_home, $svidboy_home_arg
 			end
@@ -387,7 +387,7 @@ if $ARGS[0] = 'billsvid':
 		act 'Let him continue':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/bil2<<picrand>>.jpg"></center>'
-			'You lozhite cue on the table and relax allowing him to continue to caress your body, kissing it down lower and lower.'
+			'You lay down the cue on the table and relax, allowing him to continue to caress your body, kissing it down lower and lower.'
 			
 			gs 'willpower', 'cuni', 'resist'
 			if will_cost <= pcs_willpwr:
@@ -398,8 +398,8 @@ if $ARGS[0] = 'billsvid':
 					gs 'stat'
 					$ImageNeededPlacholder
 					! WD: IMAGE NEEDED ~ '<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/bil0<<picrand>>.jpg"></center>'
-					'You removed his hand with the words "Well, not here"'
-					'When your time is up <<$loverdesc[lover_number]>> said that he has to run and left.'
+					'You remove his hands with the words, "Not here."'
+					'When your time is up, <<$loverdesc[lover_number]>> says that he has to run and leaves.'
 
 					act 'Leave':gt $svidboy_home, $svidboy_home_arg
 				end
@@ -431,14 +431,14 @@ if $ARGS[0] = 'kafesvid':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/kafe0.jpg"></center>'
-	'And you <<$loverdesc[lover_number]>> went into a small cafe in the center, it seems that it does not enjoy popularity, site visitors almost there, you sat at a table in one of the private booths.'
+	'You and <<$loverdesc[lover_number]>> go into a small cafe. It seems that it does not enjoy popularity, as you are almost the only customers. You sit at a table in one of the private booths.'
 
 	act 'Wait for the order':
 		cla
 		*clr
 		minut += 60
 		'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/kafe1.jpg"></center>'
-		'Once you have brought order <<$loverdesc[lover_number]>> began to pester you, he and Narov kiss you, and slid his hands over your body, then caressing his chest, then squeeze your buttocks.'
+		'Once you have made your order, <<$loverdesc[lover_number]>> begins to pester you, kissing you and sliding his hands over your body, one moment caressing your chest, then another squeezing your buttocks.'
 		
 		gs 'willpower', 'foreplay', 'resist'
 		if will_cost <= pcs_willpwr:
@@ -448,8 +448,8 @@ if $ARGS[0] = 'kafesvid':
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/kafe0.jpg"></center>'
-				'You removed his hand with the words "Well, not here"'
-				'After some time <<$loverdesc[lover_number]>> said that he has to run and left.'
+				'You remove his hands with the words, "Not here."'
+				'After some time, <<$loverdesc[lover_number]>> says that he has to run and leaves.'
 
 				act 'Leave':gt $svidboy_home, $svidboy_home_arg
 			end
@@ -460,7 +460,7 @@ if $ARGS[0] = 'kafesvid':
 		act 'Let him continue':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/kafe2.jpg"></center>'
-			'Soon you remain almost without clothes, and <<$loverdesc[lover_number]>> was kissing you underbelly, dropping to the pubis.'
+			'Soon, you are almost without clothes, and <<$loverdesc[lover_number]>> is kissing your underbelly, dropping to the pubis.'
 			
 			gs 'willpower', 'cuni', 'resist'
 			if will_cost <= pcs_willpwr:
@@ -470,8 +470,8 @@ if $ARGS[0] = 'kafesvid':
 					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/kafe0.jpg"></center>'
-					'The last time you came all the same in yourself and realizing that you are in a cafe, pushed him, "No, we have enough in the same cafe, patience to the house"'
-					'But soon <<$loverdesc[lover_number]>> said that he has to run and left.'
+					'At the last second, you come to your senses and realize that you are in a cafe. "No, we have done enough in this cafe, patience until we get home," you insist, pushing him away.'
+					'But soon, <<$loverdesc[lover_number]>> says that he has to run and leaves.'
 
 					act 'Leave':gt $svidboy_home, $svidboy_home_arg
 				end

+ 7 - 7
locations/swamp.qsrc

@@ -23,7 +23,7 @@ if $ARGS[0] = 'start':
 	end
 	*nl
 	'You are at the swamp on the far side of the woods from the village.'
-	'It can be dangerous to hike in this area, unless physically fit or have a good knowledge of the forest.'
+	'It can be dangerous to hike in this area, unless you are physically fit or have a good knowledge of the forest.'
 
 	act 'Head back to the forest (0:15)': minut += 15 & gt 'gadforest', 'forest_center'
 
@@ -69,7 +69,7 @@ if $ARGS[0] = 'stuck':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_nude0.'+rand(4,5)+'.jpg"></center>'
 		end
 		*nl
-		'As you walk through the swamp, you feel yourself begin to sink into the mud of the swamp with each step.'
+		'As you walk through the swamp, you feel yourself begin to sink into the mud with each step.'
 		'You know you''re so close to your destination, but you''re not sure you can make it.'
 
 		act 'Struggle':
@@ -107,7 +107,7 @@ if $ARGS[0] = 'stuck':
 						end
 					end
 					*nl
-					'Your efforts are not in vain as you begin to feel the muds hold loosen. With another burst of strength you free yourself and breathe a sigh of relief.'
+					'Your efforts are not in vain as you begin to feel the mud''s hold loosen. With another burst of strength, you free yourself and breathe a sigh of relief.'
 
 					act 'Success!':gt 'swamp_yard','start'
 				else
@@ -120,7 +120,7 @@ if $ARGS[0] = 'stuck':
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_nude0.'+rand(4,5)+'.jpg"></center>'
 					end
 					*nl
-					'Your efforts are for nothing, the muds hold feels as tight as ever. In fact you feel yourself sinking even deeper.'
+					'Your efforts are for nothing. The mud''s hold feels as tight as ever. In fact, you feel yourself sinking even deeper.'
 
 					act 'Failure':gt 'swamp','stuck'
 				end
@@ -146,7 +146,7 @@ if $ARGS[0] = 'stuck':
 					act 'Success!':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/handshelp.jpg"></center>'
-						*nl 'You hear men speaking and begin to shout louder. The voices come closer and finally, you feel strong hands grab you and drag you out to solid ground.'
+						*nl 'You hear men speaking and begin to shout louder. The voices come closer, and finally, you feel strong hands grab you and drag you out to solid ground.'
 						gs 'stat'
 
 						act 'Relax':gt 'swamp_yard','start'
@@ -169,10 +169,10 @@ if $ARGS[0] = 'stuck':
 		*nl
 		if $ARGS[1] = 'forest_edge':
 			minut += 60
-			'After an hour walking through the forest you finally see the hunters cabin ahead.'
+			'After an hour walking through the forest, you finally see the hunters cabin ahead.'
 		elseif $ARGS[1] = 'swamp':
 			minut += 15
-			'After a few mintues walking through the swamp you finally see the hunters cabin ahead.'
+			'After a few minutes walking through the swamp, you finally see the hunters cabin ahead.'
 		end
 		gs 'stat'
 		act 'Continue':gt 'swamp_yard', 'start'

+ 32 - 32
locations/swamp_woods.qsrc

@@ -31,10 +31,10 @@ if $ARGS[0] = 'start':
 			'You pick up some dry branches and twigs, putting them in a pile near the fire pit before coming back.'
 			firewood += rand(2,6)
 			if firewood < 15:
-				'You have <<firewood>> pieces of firewood, and should probably grab some more to keep the fire going.'
+				'You have <<firewood>> pieces of firewood and should probably grab some more to keep the fire going.'
 			else
-				'You have <<firewood>> pieces of firewood, and should have enough firewood to get a fire going.'
-			end
+				'You have <<firewood>> pieces of firewood and should have enough firewood to get a fire going.'
+			end if
 			minut += 15
 			gs 'stat'
 
@@ -49,13 +49,13 @@ if $ARGS[0] = 'start':
 		*clr & cla
 		if pcs_bushcraft < 15:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/thinks1.jpg"></center>'
-			'You consider trying to circle around the swamp but then think it is better if you did not get too far from the hut.'
+			'You consider trying to circle around the swamp but then think it is better if you do not get too far from the hut.'
 			'If only you were a skilled pathfinder or knew nearby people that could help you get back...'
 
 			act 'Further': gt 'swamp_woods', 'start'
 		elseif pcs_bushcraft < 30:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/thinks2.jpg"></center>'
-			'You consider trying to circle around the swamp. You have a vague idea on how to accomplish that but there is a good chance you may get lost.'
+			'You consider trying to circle around the swamp. You have a vague idea on how to accomplish that, but there is a good chance you may get lost.'
 
 			act 'Stay around for now': gt 'swamp_woods', 'start'
 			act 'Try anyway':
@@ -67,15 +67,15 @@ if $ARGS[0] = 'start':
 					!Make it to the other side fine
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif($clothingworntype ! 'nude','nearby_woods_success.jpg','nearby_woods_success_nude.jpg')+'"></center>'
 					'You stick as close to the swamp as possible and follow the edge in one direction.'
-					'Even though you occassionally step into the swamp you manage to not get stuck'
-					'After some time walking and struggling not to get stuck you can see the hut on the opposite side'
+					'Even though you occasionally step into the swamp, you manage to not get stuck.'
+					'After some time walking and struggling not to get stuck, you can see the hut on the opposite side.'
 
 					act 'Success!': bushcraft_exp += 5 & gt 'gadforest','forest_center'
 				elseif nearby_woods_check <= 3:
 					!End up stuck in the swamp
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif($clothingworntype ! 'nude','nearby_woods_stuck.jpg','nearby_woods_stuck_nude.jpg')+'"></center>'
 					'You stick as close to the swamp as possible and follow the edge in one direction.'
-					'Trusting the ground you keep going but at some point you sink right into the swamp without even realizing.'
+					'Trusting the ground, you keep going, but at some point, you sink right into the swamp without even realizing.'
 					*nl
 					'Seems like the forest can camouflage parts of the swamp, fooling careless hikers.'
 
@@ -84,10 +84,10 @@ if $ARGS[0] = 'start':
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif($clothingworntype ! 'nude','nearby_woods_hike.jpg','nearby_woods_hike_nude.jpg')+'"></center>'
 					!Circle back to where the pcs started
 					'You start going into the woods in a direction you think will take you around the swamp.'
-					'After a few hours walking you realize your surroundings are a bit familiar.'
-					'Then you look around you and can see the hut in the distance. Seems like you just walked around in circles and ended up where you started'
+					'After a few hours walking, you realize your surroundings are a bit familiar.'
+					'Then you look around you and can see the hut in the distance. Seems like you just walked around in circles and ended up where you started.'
 					*nl
-					'You can see some broken branches and prints near ahead of you, marking the direction you initially started walking towards'
+					'You can see some broken branches and prints nearby ahead of you, marking the direction you initially started walking towards.'
 
 					act 'That''s interesting...': bushcraft_exp += 2 & gt 'swamp_woods', 'start'
 				end
@@ -96,9 +96,9 @@ if $ARGS[0] = 'start':
 			minut += 90
 			!Make it back without effort
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif($clothingworntype ! 'nude','pathfinder.jpg','pathfinder_nude.jpg')+'"></center>'
-			'You have a rough idea of how the forest curves around the swamp from having seen part of the swamp''s edge from the hut yard'
-			'With that in mind, you go into the forest, aware of your surroundings to make sure you are not stepping too far from the edge of the swamp'
-			'After a couple hours you are on the other edge of the forest'
+			'You have a rough idea of how the forest curves around the swamp from having seen part of the swamp''s edge from the hut yard.'
+			'With that in mind, you go into the forest, aware of your surroundings to make sure you are not stepping too far from the edge of the swamp.'
+			'After a couple hours, you are on the other edge of the forest.'
 
 			act 'Further': gt 'swamp_woods', 'start'
 		end
@@ -108,16 +108,16 @@ end
 if $ARGS[0] = 'shooting_practice':
 	if $ARGS[1] = '':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/andrei_shooting.jpg"></center>'
-		'You approach Andrei shooting some bottles with his pistol. You think maybe he can teach you a few tricks'
+		'You approach Andrei shooting some bottles with his pistol. You think maybe he can teach you a few tricks.'
 
 		act 'Ask if you can shoot too':
 			if hunter_collective_opinion > 50 and rand(1,4) = 1:
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/andrei_shooting.jpg"></center>'
-				'"Sure thing! But say, how about we spice it up a bit? If you can hit that bottle over there in one shot, I will do anything you want" says Andrei'
+				'"Sure thing! But say, how about we spice it up a bit? If you can hit that bottle over there in one shot, I will do anything you want," says Andrei.'
 				'"And what if I cannot?" you ask.'
-				'"Well, in that case you get to do anything I ask for. It is only fair, right?" he asks with a smirk.'
-				'"I guess it is" you respond, slightly blushing thinking about what Andrei could ask you to do.'
+				'"Well, in that case, you get to do anything I ask for. It is only fair, right?" he asks with a smirk.'
+				'"I guess it is," you respond, slightly blushing thinking about what Andrei could ask you to do.'
 
 				act 'Take the bet':
 					cla & *clr
@@ -131,7 +131,7 @@ if $ARGS[0] = 'shooting_practice':
 
 				act 'Refuse':
 					cla
-					'Not liking the odds of likely spending the day naked or worse, "Maybe some other time" you respond before walking away.'
+					'Not liking the odds of likely spending the day naked or worse, "Maybe some other time," you respond before walking away.'
 					hunter_collective_opinion -= 2
 					gs 'stat'
 
@@ -145,7 +145,7 @@ if $ARGS[0] = 'shooting_practice':
 				else
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/andrei_shooting.jpg"></center>'
-					'You try to get Andrei''s attention but he kind of ignores you. When you keep on trying he waves his hand in a gesture for you to go away.'
+					'You try to get Andrei''s attention, but he kind of ignores you. When you keep on trying, he waves his hand in a gesture for you to go away.'
 					act 'Further': gt 'swamp_woods', 'start'
 				end
 			end
@@ -155,7 +155,7 @@ if $ARGS[0] = 'shooting_practice':
 
 	elseif $ARGS[1] = 'practice':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif($clothingworntype ! 'nude','shooting.jpg','shooting_nude.jpg')+'"></center>'
-		*nl '"Alright I will show you a few tricks while you try" says Andrei. You spend about an hour practicing your shooting under Andrei''s guidance'
+		*nl '"Alright, I will show you a few tricks while you try," says Andrei. You spend about an hour practicing your shooting under Andrei''s guidance.'
 		minut += 60
 		shoot_exp += 2
 		gs 'stat'
@@ -164,11 +164,11 @@ if $ARGS[0] = 'shooting_practice':
 
 	elseif $ARGS[1] = 'andrei_request':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/andrei_shooting.jpg"></center>'
-		'"You see, these bullets don''t come free" says Andrei. "My time looking over your shoulder also doesn''t come free. You gotta pay me back somehow"'
+		'"You see, these bullets don''t come free," says Andrei. "My time looking over your shoulder also doesn''t come free. You gotta pay me back somehow."'
 		'"What do you mean?" you ask, with a vague idea of where this is going.'
 
 		if $clothingworntype = 'nude':
-			'"Since you are all naked might as well let me fuck your little pussy right here." he says. "Then I will let you shoot a bit"'
+			'"Since you are all naked, might as well let me fuck your little pussy right here," he says, "then I will let you shoot a bit."'
 			!TODO: if pcs_inhib < x
 			act 'Let him fuck you': gt 'hunter_interactions', 'andrei_quick_fuck'
 		else
@@ -178,8 +178,8 @@ if $ARGS[0] = 'shooting_practice':
 				act 'Flash your tits':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/shooting_tit_flash.jpg"></center>'
-					'You lift your top and expose your tits to Andrei for a minute. You then cover up and ask "Enough payment for a lesson?"'
-					'"Would appreciate a longer look but I will take it" responds Andrei'
+					'You lift your top and expose your tits to Andrei for a minute. You then cover up and ask, "Enough payment for a lesson?"'
+					'"Would appreciate a longer look, but I will take it," responds Andrei'
 					hunter_sexual_comfort += 3
 					gs 'arousal', 'flashlite', 3
 					gs 'arousal', 'end'
@@ -192,8 +192,8 @@ if $ARGS[0] = 'shooting_practice':
 				act 'Flash your pussy':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/shooting_pussy_flash.jpg"></center>'
-					'You lift your bottom and expose your pussy to Andrei for a minute. You then cover up and ask "Enough payment for a lesson?"'
-					'"Would appreciate a longer look but I will take it" responds Andrei'
+					'You lift your bottom and expose your pussy to Andrei for a minute. You then cover up and ask, "Enough payment for a lesson?"'
+					'"Would appreciate a longer look, but I will take it," responds Andrei'
 					hunter_sexual_comfort += 5
 					gs 'arousal', 'flashlite', 5
 					gs 'arousal', 'end'
@@ -207,8 +207,8 @@ if $ARGS[0] = 'shooting_practice':
 					cla & *clr
 !!Image needed						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/shooting_strip.jpg"></center>'
 					'You slowly take off your clothes one by one until you are completely naked in front of Andrei.'
-					'You look on the ground and blush a bit as he stares at your exposed tits, ass and pussy. You cannot help but feel your pussy moisten.'
-					'"This naked look suits you better, do you know that?" says Andrei. He ogles your body for a few more minutes before handing you the rifle'
+					'You look at the ground and blush a bit as he stares at your exposed tits, ass and pussy. You cannot help but feel your pussy moisten.'
+					'"This naked look suits you better, do you know that?" says Andrei. He ogles your body for a few more minutes before handing you the rifle.'
 					hunter_sexual_comfort += 7
 					gs 'clothing', 'strip', 'swamphouse'
 					gs 'underwear', 'remove'
@@ -219,12 +219,12 @@ if $ARGS[0] = 'shooting_practice':
 					act 'Further': gt 'swamp_woods', 'shooting_practice', 'practice'
 				end
 			elseif andrei_shooting_request = 4:
-				'"Seeing a young pretty thing like you prancing around gives me a boner. I want you to suck my dick." demands Andrei.'
+				'"Seeing a young pretty thing like you prancing around gives me a boner. I want you to suck my dick," demands Andrei.'
 				act 'Suck his dick':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/shooting_bj.jpg"></center>'
 					'You kneel down obediently and start sucking his dick until you feel him cumming down your throat. You make sure to catch every drop.'
-					'"Now that''s a good girl. Good girls get to shoot the rifle." says Andrei with a chuckle'
+					'"Now that''s a good girl. Good girls get to shoot the rifle," says Andrei with a chuckle.'
 					hunter_sexual_comfort += 8
 					gs 'boyStat', 'A172'
 					gs 'arousal', 'bj', 15, 'sub', 'exhibitionism'
@@ -241,4 +241,4 @@ if $ARGS[0] = 'shooting_practice':
 	end
 end
 
---- swamp_woods ---------------------------------
+--- swamp_woods ---------------------------------

+ 11 - 11
locations/swamp_yard.qsrc

@@ -29,7 +29,7 @@ if $ARGS[0] = 'start':
 	*nl
 
 
-	'Behind the hut there is a <a href="exec: gt ''swampspring'' ">spring</a>, if you continue a little further down there is a small <a href="exec: gt ''backwater'' ">creek</a> with relatively clean water.'
+	'Behind the hut, there is a <a href="exec: gt ''swampspring'' ">spring</a>. If you continue a little further down, there is a small <a href="exec: gt ''backwater'' ">creek</a> with relatively clean water.'
 
 	if hunters_available = 1:
 		if hunters_were_met = 0:
@@ -43,7 +43,7 @@ if $ARGS[0] = 'start':
 					'<a href="exec: gt ''hunters'', ''start'' ">Igor and Sergey</a> are standing in the front yard.'
 				else
 					if campfire = 1 and hunters_chattime = 0:
-						'You see hunters are sitting by the <a href="exec: gt ''swamp_yard'', ''campfire''">campfire</a>'
+						'You see the hunters are sitting by the <a href="exec: gt ''swamp_yard'', ''campfire''">campfire</a>'
 					else
 						'You notice the <a href="exec: gt ''hunters'', ''start'' ">hunters</a> standing in the front yard.'
 					end
@@ -98,13 +98,13 @@ if $ARGS[0] = 'campfire':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif(DayStage = 2,'campfire_day.jpg','campfire_night.jpg')+'"></center>'
 		*nl
 		'A nice, warm campfire you can sit and relax by. You can use it to cook something or heat up some water to bathe.'
-		'You can also put it out with the bucket if there is enough water in it'
+		'You can also put it out with the bucket if there is enough water in it.'
 
 		if hunters_breakfast = 1 or hunters_lunch = 1:
 			*clr
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanters1.jpg"></center>'
 			*nl
-			'Hunters are also sitting around the campfire, talking and joking about all kinds of stuff before heading out hunting'
+			'The hunters are also sitting around the campfire, talking and joking about all kinds of stuff before heading out hunting.'
 
 			act 'Chat (0:30)':
 				gt 'hunter_interactions', 'chat_with_hunters'
@@ -119,7 +119,7 @@ if $ARGS[0] = 'campfire':
 					bushcraft_exp += 1
 					minut += 10
 					*nl
-					'Hunters talk to you about some of their experiences when they first started out'
+					'The hunters talk to you about some of their experiences when they first started out.'
 				else
 					if hunter_lessons > 10 AND hunter_sexual_comfort > 25:
 						!TODO: Prototype implementation for the creekside event, to be revamped
@@ -130,7 +130,7 @@ if $ARGS[0] = 'campfire':
 						act 'Further': gt 'hunter_favors', 'creekside_gangbang_request'
 					else
 						minut += 20
-						'The hunters do not even bother to answer you. You simply sit in awkward silence for twenty minutes before getting to to other business'
+						'The hunters do not even bother to answer you. You simply sit in awkward silence for twenty minutes before getting on to other business.'
 					end
 				end
 
@@ -142,7 +142,7 @@ if $ARGS[0] = 'campfire':
 			*clr
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/fireside_drink.jpg"></center>'
 			*nl
-			'Hunters are drinking and chatting loudly. You can join them for a chat, or maybe a drink or two if you would like'
+			'The hunters are drinking and chatting loudly. You can join them for a chat, or maybe a drink or two if you would like.'
 			act 'Chat (0:30)':
 				gt 'hunter_interactions', 'chat_with_hunters'
 			end
@@ -157,7 +157,7 @@ if $ARGS[0] = 'campfire':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/campfire_put_out.jpg"></center>'
 				*nl
-				'You pour some water to extinguish the campfire'
+				'You pour some water to extinguish the campfire.'
 				campfire = 0
 				minut += 5
 				bucket -= 3
@@ -180,7 +180,7 @@ if $ARGS[0] = 'campfire':
 				water_heated += 1
 				*nl
 				if water_heated > 5 and (pcs_inhib < 85 or hunter_sexual_comfort > 25):
-					'"It is too tedious to keep heatiing up water", you think to yourself.'
+					'"It is too tedious to keep heating up water", you think to yourself.'
 				else
 					'With the now heated water, you can bathe yourself in the tub.'
 				end
@@ -233,7 +233,7 @@ if $ARGS[0] = 'campfire':
 			act 'Light fire':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif($clothingworntype ! 'nude','campfire_light.jpg','campfire_light_nude.jpg')+'"></center>'
-				'You use some chopped wood, dry branches and twigs to light a campfire in the firepit'
+				'You use some chopped wood, dry branches and twigs to light a campfire in the firepit.'
 				firewood -= 10
 				campfire = 1
 				minut += 15
@@ -255,7 +255,7 @@ if $ARGS[0] = 'swamp_escape':
 			if rand(0,9)>8: gt 'swamp', 'start' else gt 'swamp','stuck'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/handshelp.jpg"></center>' & !! instead igorhanter.jpg
-			'As you start moving into the swamp Igor calls after you.'
+			'As you start moving into the swamp, Igor calls after you.'
 
 			!TODO: Different line depending on opinion and slut
 			'"<<$pcs_nickname>>, where are you going? You will get stuck in there!'

+ 128 - 131
locations/swamphouse.qsrc

@@ -31,7 +31,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 		'There''s an empty bucket placed in the corner. It needs refilling with water from the spring.'
 	end
 	'You see an old <a href="exec: gs ''swamphouse'', ''washstand'' ">washstand</a> you can use to wash your hands and face. There is a well-used <a href="exec: gs ''swamphouse'', ''tub''">tub</a> nearby, that you can use to bathe in.'
-	'In the other corner you see a small <a href="exec: gs ''swamphouse'', ''stove''">stove</a>. With water from the spring and some mushrooms or meat, you could cook something to eat, or warm the water so you can bathe in the tub.'
+	'In the other corner, you see a small <a href="exec: gs ''swamphouse'', ''stove''">stove</a>. With water from the spring and some mushrooms or meat, you could cook something to eat, or you could warm the water so you can bathe in the tub.'
 	if stovefire = 0:
 		*nl
 		'The hut feels '+iif(temper < 15, 'quite cold, maybe you should start a fire in the old stove.', 'quite warm, even without the stove fire burning.')+''
@@ -90,12 +90,12 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 				gs 'stat'
 
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamphouseundress.jpg"></center>'
-				''+iif(temper > 23, 'Feeling the heat in the cabin', 'You feel the need to get naked, so')+' you start removing your clothes.'
+				''+iif(temper > 23, 'Feeling the heat in the cabin,', 'You feel the need to get naked, so')+' you start removing your clothes.'
 				act 'Back': gt 'swamphouse', 'start'
 			else
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/noundress.jpg"></center>'
-				''+iif(temper > 23, 'Despite the heat', 'Despite your need to get naked')+' you''re still too shy to get undressed - what if someone suddenly comes in?'
+				''+iif(temper > 23, 'Despite the heat,', 'Despite your need to get naked,')+' you''re still too shy to get undressed - what if someone suddenly comes in?'
 				act 'Back': gt 'swamphouse', 'start'
 			end
 		end
@@ -117,7 +117,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			act 'Pick up your clothes':
 				*clr & cla
 				gs 'clothing', 'recover_lost_clothes', 'swamphouse'
-				'You picked up your clothes.'
+				'You pick up your clothes.'
 				act 'Back': gt 'swamphouse', 'start'
 			end
 		end
@@ -158,7 +158,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 				gs 'clothing', 'swamp_clothes', 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamphouse_tkancloth.jpg"></center>'
-				'You find a piece of hessian... "Well, at least it''s something." you say to yourself.'
+				'You find a piece of hessian... "Well, at least it''s something," you say to yourself.'
 				act 'Back.': gt 'swamphouse', 'start'
 			end
 		end
@@ -179,7 +179,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 		gs 'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterlove1.4.jpg"></center>'
-		'Entering the hut you see Igor. He smiles and walks over to you, grabs hold of you and gives you a passionate kiss.'
+		'Entering the hut, you see Igor. He smiles and walks over to you, grabs hold of you and gives you a passionate kiss.'
 		'"<<$pcs_nickname>>, I want you," he whispers.'
 		gs 'arousal', 'kiss', 5
 		gs 'stat'
@@ -190,7 +190,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflirt2.'+rand(4,6)+'.jpg"></center>'
-			'Smiling you look straight into Igor''s eyes telling him all he needs to know. Without any hesitation he takes you by the hand and leads you...'
+			'Smiling, you look straight into Igor''s eyes, telling him all he needs to know. Without any hesitation, he takes you by the hand and leads you...'
 			act 'Go with Igor': gt 'hunterLoveSex','Igor'
 		end
 		act 'Refuse':
@@ -200,7 +200,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/pc/reactions/speak_to_the_hand.jpg"></center>'
-			'"I''m sorry, Igor. I''m not in the mood." you say avoiding eye contact. Igor leaves disappointed...'
+			'"I''m sorry, Igor. I''m not in the mood," you say, avoiding eye contact. Igor leaves disappointed...'
 			act 'Walk away': gt 'swamphouse', 'start'
 		end
 	end
@@ -211,7 +211,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 		gs 'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterlove1.4.jpg"></center>'
-		'Entering the hut you see Sergei. He smiles and walks over to you, grabs hold of you and gives you a passionate kiss.'
+		'Entering the hut, you see Sergei. He smiles and walks over to you, grabs hold of you and gives you a passionate kiss.'
 		'"<<$pcs_nickname>>, I want you," he whispers.'
 		gs 'arousal', 'kiss', 5
 		gs 'stat'
@@ -222,7 +222,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflirt2.'+rand(4,6)+'.jpg"></center>'
-			'Smiling you look straight into Sergei''s eyes telling him all he needs to know. Without any hesitation he takes you by the hand and leads you...'
+			'Smiling, you look straight into Sergei''s eyes, telling him all he needs to know. Without any hesitation, he takes you by the hand and leads you...'
 			act 'Go with Sergei': gt 'hunterLoveSex','Sergei'
 		end
 		act 'Refuse':
@@ -232,7 +232,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/pc/reactions/speak_to_the_hand.jpg"></center>'
-			'"I''m sorry, Sergei. I''m not in the mood." you say avoiding eye contact. Sergei leaves disappointed...'
+			'"I''m sorry, Sergei. I''m not in the mood," you say, avoiding eye contact. Sergei leaves disappointed...'
 			act 'Walk away': gt 'swamphouse', 'start'
 		end
 	end
@@ -243,7 +243,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 		gs 'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterlove1.4.jpg"></center>'
-		'Entering the hut you see Andrei. He smiles and walks over to you, grabs hold of you and gives you a passionate kiss.'
+		'Entering the hut, you see Andrei. He smiles and walks over to you, grabs hold of you and gives you a passionate kiss.'
 		'"<<$pcs_nickname>>, I want you," he whispers.'
 		gs 'arousal', 'kiss', 5
 		gs 'stat'
@@ -255,7 +255,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterhands.jpg"></center>'
-			'Smiling you look straight into Andrei''s eyes telling him all he needs to know. Without any hesitation he takes you by the hand and leads you...'
+			'Smiling, you look straight into Andrei''s eyes, telling him all he needs to know. Without any hesitation, he takes you by the hand and leads you...'
 			act 'Go with Andrei': gt 'hunterLoveSex','Andrei'
 		end
 		act 'Refuse':
@@ -265,7 +265,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/pc/reactions/speak_to_the_hand.jpg"></center>'
-			'"I''m sorry, Andrei. I''m not in the mood." you say avoiding eye contact. Andrei leaves disappointed...'
+			'"I''m sorry, Andrei. I''m not in the mood," you say, avoiding eye contact. Andrei leaves disappointed...'
 			act 'Walk away': gt 'swamphouse', 'start'
 		end
 	end
@@ -279,10 +279,10 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterswork1.2.jpg"></center>'
 		'You see Andrei talking with Sergei in the hut.'
-		'"Come in <<$pcs_nickname>>, it''s time to consummate the marriage," Andrew jokingly remarked. "I hope you''re willing to do anything we say.'
-		if klismaday ! daystart:'"I''m sorry, I don''t know if I''m ready yet..." you say . "I haven''t been able to clean myself as you asked, maybe we could skip it this time?.'
-		if klismaday ! daystart:'Well, we could <<$pcs_nickname>>..." said Andrew. "But since you''re already here, you not being all dolled up doesn''t matter to us. But don''t dare to try to fool us next time, we will not forget."'
-		'"There are some bushes not far from here, we could take her with us there, no one would be able to find us. Should we tell Igor to join us?" said Sergei. "Nevermind Igor, it would take him to long time to join us."'
+		'"Come in <<$pcs_nickname>>, it''s time to consummate the marriage," Andrew jokingly remarks. "I hope you''re willing to do anything we say.'
+		if klismaday ! daystart:'"I''m sorry, I don''t know if I''m ready yet..." you say. "I haven''t been able to clean myself as you asked, maybe we could skip it this time?.'
+		if klismaday ! daystart:'Well, we could <<$pcs_nickname>>..." says Andrei, "but since you''re already here, you not being all dolled up doesn''t matter to us. But don''t dare to try to fool us next time, we will not forget."'
+		'"There are some bushes not far from here, we could take her with us there, no one would be able to find us. Should we tell Igor to join us?" says Sergei. "Never mind Igor, it would take him too long to join us."'
 
 		act 'Follow the guys':
 			*clr & cla
@@ -297,7 +297,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/doublehanterlove.jpg"></center>'
-			'The men hold your hands leading you away from the hut. You''re fully aware of their plans but you don''t really mind.'
+			'The men hold your hands, leading you away from the hut. You''re fully aware of their plans, but you don''t really mind.'
 			act 'Continue': gt 'huntersex', 'doublelovesex'
 		end
 		act 'Refuse':
@@ -308,7 +308,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/pc/reactions/speak_to_the_hand.jpg"></center>'
-			'"No, I refuse, this is something I don''t want part of," you say and without hesitating you turn around and walk away.'
+			'"No, I refuse, this is something I don''t want part of," you say, and without hesitating, you turn around and walk away.'
 			act 'Walk away': gt 'swamphouse', 'start'
 		end
 	end
@@ -332,7 +332,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			huntersAndreiQw += 1
 			'<center><img <<$set_imgh>> src="images/characters/shared/photos/big172.jpg"></center>'
 			'You enter the hut and notice the plastered hunters.'
-			'Oh, <<$pcs_nickname>>, come join us for a drink!" said Andrei.'
+			'Oh, <<$pcs_nickname>>, come join us for a drink!" says Andrei.'
 
 			act 'Join them at the table': gs 'swamphouse', 'hunterstable'
 			act 'Politely decline': hunter_refuse = 1 & gt 'swamphouse', 'start'
@@ -341,7 +341,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			huntersSergeiQw += 1
 			'<center><img <<$set_imgh>> src="images/characters/shared/photos/big174.jpg"></center>'
 			'You enter the hut and notice the plastered hunters.'
-			'Oh, <<$pcs_nickname>>, come join us for a drink!" Sergei says noticing you entering.'
+			'Oh, <<$pcs_nickname>>, come join us for a drink!" Sergei says, noticing you entering.'
 
 			act 'Join them at the table': gs 'swamphouse', 'hunterstable'
 			act 'Politely decline': hunter_refuse = 1 & gt 'swamphouse', 'start'
@@ -350,7 +350,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			huntersIgorQw += 1
 			'<center><img <<$set_imgh>> src="images/characters/shared/photos/big173.jpg"></center>'
 			'You enter the hut and notice the plastered hunters.'
-			'Oh, <<$pcs_nickname>>, come join us for a drink!" Igor shouts ignoring the other conversation.'
+			'Oh, <<$pcs_nickname>>, come join us for a drink!" Igor shouts, ignoring the other conversation.'
 
 			act 'Join them at the table': gs 'swamphouse', 'hunterstable'
 			act 'Politely decline': hunter_refuse = 1 & gt 'swamphouse', 'start'
@@ -359,7 +359,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 		*clr & cla
 		huntersbreakfast = daystart
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterstable.jpg"></center>'
-		'You went into the hut and notice that the hunters have prepared '+iif(hunters_breakfast = 1, 'breakfast', 'lunch')+'.'
+		'You go into the hut and notice that the hunters have prepared '+iif(hunters_breakfast = 1, 'breakfast', 'lunch')+'.'
 		'"Oh, <<$pcs_nickname>>, you''re just in time, come join us!"'
 
 		act 'Join them at the table': gs 'swamphouse', 'hunterstable'
@@ -378,9 +378,9 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 		if temphunt = 1:'<center><img <<$set_imgh>> src="images/characters/shared/photos/big172.jpg"></center>'
 		if temphunt = 2:'<center><img <<$set_imgh>> src="images/characters/shared/photos/big174.jpg"></center>'
 		if temphunt = 3:'<center><img <<$set_imgh>> src="images/characters/shared/photos/big173.jpg"></center>'
-		if temphunt = 1:'You enter the hut and bump into Andrei. "Come here <<$pcs_nickname>>," not saying anything more while he throws you on the bed.'
-		if temphunt = 2:'You enter the hut and bump into Sergei. Noticing you he heads toward you saying "<<$pcs_nickname>>, I''ve got an itch that only you can help scratch."'
-		if temphunt = 3:'You enter the hut and bump into Igor. He comes over saying smiling "<<$pcs_nickname>>, I need to empty my sack, help me out..."'
+		if temphunt = 1:'You enter the hut and bump into Andrei. "Come here <<$pcs_nickname>>," he exclaims, not saying anything more while he throws you on the bed.'
+		if temphunt = 2:'You enter the hut and bump into Sergei. Noticing you, he heads toward you saying "<<$pcs_nickname>>, I''ve got an itch that only you can help scratch."'
+		if temphunt = 3:'You enter the hut and bump into Igor. Smiling, he comes over saying "<<$pcs_nickname>>, I need to empty my sack, help me out..."'
 		if pcs_horny < 40:' You obediently follow suit, knowing what he wants.'
 		if pcs_horny >= 40 and pcs_horny < 70:'"Come and get me..." is all you manage to say before spreading your legs.'
 		if pcs_horny >= 70:'"I was hoping this would happen," you think to yourself, feeling your wet pussy screaming with desire. You jump on him, taking charge, leaving him stunned about who wants it more.'
@@ -399,7 +399,7 @@ if $ARGS[0] = 'stove':
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/stove.jpg"></center>'
 	*nl
-	'A barely functioning wodden stove, but somehow it does what it''s supposed to do. You can heat 5 liters of water at a time. Or you can make a mushroom soup, and a meat stew.'
+	'A barely functioning wooden stove, but somehow it does what it''s supposed to do. You can heat 5 liters of water at a time, or you can make a mushroom soup or a meat stew.'
 
 	act 'Move away': gt 'swamphouse', 'start'
 
@@ -458,7 +458,7 @@ if $ARGS[0] = 'food':
 			if meat_stew > 0:
 				'There''s <<meat_stew>> '+iif(meat_stew > 1, 'servings','serving')+' of stew left in the pot'
 			else
-				'You have finished the last of the stew, the pot is empty.'
+				'You finish the last of the stew, the pot is empty.'
 			end
 		end
 	end
@@ -469,7 +469,7 @@ if $ARGS[0] = 'food':
 			if mushroom_soup > 0:
 				'There''s <<mushroom_soup>> '+iif(mushroom_soup > 1, 'servings','serving')+' of soup left in the pot'
 			else
-				'You have finished the last of the soup, the pot is empty.'
+				'You finish the last of the soup, the pot is empty.'
 			end
 			gs 'stat'
 		end
@@ -489,7 +489,7 @@ if $ARGS[0] = 'bucket':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/vedro2.jpg"></center>'
 	*nl
 	if bucket > 0:
-	'There''s a bucket of water by the wall. There''s approximately <<bucket>> liters of water left.'
+	'There''s a bucket of water by the wall. There''s approximately <<bucket>> ' + iif(bucket = 1, 'liter', 'liters') + ' of water left.'
 		act 'Drink the water':
 			cla
 			minut+=5
@@ -549,11 +549,11 @@ if $ARGS[0] = 'tub':
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/basin.jpg"></center>'
 	*nl
-	'An old tub, that you can use to bathe yourself. It''s a lot warmer than using the spring! You just need to warm some water, and get undressed first.'
+	'An old tub, that you can use to bathe yourself. It''s a lot warmer than using the spring! You just need to warm some water and get undressed first.'
 	*nl
-	'If you are desperate enough, you found a handful of well used '+iif(stanok < 1,'<a href="exec: stanok += 5 & gt ''swamphouse'', ''tub''">razors</a>','razors')+' on a shelf, that you can use to shave with. '+iif(stanok > 0, '<a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>','')+''
+	'If you are desperate enough, you find a handful of well used '+iif(stanok < 1,'<a href="exec: stanok += 5 & gt ''swamphouse'', ''tub''">razors</a>','razors')+' on a shelf that you can use to shave with. '+iif(stanok > 0, '<a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>','')+''
 	dynamic $brit
-	if swamp_enema = 1:*nl & 'You found an enema syringe on the shelf.'
+	if swamp_enema = 1:*nl & 'You find an enema syringe on the shelf.'
 	if $clothingworntype = 'nude' and klismaday ! daystart and swamp_enema = 1 and hunters_inside = 0:
 		dynamic $enema
 	end
@@ -574,7 +574,7 @@ if $ARGS[0] = 'tub':
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/basinswim.jpg"></center>'
 			*nl
-			'You fill the tub with warm water, take off your clothes, and climbe into the tub. After a good clean and soak, you feel rejuvenated.'
+			'You fill the tub with warm water, take off your clothes, and climb in. After a good clean and soak, you feel rejuvenated.'
 
 			act 'Continue': gt 'swamphouse', 'tub'
 		end
@@ -600,7 +600,7 @@ if $ARGS[0] = 'stackmagazines':
 	'A stack of all kinds of magazines, there''s even one with "interesting" pictures.'
 
 	act 'Read the scientific journal (1:00)':
-		if blizoruk = 500 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt 'swamphouse', 'stackmagazines'
+		if blizoruk = 500 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page. It seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt 'swamphouse', 'stackmagazines'
 		cla
 		*clr
 		if pcs_nerd > 0:
@@ -620,7 +620,7 @@ if $ARGS[0] = 'stackmagazines':
 		act 'Continue': gs 'swamphouse', 'stackmagazines'
 	end
 	act 'Read the literary magazine (1:00)':
-		if blizoruk = 500 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt 'swamphouse', 'stackmagazines'
+		if blizoruk = 500 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page. It seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt 'swamphouse', 'stackmagazines'
 		cla
 		*clr
 		if pcs_nerd > 0:
@@ -636,12 +636,12 @@ if $ARGS[0] = 'stackmagazines':
 		gs 'stat'
 
 		gs 'swamphouse', 'clothes_read_magazines'
-		'You decided to look through the literary magazine... It''s a real drag, you almost fall asleep several times while reading it.'
+		'You decide to look through the literary magazine... It''s a real drag. You almost fall asleep several times while reading it.'
 
 		act 'Continue': gs 'swamphouse', 'stackmagazines'
 	end
 	act 'Read the entertainment magazine (1:00)':
-		if blizoruk = 500 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt 'swamphouse', 'stackmagazines'
+		if blizoruk = 500 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page. It seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt 'swamphouse', 'stackmagazines'
 		cla
 		*clr
 		if pcs_nerd > 0:
@@ -656,12 +656,12 @@ if $ARGS[0] = 'stackmagazines':
 		gs 'stat'
 
 		gs 'swamphouse', 'clothes_read_magazines'
-		'You flick entertainment magazine, you delve into the world of the rich and famous.'
+		'Flicking through the entertainment magazine, you delve into the world of the rich and famous.'
 
 		act 'Continue': gs 'swamphouse', 'stackmagazines'
 	end
 	act 'Read the porn magazine (1:00)':
-		if blizoruk = 500 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt 'swamphouse', 'stackmagazines'
+		if blizoruk = 500 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page. It seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt 'swamphouse', 'stackmagazines'
 		cla
 		*clr
 		blizoruk+=1
@@ -672,7 +672,7 @@ if $ARGS[0] = 'stackmagazines':
 		if $clothingworntype = 'nude' and $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/readpornomag_tanga.jpg"></center>'
 		if $clothingworntype = 'nude' and $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/readpornomag_nude.jpg"></center>'
 		*nl
-		'You''re flipping through a porn magazine, reading the stories and looking at pictures, when all of a sudden you realize you''ve started touching yourself.'
+		'You flip through the porn magazine, reading the stories and looking at pictures, when all of a sudden you realize you''ve started touching yourself.'
 		gs 'arousal', 'porn', 60
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -691,7 +691,7 @@ if $ARGS[0] = 'hunterstableBJ':
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterstable2.jpg"></center>'
 	*nl
-	'You see one of the hunters sitting at the table. Thinking you both could have some fun, you look at him smiling slyly. Not before long you''re crawling under the table...'
+	'You see one of the hunters sitting at the table. Thinking you both could have some fun, you look at him, smiling slyly. Not before long you''re crawling under the table...'
 
 	if hunterstableBJA = 0:
 		act 'Give Andrei a blowjob':
@@ -704,8 +704,8 @@ if $ARGS[0] = 'hunterstableBJ':
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/hanterstablebj1.'+rand(1,5)+'.jpg"></center>'
 			*nl
-			'You got comfortable under the table and brought your head between his thighs and started sucking on his cock...'
-			'Andrei''s cock got rock hard fast and soon enough you could feel a taste of pre-cum in your mouth...'
+			'You get comfortable under the table, bring your head between his thighs and start sucking on his cock...'
+			'Andrei''s cock gets rock hard fast, and soon enough, you can feel a taste of pre-cum in your mouth...'
 
 			gs 'arousal', 'bj', 5, 'sub'
 			gs 'stat'
@@ -721,8 +721,8 @@ if $ARGS[0] = 'hunterstableBJ':
 
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/hanterstablecum1.'+rand(1,5)+'.jpg"></center>'
 					*nl
-					'Andrei didn''t last more for a minute or two, his thighs tensed up and his load started shooting out and hitting your face several times.'
-					'When he was all done you cleaned Andrei the best you could, and then you put his cock back in his pants and zipped him up.'
+					'Andrei doesn''t last more than a minute or two. His thighs tense up and his load starts shooting out and hitting your face several times.'
+					'When he is all done, you clean Andrei the best you can, and then you put his cock back in his pants and zip him up.'
 
 					gs 'arousal', 'end'
 					gs 'stat'
@@ -739,7 +739,7 @@ if $ARGS[0] = 'hunterstableBJ':
 
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/hanterstablebj1.'+rand(1,5)+'.jpg"></center>'
 					*nl
-					'You could feel Andrei''s cock tensing up, ready to explode. You hear a grunt and before you can react Andrei unloads his warm spunk in your mouth...'
+					'You can feel Andrei''s cock tensing up, ready to explode. You hear a grunt, and before you can react, Andrei unloads his warm spunk in your mouth...'
 					gs 'arousal', 'end'
 					gs 'stat'
 
@@ -759,8 +759,8 @@ if $ARGS[0] = 'hunterstableBJ':
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/hanterstablebj1.'+rand(1,5)+'.jpg"></center>'
 			*nl
-			'You got comfortable under the table and brought your head between his thighs and started sucking on his cock...'
-			'Sergei''s cock got rock hard fast and soon enough you could feel a taste of pre-cum in your mouth...'
+			'You get comfortable under the table, bring your head between his thighs and start sucking on his cock...'
+			'Sergei''s cock gets rock hard fast, and soon enough, you can feel a taste of pre-cum in your mouth...'
 
 			gs 'arousal', 'bj', 5, 'sub'
 			gs 'stat'
@@ -776,8 +776,8 @@ if $ARGS[0] = 'hunterstableBJ':
 
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/hanterstablecum1.'+rand(1,5)+'.jpg"></center>'
 					*nl
-					'Sergei didn''t last more for a minute or two, his thighs tensed up and his load started shooting out and hitting your face several times.'
-					'When he was all done you cleaned Andrei the best you could, and then you put his cock back in his pants and zipped him up.'
+					'Sergei doesn''t last more that a minute or two. His thighs tense up and his load starts shooting out and hitting your face several times.'
+					'When he is all done, you cleaned Sergei the best you can, and then you put his cock back in his pants and zip him up.'
 					gs 'arousal', 'end'
 					gs 'stat'
 					act 'Continue': gs 'swamphouse', 'hunterstableBJ'
@@ -792,7 +792,7 @@ if $ARGS[0] = 'hunterstableBJ':
 
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/hanterstablebj1.'+rand(1,5)+'.jpg"></center>'
 					*nl
-					'You could feel Sergei''s cock tensing up, ready to explode. You hear a grunt and before you can react Andrei unloads his warm spunk in your mouth...'
+					'You can feel Sergei''s cock tensing up, ready to explode. You hear a grunt, and before you can react, Sergei unloads his warm spunk in your mouth...'
 					gs 'arousal', 'end'
 					gs 'stat'
 
@@ -812,8 +812,8 @@ if $ARGS[0] = 'hunterstableBJ':
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/hanterstablebj1.'+rand(1,5)+'.jpg"></center>'
 			*nl
-			'You got comfortable under the table and brought your head between his thighs and started sucking on his cock...'
-			'Igor''s cock got rock hard fast and soon enough you could feel a taste of pre-cum in your mouth...'
+			'You get comfortable under the table, bring your head between his thighs and start sucking on his cock...'
+			'Igor''s cock gets rock hard fast, and soon enough, you can feel a taste of pre-cum in your mouth...'
 
 			gs 'arousal', 'bj', 5, 'sub'
 			gs 'stat'
@@ -829,8 +829,8 @@ if $ARGS[0] = 'hunterstableBJ':
 
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/hanterstablecum1.'+rand(1,5)+'.jpg"></center>'
 					*nl
-					'Igor didn''t last more for a minute or two, his thighs tensed up and his load started shooting out and hitting your face several times.'
-					'When he was all done you cleaned Andrei the best you could, and then you put his cock back in his pants and zipped him up.'
+					'Igor doesn''t last more than a minute or two. His thighs tense up and his load starts shooting out and hitting your face several times.'
+					'When he is all done, you cleaned Igor the best you can, and then you put his cock back in his pants and zip him up.'
 					gs 'arousal', 'end'
 					gs 'stat'
 					act 'Continue': gs 'swamphouse', 'hunterstableBJ'
@@ -845,7 +845,7 @@ if $ARGS[0] = 'hunterstableBJ':
 
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/hanterstablebj1.'+rand(1,5)+'.jpg"></center>'
 					*nl
-					'You could feel Igor''s cock tensing up, ready to explode. You hear a grunt and before you can react Andrei unloads his warm spunk in your mouth...'
+					'You can feel Igor''s cock tensing up, ready to explode. You hear a grunt, and before you can react, Igor unloads his warm spunk in your mouth...'
 					gs 'arousal', 'end'
 					gs 'stat'
 
@@ -896,7 +896,7 @@ if $ARGS[0] = 'hunterstable':
 
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/beer2.jpg"></center>'
 			*nl
-			'You take a bottle of bear, open it and start drinking it.'
+			'You take a bottle of beer, open it and start drinking it.'
 
 			act 'Continue': gs 'swamphouse', 'hunterstable'
 		end
@@ -907,7 +907,7 @@ if $ARGS[0] = 'hunterstable':
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/snack1.'+rand(1,2)+'.jpg"></center>'
 			*nl
-			'You grab something to eat, so you don''t get drunk to quickly.'
+			'You grab something to eat so you don''t get drunk too quickly.'
 			act 'Continue': gs 'swamphouse', 'hunterstable'
 		end
 		act 'Chat (0:30)':
@@ -920,7 +920,7 @@ if $ARGS[0] = 'hunterstable':
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterstable.jpg"></center>'
 			*nl
-			'You chat with the men about various topics... You try to keep up with their lingo but sometime fail and you all have a laugh about it.'
+			'You chat with the men about various topics... You try to keep up with their lingo but sometimes fail and you all have a laugh about it.'
 
 			act 'Continue': gs 'swamphouse', 'hunterstable'
 		end
@@ -953,7 +953,7 @@ if $ARGS[0] = 'hunterstable':
 
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hantersmoker2.jpg"></center>'
 					*nl
-					'You follow them outside, they give you a cigarette, you light it and smoke it...'
+					'You follow them outside, they give you a cigarette, and you light it and smoke it...'
 
 					act 'Return to the table': gs 'swamphouse', 'hunterstable'
 				end
@@ -981,7 +981,7 @@ if $ARGS[0] = 'hunterstable':
 
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hantersmoker2.jpg"></center>'
 						*nl
-						'The two of you walk outside, Andrei hands you a cigarette. You start talking about your feelings for each other.'
+						'The two of you walk outside, and Andrei hands you a cigarette. You start talking about your feelings for each other.'
 
 						act 'Return to the table': gs 'swamphouse', 'hunterstable'
 					end
@@ -1002,14 +1002,13 @@ if $ARGS[0] = 'hunterstable':
 
 							'<center><img <<$set_imgh>> src="images/characters/shared/photos/big172.jpg"></center>'
 							*nl
-							'You follow Andrei outside. He gives you a cigarette, and the two of you continue on with your conversation. Suddenly Andrei, looking in your eyes, says:'
-							'"<<$pcs_nickname>>, could you help me out?"'
-							'"Of course, Andrei, I''ll be glad to." you replied. "What do you need help with?" you asked a bit worried.'
-							'"As you know <<$pcs_nickname>>, I have long been divorced for a long time," Andrei began. "But as every normal man, I need to relieve stress sometimes, well, you know what I mean..."'
+							'You follow Andrei outside. He gives you a cigarette, and the two of you continue on with your conversation. Suddenly, Andrei, looking in your eyes, says, "<<$pcs_nickname>>, could you help me out?"'
+							'"Of course, Andrei, I''d be glad to," you reply. "What do you need help with?" you ask, a bit worried.'
+							'"As you know <<$pcs_nickname>>, I have been divorced for a long time," Andrei begins, "but like every normal man, I need to relieve stress sometimes, well, you know what I mean..."'
 							'You look at his frankness with astonishment.'
-							'"Now <<$pcs_nickname>>, if you could help me out now and then, I would be very graIn the sput of the moment, while the men cheer you on, you remove your topteful," Andrei continued.'
-							'You watch in disbelief, he''s clearly not joking around. You can see on Andrei''s facial expression that he''s being dead serious.'
-							'"I won''t tell anybody about this, don''t worry, no one will know." he adds quickly. "Well, <<$pcs_nickname>>, what do you say?'
+							'"Now <<$pcs_nickname>>, if you could help me out now and then, I would be very grateful," Andrei continues.'
+							'You listen in disbelief. He''s clearly not joking around. You can see from Andrei''s facial expression that he''s being dead serious.'
+							'"I won''t tell anybody about this, don''t worry, no one will know," he adds quickly. "Well, <<$pcs_nickname>>, what do you say?'
 
 							act 'Agree':
 								*clr & cla
@@ -1022,10 +1021,10 @@ if $ARGS[0] = 'hunterstable':
 
 								'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/thinks'+rand(1,2)+'.jpg"></center>'
 								*nl
-								'After you hear him out, you start seriously considering his offer. It would be nice to help out a friend is nice, but you sense that there''s an ulterior motive.'
+								'After you hear him out, you start seriously considering his offer. It would be nice to help out a friend, but you sense that there''s an ulterior motive.'
 								'"Well Andrei, after carefully thinking about it, I''ll help you out. How do you want me to help you out?" you ask.'
-								'"Damn, <<$pcs_nickname>>, I knew you would," he replied. "Well, I wouldn''t mind a blowjob now and then, that''s good enough for me."'
-								'"Go back to the hut, and crawl under the table so no one notices." he adds while getting up from the bench.'
+								'"Damn, <<$pcs_nickname>>, I knew you would," he replies. "Well, I wouldn''t mind a blowjob now and then, that''s good enough for me."'
+								'"Go back to the hut, and crawl under the table so no one notices," he adds while getting up from the bench.'
 
 								act 'Go': gs 'swamphouse', 'huntersmokBJ'
 							end
@@ -1040,9 +1039,9 @@ if $ARGS[0] = 'hunterstable':
 
 									'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/thinks'+rand(1,2)+'.jpg"></center>'
 									*nl
-									'After you hear him out, you start seriously considering his offer. It would be nice to help out a friend is nice, but you sense that there''s an ulterior motive.'
-									'"No Andrei, I''m sorry but I refuse." you answer. "How could you even think that I would be accepting your offer?'
-									'You got up from the bench and quickly went back to the hut.'
+									'After you hear him out, you start seriously considering his offer. It would be nice to help out a friend, but you sense that there''s an ulterior motive.'
+									'"No Andrei, I''m sorry but I refuse," you answer. "How could you even think that I would accept your offer?'
+									'You get up from the bench and quickly go back to the hut.'
 
 									act 'Return to the table': gs 'swamphouse', 'hunterstable'
 								end
@@ -1059,8 +1058,7 @@ if $ARGS[0] = 'hunterstable':
 
 							'<center><img <<$set_imgh>> src="images/characters/shared/photos/big172.jpg"></center>'
 							*nl
-							'You went outside for a smoke, with Andrei following after you, immediately saying:'
-							'"Forget the cigarette <<$pcs_nickname>>, go back inside and crawl under the table, I need you so bad right now...'
+							'You go outside for a smoke, with Andrei following after you, immediately saying, "Forget the cigarette <<$pcs_nickname>>, go back inside and crawl under the table, I need you so bad right now...'
 
 							act 'Go': gs 'swamphouse', 'huntersmokBJ'
 							if alko < 6:
@@ -1074,7 +1072,7 @@ if $ARGS[0] = 'hunterstable':
 									'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/thinks'+rand(1,2)+'.jpg"></center>'
 									*nl
 									'"You know what Andrei, I''ve changed my mind. I''m more than happy to help a friend in need, but I''m not some whore that only exists for your pleasure."'
-									'You got up from the bench and quickly went back to the hut.'
+									'You get up from the bench and quickly go back to the hut.'
 
 									act 'Return to the table': gs 'swamphouse', 'hunterstable'
 								end
@@ -1091,8 +1089,7 @@ if $ARGS[0] = 'hunterstable':
 
 						'<center><img <<$set_imgh>> src="images/characters/shared/photos/big172.jpg"></center>'
 						*nl
-						'You went outside for a smoke, with Andrei following after you, immediately saying:'
-						'"To hell with the cigarette <<$pcs_nickname>>, I need to relieve some stress."'
+						'You go outside for a smoke, with Andrei following after you, immediately saying, "To hell with the cigarette <<$pcs_nickname>>, I need to relieve some stress."'
 
 						act 'Go': gs 'swamphouse', 'huntersmokBJ'
 					end
@@ -1120,7 +1117,7 @@ if $ARGS[0] = 'hunterstable':
 
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hantersmoker2.jpg"></center>'
 					*nl
-					'You followed Sergei outside. He gives you a cigarette, and the two of you continue on with your conversation.'
+					'You follow Sergei outside. He gives you a cigarette, and the two of you continue on with your conversation.'
 
 
 					act 'Return to the table': gs 'swamphouse', 'hunterstable'
@@ -1148,7 +1145,7 @@ if $ARGS[0] = 'hunterstable':
 
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hantersmoker2.jpg"></center>'
 					*nl
-					'You followed Igor outside. He gives you a cigarette, and the two of you continue on with your conversation.'
+					'You follow Igor outside. He gives you a cigarette, and the two of you continue on with your conversation.'
 
 					act 'Return to the table': gs 'swamphouse', 'hunterstable'
 				end
@@ -1184,7 +1181,7 @@ if $ARGS[0] = 'hunterstable':
 
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/pohmel1.jpg"></center>'
 							*nl
-							'Three hours later you wake up in the middle of the night. You''ve got a headache and vaguely remember yesterday.'
+							'Three hours later, you wake up in the middle of the night. You''ve got a headache and vaguely remember yesterday.'
 
 							act 'Continue': gt 'swamphouse', 'start'
 						end
@@ -1198,7 +1195,7 @@ if $ARGS[0] = 'hunterstable':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/sleep7.jpg"></center>'
 						*nl
-						'You try to reach the bed, but pass out right on the floor, before reaching it...'
+						'You try to reach the bed but pass out right on the floor before reaching it...'
 
 						act 'Wake up':
 							*clr & cla
@@ -1210,7 +1207,7 @@ if $ARGS[0] = 'hunterstable':
 
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/pohmel4.jpg"></center>'
 							*nl
-							'Four hours later you wake up in the middle of the night. You''ve got a headache and vaguely remember yesterday.'
+							'Four hours later, you wake up in the middle of the night. You''ve got a headache and vaguely remember yesterday.'
 
 							act 'Continue': gt 'swamphouse', 'start'
 						end
@@ -1248,7 +1245,7 @@ if $ARGS[0] = 'hunterstable':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/pjanaja5.jpg"></center>'
 						*nl
-						'The drunken men ask you to dance for them, Andrei turns on the music and you drunkenly start swaying next to the table...'
+						'The drunken men ask you to dance for them. Andrei turns on the music, and you drunkenly start swaying next to the table...'
 						inhib_exp += rand(0,1)
 						if hunterslut < 5:
 							act 'Stop dancing':
@@ -1257,7 +1254,7 @@ if $ARGS[0] = 'hunterstable':
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/sleep11.jpg"></center>'
 								*nl
-								'Standing on your feet you come to realization that you need to sleep. The men get frustrated when they notice you crashing on the couch and going to sleep.'
+								'Standing on your feet, you come to realization that you need to sleep. The men get frustrated when they notice you crashing on the couch and going to sleep.'
 
 								act 'Wake up':
 									*clr & cla
@@ -1283,7 +1280,7 @@ if $ARGS[0] = 'hunterstable':
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/dance1.'+rand(1,2)+'.jpg"></center>'
 								*nl
-								'You stand next to the table and begin to depict something that reminds of rhythmic dance, the men start clapping.'
+								'You stand next to the table and begin to depict something that resembles rhythmic dance. The men start clapping.'
 								inhib_exp += rand(0,1)
 								if hunterslut >= 10:
 									act 'Keep dancing':
@@ -1297,7 +1294,7 @@ if $ARGS[0] = 'hunterstable':
 										gs 'stat'
 										'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/dance2.'+rand(1,2)+'.jpg"></center>'
 										*nl
-										'In the spur of the moment, while the men cheer you on, you remove your top, leaving you only with a bra on...'
+										'In the spur of the moment while the men cheer you on, you remove your top, leaving you only with a bra on...'
 										inhib_exp += rand(0,1)
 										if hunterslut >= 15:
 											act 'Keep dancing':
@@ -1311,7 +1308,7 @@ if $ARGS[0] = 'hunterstable':
 												gs 'stat'
 												'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/dance3.jpg"></center>'
 												*nl
-												'The men continue cheering you on, you keep undressing further, remaining only in underwear...'
+												'The men continue cheering you on, and you keep undressing further, remaining only in underwear...'
 												inhib_exp += rand(0,1)
 												act 'Pass out':
 													*clr & cla
@@ -1319,7 +1316,7 @@ if $ARGS[0] = 'hunterstable':
 													gs 'stat'
 													'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/sleep10.jpg"></center>'
 													*nl
-													'You clearly overestimated the capability of your body. So after a while dancing, you pass out on the floor, making the men quite nervous...'
+													'You clearly overestimated the capability of your body, as after a while dancing, you pass out on the floor, making the men quite nervous...'
 
 													act 'Wake up':
 														*clr & cla
@@ -1331,7 +1328,7 @@ if $ARGS[0] = 'hunterstable':
 
 														'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/pohmel4.jpg"></center>'
 														*nl
-														'You sleep for four hours, waking up in the middle night, barely able to get up off the floor. You''ve got a headache and vaguely remember yesterday.'
+														'You sleep for four hours, waking up in the middle of the night, barely able to get up off the floor. You''ve got a headache and vaguely remember yesterday.'
 
 														act 'Continue': gt 'swamphouse', 'start'
 													end
@@ -1344,7 +1341,7 @@ if $ARGS[0] = 'hunterstable':
 												gs 'stat'
 												'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/sleep11.jpg"></center>'
 												*nl
-												'After a while of dancing, your legs aren''t longer able to keep up, so you decide to go to sleep much to the mens disappointment.'
+												'After a while dancing, your legs are no longer able to keep up, so you decide to go to sleep, much to the men''s disappointment.'
 
 												act 'Wake up':
 													*clr & cla
@@ -1370,7 +1367,7 @@ if $ARGS[0] = 'hunterstable':
 										gs 'stat'
 										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/sleep11.jpg"></center>'
 										*nl
-										'After a while of dancing, your legs aren''t longer able to keep up, so you decide to go to sleep much to the mens disappointment.'
+										'After a while dancing, your legs are no longer able to keep up, so you decide to go to sleep, much to the men''s disappointment.'
 
 										act 'Wake up':
 											*clr & cla
@@ -1401,7 +1398,7 @@ if $ARGS[0] = 'hunterstable':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/pjanaja5.jpg"></center>'
 					*nl
-					'The drunken men ask you to dance for them, Andrei turns on the music and you drunkenly start swaying next to the table...'
+					'The drunken men ask you to dance for them. Andrei turns on the music, and you drunkenly start swaying next to the table...'
 
 					act 'Dance':
 						*clr & cla
@@ -1410,7 +1407,7 @@ if $ARGS[0] = 'hunterstable':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/dance1.'+rand(1,2)+'.jpg"></center>'
 						*nl
-						'You stand next to the table and begin to depict something that reminds of rhythmic dance, the men start clapping.'
+						'You stand next to the table and begin to depict something that resembles rhythmic dance. The men start clapping.'
 						inhib_exp += rand(0,1)
 						act 'Keep dancing':
 							*clr & cla
@@ -1423,7 +1420,7 @@ if $ARGS[0] = 'hunterstable':
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/dance2.'+rand(1,2)+'.jpg"></center>'
 							*nl
-							'In the spur of the moment, while the men cheer you on, you remove your top, leaving you only with a bra on...'
+							'In the spur of the moment while the men cheer you on, you remove your top, leaving you only with a bra on...'
 							inhib_exp += rand(0,1)
 							act 'Keep dancing':
 								*clr & cla
@@ -1437,7 +1434,7 @@ if $ARGS[0] = 'hunterstable':
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/dance3.jpg"></center>'
 								*nl
-								'The men continue cheering you on, you keep undressing further, remaining only in underwear...'
+								'The men continue cheering you on, and you keep undressing further, remaining only in underwear...'
 
 								act 'Keep dancing':
 									*clr & cla
@@ -1450,7 +1447,7 @@ if $ARGS[0] = 'hunterstable':
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/dance4.jpg"></center>'
 									*nl
-									'You remove the bra and throw it on the table, the men cheer you on and you flash your breasts in front of them.'
+									'You remove the bra and throw it on the table. The men cheer you on, and you flash your breasts in front of them.'
 									gs 'arousal', 'flash', 10
 									gs 'stat'
 									if temp_sh = 1:
@@ -1460,7 +1457,7 @@ if $ARGS[0] = 'hunterstable':
 											gs 'stat'
 											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/sleep17.jpg"></center>'
 											*nl
-											'You clearly overestimated the capability of your body. So after a while dancing, you pass out on the floor, making the men quite nervous...'
+											'You clearly overestimated the capability of your body, as after a while dancing, you pass out on the floor, making the men quite nervous...'
 
 											act 'Wake up':
 												*clr & cla
@@ -1472,7 +1469,7 @@ if $ARGS[0] = 'hunterstable':
 
 												'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/pohmel3.jpg"></center>'
 												*nl
-												'You sleep for four hours, waking up in the middle night, barely able to get up off the floor. You''ve got a headache and vaguely remember yesterday.'
+												'You sleep for four hours, waking up in the middle of the night, barely able to get up off the floor. You''ve got a headache and vaguely remember yesterday.'
 
 												act 'Continue': gt 'swamphouse', 'start'
 											end
@@ -1505,7 +1502,7 @@ if $ARGS[0] = 'hunterstable':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamphousedrunkgirl1.jpg"></center>'
 			*nl
-			'You''re really drunk, you slur your words,	 and everything is spinning...'
+			'You''re really drunk, you slur your words, and everything is spinning...'
 
 			if temp_sh = 1:
 				act 'Pass out':
@@ -1526,7 +1523,7 @@ if $ARGS[0] = 'hunterstable':
 
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/pohmel1.jpg"></center>'
 						*nl
-						'Three hours later you wake up in the middle of the night. You''ve got a headache and vaguely remember yesterday.'
+						'Three hours later, you wake up in the middle of the night. You''ve got a headache and vaguely remember yesterday.'
 
 						act 'Continue': gt 'swamphouse', 'start'
 					end
@@ -1539,7 +1536,7 @@ if $ARGS[0] = 'hunterstable':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/sleep7.jpg"></center>'
 					*nl
-					'You try to reach the bed, but pass out right on the floor, before reaching it...'
+					'You try to reach the bed but pass out right on the floor before reaching it...'
 
 					act 'Wake up':
 						*clr & cla
@@ -1551,7 +1548,7 @@ if $ARGS[0] = 'hunterstable':
 
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/pohmel4.jpg"></center>'
 						*nl
-						'Four hours later you wake up in the middle of the night. You''ve got a headache and vaguely remember yesterday.'
+						'Four hours later, you wake up in the middle of the night. You''ve got a headache and vaguely remember yesterday.'
 
 						act 'Continue': gt 'swamphouse', 'start'
 					end
@@ -1564,7 +1561,7 @@ if $ARGS[0] = 'hunterstable':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/sleep4.jpg"></center>'
 					*nl
-					'You somehow got to the couch and passed out without undressing...'
+					'You somehow get to the couch and pass out without undressing...'
 
 					act 'Wake up':
 						*clr & cla
@@ -1589,7 +1586,7 @@ if $ARGS[0] = 'hunterstable':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/pjanaja5.jpg"></center>'
 					*nl
-					'The drunken men ask you to dance for them, Andrei turns on the music and you drunkenly start swaying next to the table...'
+					'The drunken men ask you to dance for them. Andrei turns on the music, and you drunkenly start swaying next to the table...'
 
 					act 'Dance':
 						*clr & cla
@@ -1599,7 +1596,7 @@ if $ARGS[0] = 'hunterstable':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/dance1.'+rand(1,2)+'.jpg"></center>'
 						*nl
-						'You stand next to the table and begin to depict something that reminds of rhythmic dance, the men start clapping.'
+						'You stand next to the table and begin to depict something that resembles rhythmic dance. The men start clapping.'
 
 						act 'Keep dancing':
 							*clr & cla
@@ -1609,7 +1606,7 @@ if $ARGS[0] = 'hunterstable':
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/dance2.'+rand(1,2)+'.jpg"></center>'
 							*nl
-							'In the spur of the moment, while the men cheer you on, you remove your top, leaving you only with a bra on...'
+							'In the spur of the moment while the men cheer you on, you remove your top, leaving you only with a bra on...'
 
 							act 'Keep dancing':
 								*clr & cla
@@ -1619,7 +1616,7 @@ if $ARGS[0] = 'hunterstable':
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/dance3.jpg"></center>'
 								*nl
-								'The men continue cheering you on, you keep undressing further, remaining only in underwear...'
+								'The men continue cheering you on, and you keep undressing further, remaining only in underwear...'
 
 								act 'Keep dancing':
 									*clr & cla
@@ -1627,7 +1624,7 @@ if $ARGS[0] = 'hunterstable':
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/dance4.jpg"></center>'
 									*nl
-									'You remove the bra and throw it on the table, the men cheer you on and you flash your breasts in front of them.'
+									'You remove the bra and throw it on the table. The men cheer you on, and you flash your breasts in front of them.'
 									gs 'arousal', 'flash', 10
 									gs 'stat'
 									if temp_sh = 1:
@@ -1637,7 +1634,7 @@ if $ARGS[0] = 'hunterstable':
 											gs 'stat'
 											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/sleep17.jpg"></center>'
 											*nl
-											'You clearly overestimated the capability of your body. So after a while dancing, you pass out on the floor, making the men quite nervous...'
+											'You clearly overestimated the capability of your body, as after a while dancing, you pass out on the floor, making the men quite nervous...'
 
 											act 'Wake up':
 												*clr & cla
@@ -1649,7 +1646,7 @@ if $ARGS[0] = 'hunterstable':
 
 												'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/pohmel3.jpg"></center>'
 												*nl
-												'You sleep for four hours, waking up in the middle night, barely able to get up off the floor. You''ve got a headache and vaguely remember yesterday.'
+												'You sleep for four hours, waking up in the middle of the night, barely able to get up off the floor. You''ve got a headache and vaguely remember yesterday.'
 
 												act 'Continue': gt 'swamphouse', 'start'
 											end
@@ -1696,7 +1693,7 @@ if $ARGS[0] = 'hunterstable':
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterstable.jpg"></center>'
 			*nl
-			'You start chating with the guys about trivial stuff...'
+			'You start chatting with the guys about trivial stuff...'
 
 			act 'Continue': gt 'swamphouse', 'hunterstable'
 		end
@@ -1712,7 +1709,7 @@ if $ARGS[0] = 'hunterstable':
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterstable.jpg"></center>'
 			*nl
-			'You start chating with the guys about trivial stuff...'
+			'You start chatting with the guys about trivial stuff...'
 
 			act 'Continue': gt 'swamphouse', 'hunterstable'
 		end
@@ -1726,9 +1723,9 @@ if $ARGS[0] = 'hunterstable':
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterstable.jpg"></center>'
 			*nl
-			'You sit down at the table, wanting to eat with the guys, before you can begin you hear...'
-			'"Not so fast <<$pcs_nickname>>, Andrei said with a smile on his face. "You understand that the only free cheese is the one found in the mousetrap."'
-			'"Want to eat with us, you need to do some work," he mockingly grinned and pointed under the table.'
+			'You sit down at the table, wanting to eat with the guys, but before you can begin, you hear...'
+			'"Not so fast <<$pcs_nickname>>," Andrei says with a smile on his face. "You understand that the only free cheese is the one found in the mousetrap."'
+			'"Want to eat with us, you need to do some work," he mockingly grins and points under the table.'
 
 			act 'Crawl under the table': gs 'swamphouse', 'hunterstableBJ'
 			act 'Refuse': gt 'swamphouse', 'start'
@@ -1740,7 +1737,7 @@ if $ARGS[0] = 'hunterstable':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterstable.jpg"></center>'
 			*nl
 			'Noticing you, the men start grinning...'
-			'"About time! Our <<$pcs_nickname>> has arrived. Come here, join us at the table." said Andrei.'
+			'"About time! Our <<$pcs_nickname>> has arrived. Come here, join us at the table," says Andrei.'
 
 			act 'Sit at the table':hunterstableBJ = 1 & gs 'swamphouse', 'hunterstable'
 		end
@@ -1753,7 +1750,7 @@ if $ARGS[0] = 'hunterstable':
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterstable.jpg"></center>'
 		*nl
-		'You sit down at the table, wanting to eat with the guys, before you can begin you hear...'
+		'You sit down at the table, wanting to eat with the guys, but before you can begin, you hear...'
 		'"Damn, <<$pcs_nickname>>, I know you like our artistic work on your face, but you need to wash up before you sit down with us.'
 
 		act 'Go': gt 'swamphouse', 'start'
@@ -1786,8 +1783,8 @@ if $ARGS[0] = 'huntersmokBJ':
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/hantersmokbj1.'+rand(1,3)+'.jpg"></center>'
 	*nl
-	if huntersmokBJ = 0:'You got comfortable on your knees and start sucking on his cock...'
-	if huntersmokBJ = 1:'Andrei did not finish, so you continue to suck...'
+	if huntersmokBJ = 0:'You get comfortable on your knees and start sucking on his cock...'
+	if huntersmokBJ = 1:'Andrei does not finish, so you continue to suck...'
 	gs 'arousal', 'bj', 5, 'sub'
 	gs 'stat'
 
@@ -1803,7 +1800,7 @@ if $ARGS[0] = 'huntersmokBJ':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/hantersmokcum.jpg"></center>'
 			*nl
 			'You notice Andrei''s thighs stiffen as he''s edging... He lets out a grunt and shoots his spunk all over your face.'
-			'"You''re really good at this, <<$pcs_nickname>>," said a pleased Andrei. "You''re the perfect stress reliever.'
+			'"You''re really good at this, <<$pcs_nickname>>," says a pleased Andrei. "You''re the perfect stress reliever.'
 			'You clean yourself up before walking back to the hut with Andrei.'
 
 			gs 'arousal', 'end'
@@ -1827,8 +1824,8 @@ if $ARGS[0] = 'dirty_swamphouse':
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/dirty_swamphouse.jpg"></center>'
 	*nl
-	'Visiting the hut, you notice that the hut has gotten pretty dirty. "I need to do something about this." you think to yourself. You grab a broom and a rag and began cleaning.'
-	'After a while you''ve finished cleaning and put back everything in order again. You''re quite pleased with yourself.'
+	'Visiting the hut, you notice that it has gotten pretty dirty. "I need to do something about this," you think to yourself. You grab a broom and a rag and begin cleaning.'
+	'After a while, you''ve finished cleaning and put everything back in order again. You''re quite pleased with yourself.'
 
 	act 'Continue':dirty_swamphouse = 0 & gt 'swamphouse', 'start'
 end
@@ -1854,7 +1851,7 @@ if $ARGS[0] = 'get_dressed':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamphousenude1.jpg"></center>'
 			*nl
 			'Seeing you naked, the men just shake their heads...'
-			'"Look here <<$pcs_nickname>>, if you want to charm us, you will need to think of something else." said one of the guys.'
+			'"Look here <<$pcs_nickname>>, if you want to charm us, you will need to think of something else," says one of the guys.'
 
 			act 'Continue': gt $loc, $loc_arg
 		end
@@ -1876,7 +1873,7 @@ if $ARGS[0] = 'get_dressed':
 
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampdvornude1.jpg"></center>'
 				*nl
-				'You look around searching for your clothes. When you spot them, you dash over to grab them.'
+				'You look around, searching for your clothes. When you spot them, you dash over to grab them.'
 				act 'Continue': gt $loc, $loc_arg
 			end
 		else
@@ -1887,7 +1884,7 @@ if $ARGS[0] = 'get_dressed':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/tkan_cloth.jpg"></center>'
 				*nl
-				'You look around searching for your clothes but can''t seem to find them, instead you hide behind a piece of hessian... It''s better than nothing.'
+				'You look around, searching for your clothes, but can''t seem to find them. Instead, you hide behind a piece of hessian... It''s better than nothing.'
 				act 'Continue': gt $loc, $loc_arg
 			end
 		end
@@ -1898,8 +1895,8 @@ if $ARGS[0] = 'get_dressed':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamphousenude1.jpg"></center>'
 			*nl
-			'You take a deep breath and decided to disregard your nerves and leave it as it is. Upon encountering the hunters, they can''t help themselves, they start staring at your most private parts.'
-			'"Damn, <<$pcs_nickname>>, you look really good. The things I would want to do to you..." said a somewhat aroused Andrei.'
+			'You take a deep breath and decide to disregard your nerves and leave yourself as is. Upon encountering the hunters, they can''t help themselves, they start staring at your most private parts.'
+			'"Damn, <<$pcs_nickname>>, you look really good. The things I would want to do to you..." says a somewhat aroused Andrei.'
 			act 'Continue': gt $loc, $loc_arg
 		end
 	end

+ 8 - 6
locations/tatiana_lab.qsrc

@@ -707,12 +707,14 @@ if $ARGS[0] = 'Tatianasuctalk':
 	'<center><img <<$set_imgh>> src="images/system/intro/shared/karinpre.jpg"></center>'
 	if sucpcinfo < 2:
 		minut += 15
-		'As you both settle onto the couch, Tatiana turns to you and says, "Ok, tell me what happened."'
-		'You spend the next 15 minutes telling her about the Fairy, the odd dream, the energy you let loose the other night,'
-		if succubusQW = 4:
-			'and the felling you get when you''ve had sex.'
-		elseif succubusQW > 4:
-			'the felling you get when you''ve had sex, and the reaction you had to almost being raped.'
+		*p 'As you both settle onto the couch, Tatiana turns to you and says, "Ok, tell me what happened."'
+		'You spend the next 15 minutes telling her about the Fairy, the odd dream, '
+		if succubusQW < 4:
+			'and the energy you let loose the other night.'
+		elseif succubusQW = 4:
+			'the energy you let loose the other night, and the feeling you get when you''ve had sex.'
+		else
+			'the energy you let loose the other night, the feeling you get when you''ve had sex, and the reaction you had to almost being raped.'
 		end
 		''
 		'She thinks about it for a moment and then says, "Well, I have a couple of ideas, but no sense guessing when I can just magically examine you."'

+ 16 - 65
locations/tour_guide.qsrc

@@ -31,7 +31,6 @@ if $ARGS[0] = 'tourstart':
 		act 'Change your mind': gt 'pav_park', 'start'
 	elseif TourGuide = 1:
 		*clr & cla
-		tourdom = rand(1,3)
 		minut += 180
 		inhib_exp += rand(0,1)
 		humint_exp += rand(0,2)
@@ -40,33 +39,13 @@ if $ARGS[0] = 'tourstart':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/palace/pav_palace.jpg"></center>'
 		'You spend the first part of your day walking tourists around the more famous parts of the park and museums on the grounds.'
 		
-		if tourdom = 1:
-			act 'Eat lunch and get back to work':
-				minut += 180
-				pcs_health += 10
-				pcs_energy += 40
-				pcs_hydra += 40
-				gs 'stat'
-				gt 'tour_guide', 'tourran1'
-			end
-		elseif tourdom = 2:
-			act 'Eat lunch and get back to work':
-				minut += 180
-				pcs_health += 10
-				pcs_energy += 40
-				pcs_hydra += 40
-				gs 'stat'
-				gt 'tour_guide', 'tourran2'
-			end
-		elseif tourdom = 3:
-			act 'Eat lunch and get back to work':
-				minut += 180
-				pcs_health += 10
-				pcs_energy += 40
-				pcs_hydra += 40
-				gs 'stat'
-				gt 'tour_guide', 'tourran3'
-			end
+		act 'Eat lunch and get back to work':
+			minut += 180
+			pcs_health += 10
+			pcs_energy += 40
+			pcs_hydra += 40
+			gs 'stat'
+			gt 'tour_guide', 'tourran' + rand(1, 3)
 		end
 	end
 end
@@ -296,7 +275,6 @@ if $ARGS[0] = 'toursdone':
 	menu_off = 1
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/palace/office/tour_office.jpg"></center>'
-	killvar 'tourdom'
 	money += 600
 	gs 'stat'
 	'As the day goes on the flood of tourists wanting to see the Palace slows to a crawl. Eventually you hit your six hour mark and head back to the office to change into your own clothes and collect your pay.'
@@ -337,28 +315,10 @@ if $ARGS[0] = 'backroom':
 	'You enter a small office, far enough from the front desk that you know anything could happen back here and nobody would even notice.'
 	if riverbusted = 2:
 		'"As usual, you were missing again, <<$pcs_firstname>>. I guess you don''t learn easily. You know your options, get naked and in the position, or get out."'
-		act 'Take your punishment': gt 'tour_guide', 'spank'
-		act 'Quit your job':
-			TourGuide = 2
-			work = 0
-			killvar 'riverbusted'
-			pcs_mood -= 25
-			gs 'stat'
-			gt 'pav_park', 'start'
-		end
 	elseif riverbusted = 1:
 		'"I went to check up on you today, and you were missing, again, <<$pcs_firstname>>. I thought you would be smarter about this. I told you last time if it happened again, your punishment would be a lot worse."'
 		'"But, sir, I..." is all you manage before he makes a cutting motion with his hand.'
 		'"This time you will get the strap, entirely nude, and it will hurt for a long time. If you cannot handle that, then get out and don''t come back. It''s that simple."'
-		act 'Take your punishment': gt 'tour_guide', 'spank'
-		act 'Quit your job':
-			TourGuide = 2
-			work = 0
-			killvar 'riverbusted'
-			pcs_mood -= 25
-			gs 'stat'
-			gt 'pav_park', 'start'
-		end
 	elseif riverbusted = 0 and pav_slut > 100:
 		'"You were gone a long time today, several tours were delayed as we had to scramble to get things back on track. Where did you disappear to?"'
 		'"I had to use the restroom," you try to lie. "I''m sorry, it is just that time of the month, I had a lot to clean up!"'
@@ -366,15 +326,6 @@ if $ARGS[0] = 'backroom':
 		'You open your mouth to respond but he cuts you off. "You have two choices. Either you don''t work here anymore, or you take your punishment, and I keep a closer eye on you."'
 		'"What punishment, Sir?" You ask nervously, afraid to hear the answer.'
 		'"Corporal Punishment, <<$pcs_firstname>>. Either you bare your butt and bend over this desk, or you turn in your uniform, and never come back. If you let me, I can make a decent person out of you, now decide."'
-		act 'Take your punishment': gt 'tour_guide', 'spank'
-		act 'Quit your job':
-			TourGuide = 2
-			work = 0
-			killvar 'riverbusted'
-			pcs_mood -= 25
-			gs 'stat'
-			gt 'pav_park', 'start'
-		end
 	else
 		'"You were gone a long time today, several tours were delayed as we had to scramble to get things back on track. Where did you disappear to?"'
 		'"I had to use the restroom," you try to lie. "I''m sorry, it is just that time of the month, I had a lot to clean up!"'
@@ -382,15 +333,15 @@ if $ARGS[0] = 'backroom':
 		'You open your mouth to respond but he cuts you off. "You have two choices. Either you don''t work here anymore, or you take your punishment, and I keep a closer eye on you, from now on."'
 		'"What punishment, Sir?" You ask nervously, afraid to hear the answer.'
 		'"Corporal Punishment, <<$pcs_firstname>>. Either you bare your butt and bend over this desk, or you turn in your uniform, and never come back. Decide."'
-		act 'Take your punishment': gt 'tour_guide', 'spank'
-		act 'Quit your job':
-			TourGuide = 2
-			work = 0
-			killvar 'riverbusted'
-			pcs_mood -= 25
-			gs 'stat'
-			gt 'pav_park', 'start'
-		end
+	end
+	act 'Take your punishment': gt 'tour_guide', 'spank'
+	act 'Quit your job':
+		TourGuide = 2
+		work = 0
+		killvar 'riverbusted'
+		pcs_mood -= 25
+		gs 'stat'
+		gt 'pav_park', 'start'
 	end
 end
 

+ 95 - 93
locations/webcam_site.qsrc

@@ -31,7 +31,7 @@ if $args[0] = 'start':
 end
 
 !-----------------------------------------------!
-!------Registration page online chat---------!
+!--------Registration page online chat----------!
 !-----------------------------------------------!
 $webcam_rega = {
 	cls
@@ -48,7 +48,7 @@ $webcam_rega = {
 }
 
 !-----------------------------------------------!
-!-------Page statistics online chat---------!
+!---------Page statistics online chat-----------!
 !-----------------------------------------------!
 $webcam_stat = {
 	cls
@@ -75,7 +75,7 @@ $webcam_stat = {
 	act 'Return': gt 'webcam_site'
 }
 !-----------------------------------------------!
-!-------Help page online chat-------------!
+!-------------Help page online chat-------------!
 !-----------------------------------------------!
 $webcam_help = {
 	cls
@@ -96,7 +96,7 @@ $webcam_help = {
 }
 
 !-----------------------------------------------!
-!--------Home online chat-----------!
+!--------------Home online chat-----------------!
 !-----------------------------------------------!
 
 $webcam_index = {
@@ -132,7 +132,7 @@ $webcam_index = {
 	end
 }
 !-----------------------------------------------!
-!---------Webcam shows online chat----------------!
+!---------Webcam shows online chat--------------!
 !-----------------------------------------------!
 !if $args[0] = 'show':
 $webcam_show = {
@@ -164,7 +164,7 @@ $webcam_show = {
 		act 'Logout': gt 'webcam_site'
 	end	
 !------------------------------!
-!-------Continued show--------!
+!--------Continued show--------!
 !------------------------------!
 	if show_counter > 0 and show_counter < 4:
 		gs'stat'
@@ -195,7 +195,7 @@ $webcam_show = {
 			end	
 		end
 !------------------------------!
-!-----------Boobs-------------!
+!------------Boobs-------------!
 !------------------------------!			
 		if my_show_tits = 0:
 			act 'Play with your breasts':
@@ -216,7 +216,7 @@ $webcam_show = {
 			end
 		end			
 !------------------------------!
-!---------Masturbation----------!
+!---------Masturbation---------!
 !------------------------------!	
 		if my_show_mast = 0:
 			act 'Masturbate':
@@ -246,46 +246,46 @@ $webcam_show = {
 			end
 		end
 !-----------------------------------------------!
-!-----------Rubber cock in her mouth----------------!
+!-----------Rubber cock in her mouth------------!
 !-----------------------------------------------!	
-		if pcs_throat >= 1 and dildo = 1 and my_show_throat = 0:
+		!! This was updated to include all the dildos as it previously was missing some. Most of the code was left
+		!! as is with the additional dildos just merged into existing paths for simplicity. If this file is ever
+		!! added back to the game, there should probably be separate branches for all dildo sizes. At the very
+		!! least, they should give different tip amounts
+		if my_show_throat = 0 and (dildo = 1 or (pcs_throat >= 15 and middildo = 1) or (pcs_throat >= 20 and largedildo = 1) or (pcs_throat >= 25 and bigdildo = 1) or (pcs_throat >= 30 and extradildo = 1) or (pcs_throat >= 35 and superdildo = 1) or (pcs_throat >= 40 and maddildo = 1)):
 			act 'Dildo in the mouth':
 				gs'stat'
 				*clr
-				!Average dildo 15cm
-				if pcs_throat >= 15 and pcs_throat < 25 and middildo = 1:
-					'<center><video autoplay loop src="images/shared/accessories/computer/webcam/toys/midthroat'+rand(1,3)+'.mp4" ></video></center>'	
-					'You get out your big 15cm dildo and start licking it, sucking it, and shoving it into your mouth.'
+				!!Enormous dildos 35cm and 40cm
+				if (pcs_throat >= 35 and superdildo = 1) or (pcs_throat >= 40 and maddildo = 1):
+					'<center><video autoplay loop src="images/shared/accessories/computer/webcam/toys/extrthroat'+rand(1,2)+'.mp4" ></video></center>'		
+
+					'You take out your enormous ' + iif(pcs_throat >= 40 and maddildo = 1, '40cm', '35cm') + ' dildo and start trusting it into your throat.'
 					
-					my_show_tip = rand(100, 500)
-					if pcs_throat < 25: pcs_throat += 1
-				end
-				!Big Dildo 25cm
-				if pcs_throat >= 25 and pcs_throat < 35 and bigdildo = 1:
-					*clr
+					my_show_tip = rand(600, 1400)
+					if pcs_throat < 40: pcs_throat += 1
+				!!Giant dildos 25cm and 30cm
+				elseif (pcs_throat >= 25 and bigdildo = 1) or (pcs_throat >= 30 and extradildo = 1):
 					'<center><video autoplay loop src="images/shared/accessories/computer/webcam/toys/bigthroat'+rand(1,3)+'.mp4" ></video></center>'		
 
-					'You get out your giant 25cm dildo and begin to rhythmically drive it into your throat.'
+					'You get out your giant ' + iif(pcs_throat >= 30 and extradildo = 1, '30cm', '25cm') + ' dildo and begin to rhythmically drive it into your throat.'
 					
 					my_show_tip = rand(500, 1000)
-					if pcs_throat < 35: pcs_throat += 1
-				end
-				!Huge Dildo 40cm
-				if pcs_throat >= 35 and maddildo = 1:
-					*clr
-					'<center><video autoplay loop src="images/shared/accessories/computer/webcam/toys/extrthroat'+rand(1,2)+'.mp4" ></video></center>'		
-
-					'You take out your enormous 40cm dildo and start trusting it into your throat.'
+					if pcs_throat < 30 or (pcs_throat < 35 and extradildo = 1): pcs_throat += 1
+				!!Big dildos 15cm and 20cm
+				elseif (pcs_throat >= 15 and middildo = 1) or (pcs_throat >= 20 and largedildo = 1):
+					'<center><video autoplay loop src="images/shared/accessories/computer/webcam/toys/midthroat'+rand(1,3)+'.mp4" ></video></center>'	
+					'You get out your big ' + iif(pcs_throat >= 20 and largedildo = 1, '20cm', '15cm') + ' dildo and start licking it, sucking it, and shoving it into your mouth.'
 					
-					my_show_tip = rand(600, 1400)
-				end
-				!normal dildo 10cm
-				if pcs_throat < 15 and dildo = 1:
+					my_show_tip = rand(100, 500)
+					if pcs_throat < 20 or (pcs_throat < 25 and largedildo = 1): pcs_throat += 1
+				!!Normal dildo 10cm
+				else
 					'<center><video autoplay loop src="images/shared/accessories/computer/webcam/toys/throat'+rand(1,3)+'.mp4" ></video></center>'
 					'You get out your 10cm dildo and start to gently suck it.'
 					
 					my_show_tip = rand(100, 500)
-					pcs_throat += 1
+					if pcs_throat < 15: pcs_throat += 1
 				end
 				
 				'For this little idea, you have earned <<my_show_tip>> <b>₽</b>.'
@@ -298,46 +298,46 @@ $webcam_show = {
 			end	
 		end		
 !-----------------------------------------------!
-!---------Rubber dick in pussy----------------!
+!-------------Rubber dick in pussy--------------!
 !-----------------------------------------------!
-		if vgape < 3 and pcs_vag >= 1 and dildo = 1 and my_show_pussy = 0:
+		!! This was updated to include all the dildos as it previously was missing some. Most of the code was left
+		!! as is with the additional dildos just merged into existing paths for simplicity. If this file is ever
+		!! added back to the game, there should probably be separate branches for all dildo sizes. At the very
+		!! least, they should give different tip amounts
+		if vgape < 3 and my_show_pussy = 0 and (dildo = 1 or (pcs_vag >= 15 and middildo = 1) or (pcs_vag >= 20 and largedildo = 1) or (pcs_vag >= 25 and bigdildo = 1) or (pcs_vag >= 30 and extradildo = 1) or (pcs_vag >= 35 and superdildo = 1) or (pcs_vag >= 40 and maddildo = 1)):
 			act 'Dildo in the pussy':
 				gs'stat'
 				*clr
-				!Average dildo 15cm
-				if pcs_vag >= 15 and pcs_vag < 25 and middildo = 1:
-					'<center><video autoplay loop src="images/shared/accessories/computer/webcam/toys/midvagin'+rand(1,3)+'.mp4" ></video></center>'	
-					'You get out your big 15cm dildo and begin rhythmically driving it into your pussy.'
+				!!Enormous dildos 35cm and 40cm
+				if (pcs_vag >= 35 and superdildo = 1) or (pcs_vag >= 40 and maddildo = 1):
+					'<center><video autoplay loop src="images/shared/accessories/computer/webcam/toys/extrvagin'+rand(1,2)+'.mp4" ></video></center>'		
+
+					'You take out your enormous ' + iif(pcs_vag >= 40 and maddildo = 1, '40cm', '35cm') + ' dildo and start thrusting it into your pussy.'
 					
-					my_show_tip = rand(200, 700)
-					if pcs_vag < 25: pcs_vag += 1
-				end
-				!Big Dildo 25cm
-				if pcs_vag >= 25 and pcs_vag < 35 and bigdildo = 1:
-					*clr
+					my_show_tip = rand(700, 1400)
+					if pcs_vag < 40: pcs_vag += 1
+				!!Giant dildos 25cm and 30cm
+				elseif (pcs_vag >= 25 and bigdildo = 1) or (pcs_vag >= 30 and extradildo = 1):
 					'<center><video autoplay loop src="images/shared/accessories/computer/webcam/toys/bigvagin'+rand(1,3)+'.mp4" ></video></center>'		
 
-					'You get out your giant 25cm dildo and begin rhythmically driving it into your pussy.'
+					'You get out your giant ' + iif(pcs_vag >= 30 and extradildo = 1, '30cm', '25cm') + ' dildo and begin rhythmically driving it into your pussy.'
 					
 					my_show_tip = rand(400, 800)
-					if pcs_vag < 35: pcs_vag += 1
-				end
-				!a giant dildo 40cm
-				if pcs_vag >= 35 and maddildo = 1:
-					*clr
-					'<center><video autoplay loop src="images/shared/accessories/computer/webcam/toys/extrvagin'+rand(1,2)+'.mp4" ></video></center>'		
-
-					'You take out your enormous 40cm dildo and start thrusting it into your pussy.'
+					if pcs_vag < 30 or (pcs_vag < 35 and extradildo = 1): pcs_vag += 1
+				!!Big dildos 15cm and 20cm
+				elseif (pcs_vag >= 15 and middildo = 1) or (pcs_vag >= 20 and largedildo = 1):
+					'<center><video autoplay loop src="images/shared/accessories/computer/webcam/toys/midvagin'+rand(1,3)+'.mp4" ></video></center>'	
+					'You get out your big ' + iif(pcs_vag >= 20 and largedildo = 1, '20cm', '15cm') + ' dildo and begin rhythmically driving it into your pussy.'
 					
-					my_show_tip = rand(700, 1400)
-				end
-				!normal dildo 10cm
-				if pcs_vag < 15 and dildo = 1:
+					my_show_tip = rand(200, 700)
+					if pcs_vag < 20 or (pcs_vag < 25 and largedildo = 1): pcs_vag += 1
+				!!Normal dildo 10cm
+				else
 					'<center><video autoplay loop src="images/shared/accessories/computer/webcam/toys/vagin'+rand(1,3)+'.mp4" ></video></center>'
 					'You get out your 10cm dildo and begin rhythmically driving it into your pussy.'
 					
 					my_show_tip = rand(100, 600)
-					pcs_vag += 1
+					if pcs_vag < 15: pcs_vag += 1
 				end
 				
 				pcs_horny += 30
@@ -361,7 +361,11 @@ $webcam_show = {
 !-----------------------------------------------!
 !---------Rubber dick in the ass----------------!
 !-----------------------------------------------!		
-		if agape < 3 and pcs_ass => 1 and dildo = 1 and my_show_anus = 0:
+		!! This was updated to include all the dildos as it previously was missing some. Most of the code was left
+		!! as is with the additional dildos just merged into existing paths for simplicity. If this file is ever
+		!! added back to the game, there should probably be separate branches for all dildo sizes. At the very
+		!! least, they should give different tip amounts
+		if agape < 3  and my_show_anus = 0 and (dildo = 1 or (pcs_ass >= 15 and middildo = 1) or (pcs_ass >= 20 and largedildo = 1) or (pcs_ass >= 25 and bigdildo = 1) or (pcs_ass >= 30 and extradildo = 1) or (pcs_ass >= 35 and superdildo = 1) or (pcs_ass >= 40 and maddildo = 1)):
 			act 'Dildo in the ass':
 				gs'stat'
 				*clr
@@ -373,40 +377,36 @@ $webcam_show = {
 					lubri -= 1
 					'You squeeze some lube onto your hand and begin to spread it on your hole. After that, you smear a little on your dildo.'
 				end
-				!Average dildo 15see
-				if pcs_ass >= 15 and pcs_ass < 25 and middildo = 1:
-					'<center><video autoplay loop src="images/shared/accessories/computer/webcam/toys/midanal'+rand(1,3)+'.mp4" ></video></center>'	
-					'You then take your big 15cm dildo and begin rhythmically driving it into your ass.'
+				!!Enormous dildos 35cm and 40cm
+				if (pcs_ass >= 35 and superdildo = 1) or (pcs_ass >= 40 and maddildo = 1):
+					'<center><video autoplay loop src="images/shared/accessories/computer/webcam/toys/extranal'+rand(1,3)+'.mp4" ></video></center>'		
+
+					'You then take your enormous ' + iif(pcs_ass >= 40 and maddildo = 1, '40cm', '35cm') + ' dildo and start thrusting it into your ass.'
 					
-					my_show_tip = rand(300, 800)
-					if pcs_ass < 25: pcs_ass += 1
-				end
-				!Big Dildo 25see
-				if pcs_ass >= 25 and pcs_ass < 35 and bigdildo = 1:
-					*clr
+					my_show_tip = rand(700, 1400)
+					if pcs_ass < 40: pcs_ass += 1
+				!!Giant dildos 25cm and 30cm
+				elseif (pcs_ass >= 25 and bigdildo = 1) or (pcs_ass >= 30 and extradildo = 1):
 					'<center><video autoplay loop src="images/shared/accessories/computer/webcam/toys/biganal'+rand(1,3)+'.mp4" ></video></center>'		
 
-					'You then take your giant 25cm dildo and begin rhythmically driving it into your ass.'
+					'You then take your giant ' + iif(pcs_ass >= 30 and extradildo = 1, '30cm', '25cm') + ' dildo and begin rhythmically driving it into your ass.'
 			
 					my_show_tip = rand(500, 1000)
-					if pcs_ass < 35: pcs_ass += 1
-				end
-				!a giant dildo 40see
-				if pcs_ass >= 35 and maddildo = 1:
-					*clr
-					'<center><video autoplay loop src="images/shared/accessories/computer/webcam/toys/extranal'+rand(1,3)+'.mp4" ></video></center>'		
-
-					'You then take your enormous 40cm dildo and start thrusting it into your ass.'
+					if pcs_ass < 30 or (pcs_ass < 35 and extradildo = 1): pcs_ass += 1
+				!!Big dildos 15cm and 20cm
+				elseif (pcs_ass >= 15 and middildo = 1) or (pcs_ass >= 20 and largedildo = 1):
+					'<center><video autoplay loop src="images/shared/accessories/computer/webcam/toys/midanal'+rand(1,3)+'.mp4" ></video></center>'	
+					'You then take your big ' + iif(pcs_ass >= 20 and largedildo = 1, '20cm', '15cm') + ' dildo and begin rhythmically driving it into your ass.'
 					
-					my_show_tip = rand(700, 1400)
-				end
+					my_show_tip = rand(300, 800)
+					if pcs_ass < 20 or (pcs_ass < 25 and largedildo = 1): pcs_ass += 1
 				!normal dildo 10cm
-				if pcs_ass < 15 and dildo = 1:
+				else
 					'<center><video autoplay loop src="images/shared/accessories/computer/webcam/toys/anal'+rand(1,3)+'.mp4" ></video></center>'
 					'You then take your 10cm dildo and begin rhythmically driving it into your ass.'
 
 					my_show_tip = rand(100, 500)
-					pcs_ass += 1
+					if pcs_ass < 15: pcs_ass += 1
 				end
 				
 				pcs_horny += 30
@@ -428,9 +428,11 @@ $webcam_show = {
 			end	
 		end	
 !------------------------------!
-!----Double penetration-----!
-!------------------------------!		
-		if agape < 3 and vgape < 3 and pcs_ass >= 20 and pcs_vag >= 20 and my_show_dp = 0:
+!------Double penetration------!
+!------------------------------!
+		!! Might be good to differentiate between different dildo sizes here. In particular, maybe there should
+		!! be different tip amounts for larger dildos like there are for the single dildo actions.
+		if max(agape, vgape) < 3 and my_show_dp = 0 and iif(min(pcs_ass, pcs_vag) >= 10, dildo, 0) +  iif(min(pcs_ass, pcs_vag) >= 15, middildo, 0) + iif(min(pcs_ass, pcs_vag) >= 20, largedildo, 0) + iif(min(pcs_ass, pcs_vag) >= 25, bigdildo, 0) + iif(min(pcs_ass, pcs_vag) >= 30, extradildo, 0) + iif(min(pcs_ass, pcs_vag) >= 35, superdildo, 0) + iif(min(pcs_ass, pcs_vag) >= 40, maddildo, 0) >= 2:
 			act 'Dildo in ass and pussy':
 				gs'stat'
 				*clr
@@ -463,7 +465,7 @@ $webcam_show = {
 			end	
 		end			
 !------------------------------!
-!---------Hand in the ass----------!
+!-------Hand in the ass--------!
 !------------------------------!		
 		if agape < 3 and pcs_ass >= 30 and my_show_afisting = 0:
 			act 'Anal fisting':
@@ -491,7 +493,7 @@ $webcam_show = {
 			end	
 		end	
 !------------------------------!
-!---------Hand in pussy---------!
+!---------Hand in pussy--------!
 !------------------------------!
 		if vgape < 3 and pcs_vag >= 30 and my_show_vfisting = 0:
 			act 'Vaginal fisting':
@@ -577,7 +579,7 @@ $webcam_show = {
 			end
 		end			
 !------------------------------!
-!----------Bracing------------!
+!-----------Bracing------------!
 !------------------------------!			
 		if pcs_danc >= 50 and my_show_flex = 0:
 			act 'Bracing':
@@ -598,7 +600,7 @@ $webcam_show = {
 		end		
 	end
 !------------------------------!
-!----------Start the show-----------!
+!-------Start the show---------!
 !------------------------------!	
 	if show_counter = 0:
 		'You turn on the webcam. It''s time to start the show!'
@@ -624,7 +626,7 @@ $webcam_show = {
 			act 'Further': dynamic $webcam_show
 		end	
 !------------------------------!
-!----------STRIPTEASE------------!
+!---------STRIPTEASE-----------!
 !------------------------------!		
 		if pcs_dancero > 10:
 			act 'Striptease':
@@ -635,7 +637,7 @@ $webcam_show = {
 				
 				!health check
 				if agape > 2 or vgape > 2 or pcs_sleep < 8:
-					'You do not feel good. You only manage to dance half as well as usual.'
+					'You do not feel good. You only manage to dance half as well as you normally could.'
 					
 					my_show_tip_mod = 2
 				else

+ 6 - 6
locations/ykuh.qsrc

@@ -10,7 +10,7 @@ menu_off = 0
 gs 'stat'
 
 '<center><b><font color="maroon">Kitchen</font></b></center>'
-'<center>A well stacked kitchen containing all the necessities to make whatever meal you please.</center>'
+'<center>A well stocked kitchen containing all the necessities to make whatever meal you please.</center>'
 
 if ymanrem[6] = 0:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/ynill.jpg"></center>'
 if ymanrem[6] = 1:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/yrem.jpg"></center>'
@@ -21,7 +21,7 @@ if dirttarelka > 0 and fairy >= dirttarelka:
 	cltarelka += dirttarelka
 	fairy -= dirttarelka
 	dirttarelka = 0
-	'You washed the dirty dishes in the dishwasher.'
+	'You wash the dirty dishes in the dishwasher.'
 elseif fairy < dirttarelka:
 	'You can''t use the dishwasher. You have no detergent.'
 end
@@ -35,7 +35,7 @@ end
 if dirttarelka > 0:'There are <b><<dirttarelka>></b> dirty dishes in the sink. <a href="exec:dynamic $dirtarm">Wash the dishes</a>.'
 
 if fairy > 0:
-	'Under the sink is some dishwashing detergent, which is enough for <b><<fairy>></b> times.'
+	'Under the sink is some dishwashing detergent, which is enough for <b><<fairy>></b> ' + iif(fairy = 1, 'time.', 'times.')
 else
 	'<b><font color="red">You have nothing to wash dishes with. You should buy some detergent.</font></b>'
 end
@@ -44,9 +44,9 @@ if eda > 0:
 	if cltarelka = 0 or edahot > 0:$edagot = ''
 	if cltarelka > 0 and edahot = 0:$edagot = '<a href="exec:dynamic $edagotd">Cook a meal (0:30)</a>'
 
-	'There''s enough food for <b><<eda>></b> servings. <<$edagot>>'
+	'There''s enough food for <b><<eda>></b> ' + iif(eda = 1, 'serving', 'servings') + '. <<$edagot>>'
 elseif edaD = 0 and eda = 0:
-	'<b><font color="red">The fridge is empty, you have nothing to eat.</font></b>'
+	'<b><font color="red">The fridge is empty. You have nothing to eat.</font></b>'
 end
 
 act 'Leave the room':minut += 1 & gt 'ymans'
@@ -63,7 +63,7 @@ if husband > 0 and husbanday > 0 and huseatday ! daystart and eda >= 2:
 		huseatday = daystart
 		pcs_mood -= 15
 		'<center><img <<$set_imgh>> src="images/shared/home/kitchen/cook.jpg"></center>'
-		'You made some delicious food for your husband.'
+		'You make some delicious food for your husband.'
 
 		act 'Put the food on the table':gt $curloc
 	end