Merge remote-tracking branch 'upstream/master' into home-and-internet

locations/artemhome.qsrc

@@ -1700,7 +1700,6 @@ if $ARGS[0] = 'chat':
 				'You give him a slightly surprised look. "You don''t want to? I thought all guys wanted to have sex with two girls at the same time."'
 				'He nervously laughs. "Well yeah... but she has such a reputation..." You can tell there is more to it by how he''s acting.'
 				'"Her rep? What, as a wild girl that likes to have sex? I thought that would be a turn-on." He blushes more and looks even more nervous. "Okay, so it''s not that, or at least not only that. If you don''t want to, we don''t have to, but what is it?" You take his hand in yours as you ask him.'
-
 				act 'Keep talking':
 					*clr & cla
 					minut += 5

locations/gad_church.qsrc

@@ -24,10 +24,10 @@ if $ARGS[0] = 'start':
 	gs 'stat'
 	'<center><b><font color="maroon">Local Church</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/church/church.jpg"></center>'
-	'The local church is small and fairly old, it is not in the best shape, but it appears to be well loved.'
+	'The local church is small and relatively old, it is not in the best shape, but it appears well-loved.'
 	*nl
 	!!'You can attend confession every weekday between 07:00 and 09:00 or 16:00 and 18:00, and on the weekend between 16:00 and 18:00.'
-	'Vigil is held on Saturdays at 19:00.'
+	'The vigil is held on Saturdays at 19:00.'
 	'The Divine Liturgy is on Sundays between 09:00 and 12:00.'
 	act 'Go to the village square': minut += 3 & gt 'gadukino'
 	if week = 6 and hour >=19 and hour <= 22 and churchday ! daystart:
@@ -127,8 +127,8 @@ if $ARGS[0] = 'Narthex':
 	gs 'stat'
 	PLAY 'sound/church/76139__dkustic__090227-01-people-church-concert.wav',30
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/enterchurch.jpg"></center>'
-	'You enter the church and the scent of incense and beeswax fills your lungs. Your eyes are drawn past the Narthex into the Nave with its walls covered in lovingly painted icons while a thousand points of light dance in joy throughout God''s house from the magnificent chandelier that hangs from the ceiling.'
-	'To your left is a counter with many candles, icons and prayer books, a small jar resting next to it with a few rubels and donations for taking a candle.'
+	'You enter the church, and the scent of incense and beeswax fills your lungs. Your eyes are drawn past the Narthex into the Nave with its walls covered in lovingly painted icons while a thousand points of light dance in joy throughout God''s house from the magnificent chandelier that hangs from the ceiling.'
+	'To your left is a counter with many candles, icons and prayer books, a small jar resting next to it with a few rubles and donations for taking a candle.'
 	act 'Leave the church': gt 'gad_church' , 'start'
 	!!if ((week <= 5 and hour >= 7 and hour < 9) or (hour >= 16 and hour < 18)) and confessday ! daystart: act 'Go to confession': confessday = daystart & gt 'gad_church2', 'confession'
 	act 'Light a candle':gt 'gad_church', 'candle'
@@ -160,7 +160,7 @@ if $ARGS[0] = 'candle1':
 	gs 'stat'
 	gs 'gad_church', 'reducevillagerep', 25, -1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/ch_candle.jpg"></center>'
-	'You approach the counter and put 10 <b>₽</b> in the jar for a candle. Then, you take one of the candles and light it.'
+	'You approach the counter and put <b>₽</b>10 in the jar for a candle. Then, you take one of the candles and light it.'
 	act 'Return to Narthex': gt 'gad_church', 'Narthex'
 end
 
@@ -183,7 +183,7 @@ if $ARGS[0] = 'pray':
 			pcs_horny -= 10
 			pcs_mood += 20
 			church_moral += 1
-			'You decide to pray for a while. You''re not overly religious, but the peace and quiet gives you the time to think.'
+			'You decide to pray for a while. You''re not overly religious, but the peace and quiet give you the time to think.'
 		elseif hour > 6 and hour < 20 and church_moral >= 30 and church_moral < 60:
 			pcs_horny -= 20
 			pcs_mood += 30

locations/gadbana.qsrc

@@ -22,7 +22,7 @@ end
 '<center><h4>Bath</h4></center>'
 
 '<center><img <<$set_imgh>> src="images/locations/gadukino/village/bana.jpg"></center>'
-'A small room with a low smoky ceiling, a small stove, a couple of stainless steel water tanks, and a blackened wooden shelf.'
+'A small room with a low, smoky ceiling, a small stove, a couple of stainless steel water tanks, and a blackened wooden shelf.'
 'Grandma''s enema bulb is hidden behind some stuff on the shelf.'
 gs 'stat'
 
@@ -105,16 +105,16 @@ if mira_guest = 0:
 					gs 'stat'
 
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/par.jpg"></center>'
-					'You strip, sit down and relax. After a proper banya session, you pick up a bucket filled with cold water, pour it over yourself, and head over to the shower. You feel like a completely new person.'
+					'You strip, sit down and relax. Then, after a proper banya session, you pick up a bucket filled with cold water, pour it over yourself, and head over to the shower. You feel like a completely new person.'
 					if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
 					act 'Finish': gt $loc, $loc_arg
 				end
 			end
 		else
-			'The banya is not in use at this time. It is available between 19:00 and 22:00 during the weekend.'
+			'The banya is not in use at this time. However, it is available between 19:00 and 22:00 during the weekend.'
 		end
 	elseif week < 6:
-		'The banya is not used during the week. It is usually ready to use from 19:00 during the weekend.'
+		'The banya is not used during the week. However, it is usually ready to use from 19:00 during the weekend.'
 	end
 	*nl
 
@@ -136,7 +136,7 @@ if mira_guest = 0:
 			act 'Finish':gt $loc, $loc_arg
 		end
 	else
-		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
+		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash.</font>'
 	end
 
 	dynamic $bteeth
@@ -178,7 +178,7 @@ if mira_guest = 0:
 		end
 	end
 	if stanok > 0:'Your razor will last <b><<stanok>></b> more shaves. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>.'
-	'There''s a small shaving <a href="exec:gt ''mirror'', ''start''">mirror</a> resting on the window sill, which you can use to ' +iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
+	'There''s a small shaving <a href="exec:gt ''mirror'', ''start''">mirror</a> on the window sill, which you can use to ' +iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
 
 	!WD: heal chafe
 	if mosolmaz>0:'On a shelf is a tube of ointment for chafing, which will be enough for <b><<mosolmaz>></b> applications.'
@@ -351,7 +351,7 @@ else
 						minut += 1
 						inhib_exp += rand(0,2)
 						grandmaQW['nudity_trouble'] += rand(0,2)
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s undoubtedly risky leaving the bathhouse like this. But, while it''s unlikely anyone, but Mira saw you go outside naked, there''s a thrill in potentially getting caught.'
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s undoubtedly risky leaving the bathhouse like this. But, while it''s unlikely anyone but Mira saw you go outside naked, there''s a thrill in potentially getting caught.'
 						!!gs 'clothing', 'recover_lost_clothes', 'gadbana'
 						gs 'arousal', 'flash', 10, 'exhibitionism'
 						killvar 'banya_underwear'
@@ -365,7 +365,7 @@ else
 						minut += 1
 						inhib_exp += rand(0,1)
 						grandmaQW['nudity_trouble'] += rand(0,1)
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s undoubtedly risky leaving the bathhouse like this. But, while it''s unlikely anyone but Mira saw you go outside in your underwear, there''s a thrill in potentially getting caught.'
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s undoubtedly risky leaving the bathhouse like this. But, while it''s unlikely anyone, but Mira saw you go outside in your underwear, there''s a thrill in potentially getting caught.'
 						!!gs 'clothing', 'recover_lost_clothes', 'gadbana'
 						gs 'arousal', 'flashlite', 10, 'exhibitionism'
 						killvar 'banya_underwear'

locations/gaddvor.qsrc

@@ -103,7 +103,7 @@ if $ARGS[0]='':
 		menu_off = 1
 		gs 'miroslava', 'miraclothes'
 		'You went out into the yard and noticed Mira standing there.'
-		'"Oh, <<$pcs_nickname>> hi, hope you don''t mind me visiting. I was bored being home alone." she said smiling.'
+		'"Oh, <<$pcs_nickname>>, hi. I hope you don''t mind me visiting. I was bored being home alone," she said, smiling.'
 		mira_guestday = daystart
 		minut += 5
 		mira_guest = 1
@@ -145,7 +145,7 @@ if $ARGS[0] = 'root_cellar':
 	else
 		'Your grandparents'' root cellar is empty.'
 	end
-	'Even though your grandparents allow you to store extra mushrooms and berries you pick in here, they reserve the right to use them too, so you aren''t surprised if any go missing day to day.'
+	'Even though your grandparents allow you to store extra mushrooms and berries you pick, they reserve the right to use them, too, so you aren''t surprised if any go missing.'
 	if boletus_stored > 0: 'You currently are storing <b><<boletus_stored>></b> kg of raw mushrooms.'
 	if bilberry_stored > 0: 'You currently are storing <b><<bilberry_stored>></b> kg of raw berries.'
 	*nl
@@ -262,9 +262,9 @@ if $ARGS[0] = 'cikl':
 	if gadstay = 1 and lost_girl = 0:
 		if daystart > (grandmaQW['last_day_helped'] + 3) and daystart > (grandpaQW['last_day_helped'] + 3):
 			if (daystart - grandmaQW['last_day_helped']) <= (daystart - grandpaQW['last_day_helped']):
-				'You haven''t helped your grandparents with any chores in <<daystart - grandmaQW[''last_day_helped'']>> days. You should help out more regularly to stay on your grandparents'' good side.'
+				'You haven''t helped your grandparents with any chores in <<daystart - grandmaQW[''last_day_helped'']>> days. You should help out more often to stay on your grandparents'' good side.'
 			else
-				'You haven''t helped your grandparents with any chores in <<daystart - grandpaQW[''last_day_helped'']>> days. You should help out more regularly to stay on your grandparents'' good side.'
+				'You haven''t helped your grandparents with any chores in <<daystart - grandpaQW[''last_day_helped'']>> days. You should help out more often to stay on your grandparents'' good side.'
 			end
 			grandmaQW['help_amount'] -= 1
 		end

locations/gadfield.qsrc

@@ -62,7 +62,7 @@ if $ARGS[0] = 'field':
 				'Most of the village has shown up to help out with the hay. Mira is there too, and you both partake in the activities. You enjoy yourself, and working alongside Mira makes the day fly by. By the end of the day, you are both exhausted but smiling.'
 			else
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/haying_time.jpg"></center>'
-				'Almost all of the villagers have shown up to help out with the fresh cut hay. You spend most of the day working hard and sweating as you help gather the fresh-cut hay. It is difficult, but you get a great workout and end the day feeling exhausted, but quite satisfied.'
+				'Almost all the villagers have shown up to help with the fresh-cut hay. You spend most of the day working hard and sweating as you help gather the fresh-cut hay. It is difficult, but you get a great workout and end the day feeling exhausted but immensely satisfied.'
 			end
 
 			gs 'exercise', 'tier1', 60, 'stren', 'vital'
@@ -166,7 +166,7 @@ if $ARGS[0] = 'cow':
 				*clr & cla
 				menu_off = 1
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow'+rand(1,4)+'.jpg"></center>'
-				'You spend an hour herding the cows, watching for stragglers and driving them back to the herd. Then, instead of letting your grandfather do all the work, you roll up the sleeves and try to do most of the work yourself.'
+				'You spend an hour herding the cows, watching for stragglers and driving them back to the herd. Then, instead of letting your grandfather do all the work, you roll up your sleeves and try to do most of the work yourself.'
 
 				minut += 60
 				if temper >= 25 and sunWeather = 1:
@@ -367,7 +367,7 @@ if $ARGS[0] = 'cow2':
 				*clr & cla
 				menu_off = 1
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow'+rand(1,4)+'.jpg"></center>'
-				'You spend an hour herding the cows, watching for stragglers and driving them back to the herd. Then, instead of letting your grandfather do all the work, you roll up the sleeves and try to do most of the work yourself.'
+				'You spend an hour herding the cows, watching for stragglers and driving them back to the herd. Then, instead of letting your grandfather do all the work, you roll up your sleeves and try to do most of the work yourself.'
 
 				minut += 60
 				if temper >= 25 and sunWeather = 1:
@@ -450,7 +450,7 @@ if $ARGS[0] = 'cow2':
 			*clr & cla
 			menu_off = 1
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_go.jpg"></center>'
-			'Grandpa looks at his watch and says it''s time to drive the herd over near the forest. So the two of you begin to gather the herd and guide them toward the forest.'
+			'Grandpa looks at his watch and says it''s time to drive the herd near the forest. So the two of you begin to gather the herd and guide them toward the woods.'
 			
 			minut += 60
 			if temper >= 25 and sunWeather = 1:
@@ -496,7 +496,7 @@ if $ARGS[0] = 'cow3':
 				*clr & cla
 				menu_off = 1
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow'+rand(1,4)+'.jpg"></center>'
-				'You spend an hour herding the cows, watching for stragglers and driving them back to the herd. Then, instead of letting your grandfather do all the work, you roll up the sleeves and try to do most of the work yourself.'
+				'You spend an hour herding the cows, watching for stragglers and driving them back to the herd. Then, instead of letting your grandfather do all the work, you roll up your sleeves and try to do most of the work yourself.'
 
 				minut += 60
 				if temper >= 25 and sunWeather = 1:

locations/gadforest.qsrc

@@ -43,7 +43,7 @@ if $ARGS[0] = 'forest_edge':
 		else
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforest_winter_night1.jpg"></center>'
 			*nl
-			'You are at the edge of the forest. Night in the forest during wintertime is terrifying and uncomfortable.'
+			'You are at the edge of the forest. Night in the woods during wintertime is terrifying and uncomfortable.'
 		end
 	end
 
@@ -73,7 +73,7 @@ if $ARGS[0] = 'forest_edge':
 		if mushroom_pickers = 0:
 			'You don''t see or hear anyone picking mushrooms or berries in the forest right now.'
 		elseif mushroom_pickers = 1:
-			'You can see other people picking mushrooms and berries here at the forest''s edge.'
+			'At the forest''s edge, you can see other people picking mushrooms and berries.'
 		elseif mushroom_pickers = 2:
 			'You can hear people picking mushrooms and berries deeper in the forest.'
 		end
@@ -88,7 +88,7 @@ if $ARGS[0] = 'forest_edge':
 
 			gs 'miroslava','miraclothes'
 			*nl
-			'"<<$pcs_nickname>>, I''m going to head home now, but we can hang out again later." Mira said as she began walking out of the forest.'
+			'"<<$pcs_nickname>>, I''m going to head home now, but we can hang out again later," Mira said as she began walking out of the forest.'
 
 			! Allow the player to override Mira schedule to get events done with her, also so Mira cannot appear and disappear before the player can interact with her
 			act 'Convince her to stay with you':
@@ -378,7 +378,7 @@ if $ARGS[0] = 'forest_outskirts':
 			'You are in the forest. The forest in the winter is stunning, and the fresh air makes you happy.'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforest_winter_night2.jpg"></center>'
-			'You are in the forest. Night in the forest during wintertime is horrifying and uncomfortable.'
+			'You are in the forest. Night in the woods during wintertime is horrifying and uncomfortable.'
 		end
 	end
 
@@ -467,7 +467,7 @@ if $ARGS[0] = 'forest_center':
 	if pcs_bushcraft < 40:
 		'<font color="red">You don''t know this part of the forest very well. You could get lost if you go any deeper into the woods.</font>'
 	else
-		'<font color="green">You are comfortable navigating this part of the forest and can adventure further into the woods if you want.</font>'
+		'<font color="green">You are comfortable navigating this part of the forest and can venture further into the woods if you want.</font>'
 	end
 	if clothesAtLocation = 1:*nl & 'Your clothes are nearby on the ground.'
 	if hour < 8 or hour > 16:
@@ -888,7 +888,7 @@ if $ARGS[0] = 'picking':
 
 						gs 'gadforest', 'picking_clothes', $forest_args1, 'mushroom'
 						*nl
-						'After searching for mushrooms and berries for half an hour, you found <<new_boletus>> kg of mushrooms'
+						'After searching for mushrooms and berries for half an hour, you found <<new_boletus>> kg of mushrooms.'
 					elseif new_boletus = 0 and new_bilberry = 0:
 						pcs_mood -= 5
 						gs 'stat'

locations/gadhouse.qsrc

@@ -1663,6 +1663,7 @@ if $ARGS[0] = 'intro':
 	cla & *clr
 	$loc_arg = ''
 	$loc = 'gadhouse'
+	gs 'homes_properties', 'set_home', 'grandparents_house'
 	$temp_nickname = '<<$npc_nickname[''A29'']>>'
 	grandmaQW['last_month_paid'] = month
 	display_bb = 1

locations/gadmarket.qsrc

@@ -13,8 +13,8 @@ frost = 0
 *pl '<center><h1><font color="maroon">Village Shop</font></h1></center>'
 *pl '<center><img <<$set_imgh>> src="images/locations/gadukino/village/market.jpg"></center>'
 
-'You walk into the small shop with four narrow aisles with chest high shelves crammed full of food and other household goods. There is little variety in the selections, just the most essential products.'
-'Slowly you browse the aisles looking for something to buy.'
+'You walk into the small shop with four narrow aisles with chest-high shelves full of food and other household goods. There is little variety in the selections, just the most essential products.'
+'Slowly you browse the aisles, looking for something to buy.'
 *nl
 'As you approach the teller, you notice a rack full of magazines, cigarettes, and a few hygienic items.'
 *nl
@@ -52,10 +52,10 @@ if grandmaQW['chore_groceries'] = 1:
 		grandmaQW['help_amount'] += 1
 		
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/market.jpg"></center>'
-		'You take out the list Grandma gave you and begin browsing the shelves for the items she needs. After about half an hour you have gotten everything on the list.'
+		'You take out the list Grandma gave you and begin browsing the shelves for the items she needs. Finally, after about half an hour, you have gotten everything on the list.'
 		*nl
-		'You take your basket of goods up to the teller and explain that you are getting these things for your grandmother.'
-		'"Of course! Go ahead and take these on home to her. Tell her I will be by this evening to pick up her payment. I know it''s hard for her to get out any more..."'
+		'You take your basket of goods to the teller and explain that you are getting these things for your grandmother.'
+		'"Of course! Go ahead and take these on home to her. Tell her I will be by this evening to pick up her payment. I know it''s hard for her to get out anymore..."'
 		
 		act 'Thank him and leave': minut += 5 & gt 'gadukino'
 		act 'Thank him and take the groceries back to your grandmother (0:10)':minut += 10 & gt 'gadhouse','grandma'

locations/gadprostitutes.qsrc

@@ -24,7 +24,7 @@ if $ARGS[0] = 'start':
 	end
 
 	if MiraLoc ! 8 and npc_QW['A60'] > 15 and hour >= 16 and hour <= 19: MiraLoc = 8
-	if MiraLoc ! 8 and npc_QW['A60'] > 15: 'You look around for Mira but don''t see her here. She must be doing something else right now.'
+	if MiraLoc ! 8 and npc_QW['A60'] > 15: 'You look around for Mira but don''t see her here. So she must be doing something else right now.'
 	!if gadriver_gang = 2 and (mirapimp = 0 or mirapimp = 2):
 	!	if PCloStyle <> 4:
 	!		'You are not wearing the right clothes to prostitute yourself.'
@@ -39,7 +39,7 @@ if $ARGS[0] = 'start':
 		else
 			act 'Walk back to the highway': nroad = 10 & gt 'road'
 			if MiraLoc = 8:
-				'You see Mira standing below a streetlight a little ways down the road.'
+				'You see Mira standing below a streetlight a little way down the road.'
 
 				! event to become miras pimp if not the boys slut, not the village whore
 				if mirapimp = 0 and npc_QW['A63'] < 11 and gadriver_gang = 0: gt 'gadprostitutes', 'pimp_mira'
@@ -78,11 +78,11 @@ if $ARGS[0] = 'pimp_mira':
 
 			gs 'miroslava', 'miraclothes'
 
-			'You call her over to you. Mira, hurries over and looks at you with downcast eyes. "Hi, <<$pcs_nickname>>. You having a good night?"'
-			'You look at her angrily. "A better question, my lovely whore, is ''Are you having a good night''? I want 200 <b>₽</b> per customer you have each night." You tell her earnestly.'
+			'You call her over to you. Mira hurries over and looks at you with downcast eyes. "Hi, Sveta. Are you having a good night?"'
+			'You look at her angrily. "A better question, my lovely whore, is ''Are you having a good night''? I want <b>₽</b>200 per customer you have each night." You tell her earnestly.'
 			'Mira looks up in shock and with a hurt look on her face. "What are you talking about? Do you think I am a hooker?"'
-			'You step up to her and place your hand on her face.  Mira closes her eyes and leans into your hand.  You look into her eyes once she opens them and then SLAP her hard across the face. Mira falls to the ground and starts to cry.  "You''re my property, whore.  You will do whatever I tell you.  You will never lie to me ever again, or I swear I will make you pay.  Understand me?!"'
-			'Mira nods and she wipes away tears.'
+			'You step up to her and place your hand on her face. Mira closes her eyes and leans into your hand. You look into her eyes once she opens them, then slap her hard across the face. Mira falls to the ground and starts to cry. "You''re my property, whore. You will do whatever I tell you. You will never lie to me again, or I swear I will make you pay. Understand me?!"'
+			'Mira nods, and she wipes away tears.'
 			'You reach down and help her back to her feet.  You brush her off and help her fix her makeup.  "Good, now get that cute ass back out on that road and earn us some money."'
 			'You give Mira a little slap on the ass and smile as you watch Mira start a new chapter of her life as your prostitute.'
 
@@ -101,17 +101,17 @@ if $ARGS[0] = 'mira_rebels':
 
 	gs 'miroslava', 'miraclothes'
 
-	'Mira spots you and confidently walks up to you. You''re not sure what has gotten into her but from the look on her face you probably won''t like it.'
-	'As soon as you are face to face with Mira she winds up and smacks you across the face as hard as she can. You are stunned a bit by and stagger to the ground. You feel warm tears begin to run down your face.'
+	'Mira spots you and confidently walks up to you. You''re not sure what has gotten into her, but from the look on her face, you probably won''t like it.'
+	'As soon as you are face-to-face with Mira, she winds up and smacks you across the face as hard as she can. You are stunned a bit and stagger to the ground. You feel warm tears begin to run down your face.'
 	'Mira commands you, "Stand up bitch!"'
-	'You rise and meet her gaze, she looks very pleased with herself. "Remember that. Now you know exactly how that feels" she says.'
+	'You rise and meet her gaze. She looks very pleased with herself. "Remember that. Now you know exactly how that feels," she says.'
 	if npc_QW['A63'] >= 11:
 		'Mira continues, "Look at you, just another slut. Mitka, Kolyamba, and Vasyan told me how much they all love fucking and sharing you now. You thought you were so much better than me, well no more! I''m not working for you anymore. You have proven yourself perfectly capable of enjoying getting shared by a group of friends."'
 	elseif gadriver_gang = 2:
 		'Mira continues, "Look at you, just another whore. All the village men can talk about is how much you moaned for each and every one of them. You thought you were so much better than me, well no more! I''m not working for you anymore. You have proven yourself perfectly capable of enjoying getting gangbanged by multiple groups of strangers."'
 	end
 	'After Mira is done with her preaching, you try to think of something witty to say or raise your hand to slap her back, but you just can''t bring yourself to do it.'
-	'Mira sees the defeated look in your eyes and knows that she has won. She pulls you into an embrace and whispers, "It''s alright <<$pcs_nickname>>. We can just be friends again. And if you want to, maybe you can come work with me instead?"'
+	'Mira sees the defeated look in your eyes and knows that she has won. She pulls you into an embrace and whispers, "It''s alright, <<$pcs_nickname>>. We can just be friends again. And if you want to, maybe you can come work with me instead?"'
 
 	act 'Continue':gt 'gadprostitutes','start'
 end
@@ -134,8 +134,8 @@ if $ARGS[0] = 'just_mira':
 
 				'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/miraprost.jpg"></center>'
 
-				'It isn''t long before a customer pulls up in a nice vehicle. Mira approaches the vehicle and starts talking to the driver.'
-				'You can''t hear what she is saying but after only a few minutes the door opens and Mira steps into the vehicle. It pulls away, but doesn''t go far. You see it pull off the main road and head down a dirt road. Smiling and wanting to see the action, you run into the woods trying to head off the vehicle.'
+				'IIt isn''t long before a customer pulls up in a flashy car. Mira approaches the vehicle and starts talking to the driver.'
+				'You can''t hear what she is saying, but after only a few minutes, the door opens, and Mira steps into the vehicle. It pulls away but doesn''t go far. You see it pull off the main road and head down a dirt road. Smiling and wanting to see the action, you run into the woods, trying to head off the vehicle.'
 
 				act 'Watch Mira and the customer':
 					gs 'gadprostitutes', 'watch_mira'
@@ -143,7 +143,7 @@ if $ARGS[0] = 'just_mira':
 			else
 				'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirawish2_1.jpg"></center>'
 
-				'Mira walks along the road showing off her body to passing car and trucks, but no one stops to pick her up.'
+				'Mira walks along the road showing off her body to passing cars and trucks, but no one stops to pick her up.'
 
 				act 'Continue' :gt 'gadprostitutes', 'just_mira'
 			end
@@ -173,7 +173,7 @@ if $ARGS[0] = 'watch_mira':
 		gs 'stat'
 
 		'<center><video autoplay loop src="images/characters/gadukino/mira/miraprost2.mp4"></video></center>'
-		'You walk up and look into the van. You see Mira showing her customer her tits and rubbing her pussy. You see a hungry gleam in the guy''s eyes, which Mira returns right back.'
+		'You walk up and look into the van. You see Mira showing her customer her tits and rubbing her pussy, and you see a hungry gleam in the guy''s eyes, which Mira returns.'
 
 		act 'Keep watching':
 			gs 'gadprostitutes', 'watch_close'
@@ -188,7 +188,7 @@ if $ARGS[0] = 'watch_from_hiding':
 
 	'<center><video autoplay loop src="images/characters/gadukino/mira/sex/miraprost1_1.mp4"></video></center>'
 
-	'You duck for cover as the guy suddenly gets out of the car and opens the passenger door, grabs Mira''s head and starts forcing his cock deep into her throat.'
+	'You duck for cover as the guy suddenly gets out of the car, opens the passenger door, grabs Mira''s head, and starts forcing his cock deep into her throat.'
 
 	act 'Keep watching':
 		*clr & cla
@@ -196,8 +196,8 @@ if $ARGS[0] = 'watch_from_hiding':
 		gs 'stat'
 
 		'<center><video autoplay loop src="images/characters/gadukino/mira/sex/miraprost1_2.mp4"></video></center>'
-		'Eventually, the guy grunts and cums all over Mira''s face and into her mouth. The nicely dressed man pulls Mira out of the car, hands her a few bills and then drives off.'
-		'Mira walks back towards the road counting the money he gave her as she absentmindedly licks the cum as it drips down her face. She smiles at you and shows you the money as you join her.'
+		'Eventually, the guy grunts and cums all over Mira''s face and into her mouth. Finally, the sharply dressed man pulls Mira out of the car, hands her a few bills and then drives off.'
+		'Mira walks back towards the road, counting the money he gave her as she absentmindedly licks the cum as it drips down her face. Finally, she smiles and shows you the money as you join her.'
 		gs 'stat'
 
 		act 'Finish':
@@ -218,7 +218,7 @@ if $ARGS[0] = 'watch_close':
 
 	'<center><video autoplay loop src="images/characters/gadukino/mira/sex/miraprost2_1.mp4"></video></center>'
 
-	'Mira and the guy jump into the back of the van and you watch as he starts fucking her wet pussy. His hand covers her mouth as she screams in ecstasy. The guy pounds his 20cm cock deep into her pussy. From Mira''s grunts of partial ecstasy, partial pain, you know the guy is hitting or entering her cervix.'
+	'Mira and the guy jump into the back of the van, and you watch as he starts fucking her wet pussy. His hand covers her mouth as she screams in ecstasy. The guy pounds his 20cm cock deep into her pussy. From Mira''s grunts of partial joy and partial pain, you know the guy is hitting or entering her cervix.'
 
 	act 'Hide':
 		*clr & cla
@@ -228,7 +228,7 @@ if $ARGS[0] = 'watch_close':
 		'<center><video autoplay loop src="images/characters/gadukino/mira/sex/miraprost2_2.mp4"></video></center>'
 
 		'You have to duck behind some bushes as they move outside the van. The guy continues to pound into Mira''s pussy until he cums... and cums... and cums. '
-		'After the wild sex, Mira and the guy sit in the van and talk for a bit. He gives her a nice wad of cash and she starts walking back towards the road. She smiles at you and shows you the money as you join her.'
+		'After the wild sex, Mira and the guy sit in the van and talk. He gives her a nice wad of cash, and she starts walking back towards the road. She smiles at you and shows you the money as you join her.'
 
 		act 'Finish':
 			*clr & cla
@@ -299,8 +299,8 @@ if $ARGS[0] = 'work_alone':
 
 	!! TODO: The enema thing should be aligned with the rest of the game. 
 	!! NOTE The enema is called klisma (?) that needs to be cleaned up too.
-	if klismaday ! daystart: '<br>Almost no men will like dirty anal sex, even with a condom, and it''s probably a safe bet that they won''t pay a lot for it. You should start giving yourself an enema before going to work.'
-	if mesec > 0: '<br>You are having your period, most men will pay less for vaginal sex during that time of the month.'
+	if klismaday ! daystart: '<br>Almost no men will like dirty anal sex, even with a condom, and it''s probably a safe bet that they won''t pay a lot for it. So you should start giving yourself an enema before going to work.'
+	if mesec > 0: '<br>You are having your period; most men will pay less for vaginal sex during that time of the month.'
 	if prostitute['cum_dressed'] = 1: '<br>You have visible cum stains on you. Most clients won''t like that and will offer less money.'
 
 	if prostitute['earnings_day'] > 0: 'You have earned <<prostitute[''earnings_day'']>> <b>₽</b> today.'+iif(prostitute['payment_method'] = 0, ' Your share is <<prostitute[''earnings_day''] * prostitute[''share_player''] / 100>> <b>₽</b>'+iif(prostitute['debt_amount'] > 0, ', but your pimp will keep <<prostitute[''earnings_day''] * prostitute[''debt_payment_percent''] / 100>> <b>₽</b> to pay down your debt.', '.'), '')

locations/gadroad.qsrc

@@ -29,8 +29,8 @@ if $ARGS[0] = '':
 		end
 	end
 	*nl
-	'A dirt road leading to the outskirts of Gadukino. You are surrounded by grainfields where the grains appear reaching all the way to the heavens.'
-	'The forest '+iif(meadow > 0, 'and meadow ','')+'can be found further down the road away from the village.'
+	'A dirt road leading to the outskirts of Gadukino. You are surrounded by grainfields where the grains appear, reaching all the way to the heavens.'
+	'The forest '+iif(meadow > 0, 'and meadow ','')+'can be found further down the road, away from the village.'
 	*nl
 	! 10% chance of meeting Mitka once per day on the road when Sveta is not the village boys slut or whole villages whore
 	mitkarand = rand(1,10)
@@ -140,7 +140,7 @@ if $ARGS[0] = 'drinking_invite':
 		mirarand = rand(1,10)
 		if mirarand >= 6: MiraLoc = 5
 		'Just as the words leave Mitka''s mouth, Mira comes bounding around the corner.'
-		'"Hey guys, thanks for the invite! <<$pcs_nickname>> is here too, awesome! Let''s go!"'
+		'"Hey guys, thanks for the invite! <<$pcs_nickname>> is here, too, awesome! Let''s go!"'
 	end
 
 	! Mira is here and both her and Sveta are the town whores

locations/gadsarai.qsrc

@@ -22,10 +22,10 @@ if $ARGS[0] = '':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/sarai_winter_night.jpg"></center>'
 		end
 	end
-	'Your grandparents old barn that could hold some useful items if you spend some time searching.'
+	'Your grandparents'' old barn could hold some valuable items if you spend time searching.'
 	'The right side of the barn is piled high with various boxes, barrels, and chests of items.'
 	'You can store some extra mushrooms and berries here if you don''t want to carry them around all the time.'
-	'The left side of the barn has the stalls for your grandparents horse, cow, and boar.'
+	'The left side of the barn has stalls for your grandparents'' horse, cow, and boar.'
 
 	clr
 	gs 'stat'
@@ -77,7 +77,7 @@ if $ARGS[0] = 'search':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findbike.jpg"></center>'
 		*nl
-		'In the far corner of the barn you manage to find an old bicycle. It''s in surprisingly good condition. You pull it out of the barn and clean it up.'
+		'You find an old bicycle in the far corner of the barn. It''s in surprisingly good condition. You pull it out of the barn and clean it up.'
 	elseif findbag = 0 and bag = 0 and rand(0,10) >= 7:
 		*clr & cla
 		findbag = 1
@@ -86,8 +86,8 @@ if $ARGS[0] = 'search':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/pc/items/gm/purses/5.jpg"></center>'
 		*nl
-		'In a far corner of the barn you find a hessian sack filled with mostly junk, but at the bottom you find a good quality messenger bag.'
-		'You can use this cool looking bag as a handbag.'
+		'In a far corner of the barn, you find a hessian sack filled with mostly junk, but at the bottom, you find a good-quality messenger bag.'
+		'You can use this cool-looking bag as a handbag.'
 		gm_purses[5] = 1
 		$currentpursetype = 'gm'
 		currentpursenumber = 5
@@ -98,7 +98,7 @@ if $ARGS[0] = 'search':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/vcards.jpg"></center>'
 		*nl
-		'"Hmm, what''s this?" You''ve found an unopened deck of vintage adult playing cards, still in its original cellophone wrapper.'
+		'"Hmm, what''s this?" You''ve found an unopened deck of vintage adult playing cards still in its original cellophane wrapper.'
 	elseif findbraclet = 0 and rand(0,10) >= 9:
 		*clr & cla
 		findbraclet = 1
@@ -106,7 +106,7 @@ if $ARGS[0] = 'search':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bracelet.jpg"></center>'
 		*nl
-		'While looking through the barn you spot a glint of metal under a pile of wood. Upon closer inspection you see a bracelet made of silver and crafted into the likeness of a snake. Strange, but cool that you would find something this valuable in the barn.'
+		'While looking through the barn, you spot a metal glint under a wood pile. Upon closer inspection, you see a silver bracelet crafted into a snake''s likeness. Strange, but fantastic that you would find something this valuable in the barn.'
 	elseif findbraclet > 0 and findneck = 0 and rand(0,10) >= 10:
 		*clr & cla
 		findneck = 1
@@ -115,16 +115,16 @@ if $ARGS[0] = 'search':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/necklace.jpg"></center>'
 		*nl
 		if $start_type[1] ! 'nomagic':
-			'While looking through the barn your foot goes through a rotten floorboard. You suddenly feel the presence of something magical under the floor. You get on your belly and look through the hole in the floor. You find a small box made of a black wood. You pick up the box and see the box is covered in a strange writing and glyphs that look like serpents. The feeling of power is coming from within the box. You lift the lid of the box and see a black metal necklace that looks like a coiled snake with ruby eyes. You feel the power coming from the necklace, but it doesn''t feel like any power you have ever felt.'
+			'While looking through the barn, your foot goes through a rotten floorboard. You suddenly feel the presence of something magical under the floor. You get on your belly and look through the hole in the floor. You find a small box made of black wood. You pick up the box and see it''s covered in strange writing and glyphs that look like serpents. A feeling of power is coming from within the box. You lift the box''s lid and see a black metal necklace that looks like a coiled snake with ruby eyes. You feel the power coming from the necklace, but it doesn''t feel like any power you have ever felt.'
 		else
-			'While looking through the barn your foot goes through a rotten floorboard and gets stuck. As you work your foot free, you glimpse something underneath the floor - a box or something. You get on your belly and look through the hole in the floor. You find a small box made of a black wood. You pick up the box and see the box is covered in a strange writing and glyphs that look like serpents. The exotic look of the box gives you gooseflesh and you find yourself holding your breath as you prepare to open the box. You lift the lid of the box and see a black metal necklace that looks like a coiled snake with ruby eyes. You let your breath out slowly as you tilt the necklace from side to side, watching the light sparkle as it is reflected by the facets on the deep red rubies. You cannot begin to guess what this necklace must be worth.'
+			'While looking through the barn, your foot goes through a rotten floorboard and gets stuck. As you work your foot free, you glimpse something underneath the floor - a box or something. You get on your belly and look through the hole in the floor. You find a small box made of black wood. You pick up the box and see it''s covered in strange writing and glyphs that look like serpents. The exotic look of the box gives you gooseflesh, and you find yourself holding your breath as you prepare to open the box. You lift the box''s lid and see a black metal necklace that looks like a coiled snake with ruby eyes. You inspect the necklace, watching the light sparkle as it is reflected by the facets on the deep red rubies. You cannot begin to guess what this necklace must be worth.'
 		end
 	else
 		gs 'exp_gain', 'observ', rand(0,1)
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/junk_barn.jpg"></center>'
 		*nl
-		'In the barn you find many mouldy magazines, rusty tools and equipment, toys and many dusty, yellowed books. The entire barn reeks of mould and decay.'
+		'In the barn, you find many mouldy magazines, rusty tools and equipment, toys, and dusty, yellowed books. The entire barn reeks of mould and decay.'
 	end
 	act 'Finish':gt 'gadsarai'
 end
@@ -149,7 +149,7 @@ if $ARGS[0] = 'horse':
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/feed_horse.jpg"></center>'
-			'You grab a sack of grain and fill Desperado''s feed bucket. You hang the bucket from his stall and gently pat his nose as he begins to eat.'
+			'You grab a sack of grain and fill Desperado''s feed bucket. Then, you hang the bucket from his stall and gently pat his nose as he begins to eat.'
 			'You watch him eat for a little while before moving on.'
 
 			act 'Finish':gt 'gadsarai','horse'
@@ -165,7 +165,7 @@ if $ARGS[0] = 'horse':
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/horse_field.jpg"></center>'
-			'You take Desperado by the bridle and lead him to the field. There, you let him free in the paddock area, and watch him run about for a bit before moving on.'
+			'You take Desperado by the bridle and lead him to the field. You let him free in the paddock area and watch him run about before moving on.'
 
 			act 'Continue':gt'gadfield','field'
 			act 'Return back to your grandfather (0:30)': minut += 30 & gt 'gadhouse', 'grandpa'
@@ -197,7 +197,7 @@ if $ARGS[0] = 'horse':
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/comb_horse.jpg"></center>'
-			'You spend about an hour cleaning and brushing Desperado, scrubbing his coat and brushing his mane and tail. You are satisfied with the result - he is looking as clean and healthy as ever.'
+			'You spend about an hour cleaning and brushing Desperado, scrubbing his coat and brushing his mane and tail. Finally, you are satisfied with the result - he looks as clean and healthy as ever.'
 
 			act 'Finish':gt 'gadsarai','horse'
 			act 'Return back to your grandfather': minut += 3 & gt 'gadhouse', 'grandpa'
@@ -226,7 +226,7 @@ if $ARGS[0] = 'cow':
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/milk_cow.jpg"></center>'
-			'You start milking Dawn, improving for each time you do it.'
+			'You start milking Dawn, improving each time you do it.'
 
 			act 'Finish':gt 'gadsarai','cow'
 			act 'Return back to your grandmother': minut += 3 & gt 'gadhouse', 'grandma'
@@ -241,7 +241,7 @@ if $ARGS[0] = 'cow':
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/feed_cow.jpg"></center>'
-			'Dawn is obviously excited about feeding time, shaking her head and doing little cow tippy-taps with her feet. You dump a sizable amount of hay in her trough and watch as she digs in.'
+			'Dawn is excited about feeding time, shaking her head and doing little cow tippy-taps with her feet. You dump some hay in her trough and watch as she digs in.'
 
 			act 'Finish':gt 'gadsarai','cow'
 			act 'Return back to your grandfather': minut += 3 & gt 'gadhouse', 'grandpa'
@@ -259,7 +259,7 @@ if $ARGS[0] = 'cow':
 				'You lead Dawn to the field, where you let the shepherds take over.'
 				grandpaQW['chore_lead_cow_to_field'] = 2
 			end
-			if grandpaQW['chore_herd_cattle'] = 1:'You lead Dawn to the field, where you grandfather awaits you. It''s his turn to keep an eye on the cows.'
+			if grandpaQW['chore_herd_cattle'] = 1:'You lead Dawn to the field, where your grandfather awaits you. It''s his turn to keep an eye on the cows..'
 
 			act 'Continue':gt'gadfield','cow'
 			if grandpaQW['chore_lead_cow_to_field'] = 2: act 'Return back to your grandfather (0:30)': minut += 30 & gt 'gadhouse', 'grandpa'

locations/grandpahelp.qsrc

@@ -17,7 +17,7 @@ if $ARGS[0] = 'start':
 	end
 
 	if grandpaQW['chore_type'] = 0:
-		'"<<$pcs_nickname>>, could you run out to the barn and bring some firewood for the stove?"'
+		'"<<$pcs_nickname>>, could you run out to the barn and bring firewood for the stove?"'
 
 		grandpaQW['chore_fetch_firewood'] = 1
 		act 'Tell him you will go get some in just a bit':gt 'gadhouse', 'grandpa'
@@ -28,9 +28,9 @@ if $ARGS[0] = 'start':
 			else
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/firewood_winter.jpg"></center>'
 			end
-			'You put on some warm clothes and run over to the barn to collect some firewood. '
-			'"I''ve brought some firewood grandfather," you said to your grandfather.'
-			'"You are very quick <<$pcs_nickname>>." he replies with a smile. "That''s today''s youth for ya. There is no more work today."'
+			'You put on warm clothes and run to the barn to collect firewood.'
+			'"I''ve brought some firewood, grandfather," you said to your grandfather.'
+			'"You are very quick, Sveta," he replies with a smile. "That''s today''s youth for ya. There is no more work today."'
 			grandpaQW['chore_fetch_firewood'] = 0
 			minut += 20
 			grandmaQW['help_amount'] += 1
@@ -95,7 +95,7 @@ if $ARGS[0] = 'start':
 	elseif grandpaQW['chore_type'] = 12 and ((boletus_stored + bilberry_stored) <= 16):
 		gt 'grandpahelp', 'pickforest_both'
 	elseif grandpaQW['chore_type'] = 13 and temper >= 15 and sunWeather = 1 and hour >= 6 and hour < 9:
-		'"<<$pcs_nickname>>, we need to help out with baling hay today. We have to go to the field to meet the others."'
+		'"<<$pcs_nickname>>, we need to help with baling hay today, so we have to go to the field to meet the others."'
 		'"Okay, grandfather," you replied.'
 
 		grandpaQW['chore_bale_hay'] = 1
@@ -103,7 +103,7 @@ if $ARGS[0] = 'start':
 		act 'Grab a rake and head to the field (0:40)':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_gadfield.jpg"></center>'
-			'With the rake in your hand, you go to meet up with the other local residents at the field.'
+			'With the rake in your hand, you meet up with the other local residents at the field.'
 			minut += 40
 			gs'stat'
 
@@ -128,7 +128,7 @@ if $ARGS[0] = 'start':
 		else
 			randmsg = rand(0,1)
 			if randmsg = 0:
-				'"You don''t need to help out today <<$pcs_nickname>>."'
+				'"You don''t need to help out today, <<$pcs_nickname>>."'
 			else
 				'"You can take the day off."'
 			end
@@ -138,7 +138,7 @@ if $ARGS[0] = 'start':
 end
 
 if $ARGS[0] = 'cleanyard':
-	'"Of course <<$pcs_nickname>>, I need your help in the yard. Bring a garden tool with you."'
+	'"Of course, <<$pcs_nickname>>, I need your help in the yard. Bring a garden tool with you."'
 
 	grandpaQW['chore_clean_yard'] = 1
 	act 'Tell him that you''ll do it in a minute':gt 'gadhouse', 'grandpa'
@@ -146,7 +146,7 @@ if $ARGS[0] = 'cleanyard':
 		*clr & cla
 		if month >= 4 and month <= 10:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/clean_yard1.jpg"></center>'
-			'Armed with a rake, you begin cleaning the yard. You''re pleased, seeing the yard clean. You return the rake to the shed and continue on with your business.'
+			'Armed with a rake, you begin cleaning the yard. You''re pleased seeing the yard clean. You return the rake to the shed and continue on with your business.'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/clean_yard2.jpg"></center>'
 			'Armed with a shovel, you begin clearing the yard of snow. You''re pleased with yourself, seeing the courtyard is free of snow. You return the shovel to the shed and continue on with your business.'
@@ -203,7 +203,7 @@ if $ARGS[0] = 'washhorse':
 end
 
 if $ARGS[0] = 'groomhorse':
-	'"Of course <<$pcs_nickname>>, I need your help to groom Desperado."'
+	'"Of course, <<$pcs_nickname>>, I need your help to groom Desperado."'
 
 	grandpaQW['chore_brush_horse'] = 1
 	act 'Tell him you will do it in a bit':gt 'gadhouse', 'grandpa'
@@ -223,7 +223,7 @@ if $ARGS[0] = 'groomhorse':
 end
 
 if $ARGS[0] = 'grazehorse':
-	'"<<$pcs_nickname>>, take Desperado to the field, my legs hurt so I need to rest for a bit. I''ll retrieve the horse up in the evening."'
+	'"<<$pcs_nickname>>, take Desperado to the field. My legs hurt, so I need to rest for a bit. I''ll retrieve the horse in the evening."'
 
 	grandpaQW['chore_lead_horse_to_field'] = 1
 	act 'Tell him you will do it soon':gt 'gadhouse', 'grandpa'
@@ -240,7 +240,7 @@ end
 
 if $ARGS[0] = 'grazecows':
 	if grandpaQW['chore_herd_cattle_experience'] = 0:
-		'"<<$pcs_nickname>>, we need to let the cows graze on the field today. Grab something to eat and lead the herd to the field. I''ll meet you there."'
+		'"<<$pcs_nickname>>, we need to let the cows graze on the field today. So grab something to eat and lead the herd to the field. I''ll meet you there."'
 	else
 		'"<<$pcs_nickname>>, it''s our turn to look out for the cows grazing on the field today. So grab something to eat quickly, and stop by the field where the herd is. I''ll bring them back home."'
 	end
@@ -287,7 +287,7 @@ if $ARGS[0] = 'pickforest_mushrooms':
 	grandpaQW['chore_gather_mushrooms'] = 1
 	grandpaQW['chore_mushroom_quantity'] = rand(1,2)
 	'"<<$pcs_nickname>>, could you go to the forest and pick mushrooms? I''m craving fried mushrooms."'
-	'"How much should I pick, grandpa?", you ask.'
+	'"How much should I pick, grandpa?" you ask.'
 	'"<<grandpaQW[''chore_mushroom_quantity'']>> kilos will be enough," grandfather replies. "Be careful so you don''t get lost."'
 
 	act 'Tell him you will go get some soon':gt 'gadhouse', 'grandpa'
@@ -329,7 +329,7 @@ if $ARGS[0] = 'pickforest_both':
 	grandpaQW['chore_gather_both'] = 1
 	grandpaQW['chore_mushroom_quantity'] = rand(1,2)
 	grandpaQW['chore_berry_quantity'] = rand(1,2)
-	'"<<$pcs_nickname>>, can you go to the forest and pick some berries and mushrooms? Your grandmother wants to make a mushroom soup, and I have a craving for some fresh berries."'
+	'"<<$pcs_nickname>>, can you go to the forest and pick some berries and mushrooms? Your grandmother wants to make a mushroom soup, and I am craving some fresh berries."'
 	'"How much should I pick, grandpa?"'
 	'"<<grandpaQW[''chore_mushroom_quantity'']>> kilos of mushrooms and <<grandpaQW[''chore_berry_quantity'']>> kilos of berries will be enough," grandfather replies. "Just don''t get lost."'
 

locations/gschool_nerd_chats.qsrc

@@ -156,6 +156,25 @@ if $ARGS[0] = 'julia':
 		else
 			'You approach Julia and explain how you''re struggling in school and could really use her help studying. She thinks it over for a second, but happily agrees. "Sure thing, <<$pcs_nickname>>. That could be fun!"'
 		end
+	elseif grupTipe = 5 and fame['pav_slut'] >= 175:
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/12.jpg"></center>'
+		'As you start to approach the nerds, Julia takes hold of your elbow. She leans in close to you and says quietly, "<<$pcs_nickname>>, I want to have a quick chart with you in private please. Then she walks out of the classroom, you wonder what the chat could be about. After all your life in school is difficult enough already getting tormented by most of your classmates. However, Julia has always been kind towards you so you decide to wait a moment and then follower, to find out what she wants. After all it can''t be any worse that it already is for you!'
+		*nl
+		'Julia leads you away from most of your classmates so it''s not possible to be overheard.'
+		'"Sorry for the subterfuge <<$pcs_nickname>> but I wanted a quick word with you in private, I hope that''s okay?"'
+		'You nod in agreement and she continues, "I''m not really sure how to put this... Umm..." She keeps looking down and not meeting your eyes and is clearly both nervous and embarrassed.'
+		'You decide to prompt her as she''s obviously struggling with what she wants to say, "Look Julia, don''t worry. What you have to say can''t be any worse that what I get called nearly every day, please just say it."'
+		act 'Wait for her reply':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/12.jpg"></center>'
+			'With a sad smile Julia continues, "Okay <<$pcs_nickname>>, here goes... Look I''ve always liked you but I''m quite shy so haven''t had the courage to approach you before. However, I can''t stand by any longer and see you in all this pain without at least offering my help... That''s if you want it?..."'
+			'After a short pause you reply, "Sorry Julia I don''t understand what you are offering."'
+			*nl
+			'Julia takes a deep breath and continues, "Well <<$pcs_nickname>>, I''d like to help you so if you need help with your homework or just need a friend please just come to my house after school and if I''m in I''ll be there for you." After a quick pause she continues. "You just need to promise me that you won''t say anything to anyone else please; at least until your reputation is much improved."'
+			'You respond, "Well many thanks for the kind offer Julia, it''s certainly something I''ll consider and I won''t say anything so don''t worry. That''s brightened up my day and is very kind of you."'
+			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
+		end
 	elseif fame['pav_slut'] >= 175:
 		if npc_rel['A12'] >= 50:
 			'A thin smile appears on Julia''s lips. "Hi <<$pcs_nickname>>." She chews her lip before releasing a sigh. "Look, don''t take this the wrong way. I like you, but..." A moment of awkward silence hangs in the air as Julia''s eyes refuse to face you. "With your reputation... It might be better if you stayed away for a bit. Radomir..." she sighs. "I... don''t want to give him more avenues to do something, you know?"'

locations/journal.qsrc

@@ -5,7 +5,8 @@
 ! Amended by Hooded Silence
 ! Game Character Journal - central core game data area for players.
 ! V .01 Refactored to enable menu bar navigation for UI consistency. 
-! V .02 In Progress - redesign and integration of content areas.
+! V .02 Redesign and integration of content areas.
+! V .03 Bug fixes.
 !
 ! Sections:
 ! 0 Magic (if enabled)
@@ -32,7 +33,6 @@ if $ARGS[0] = 'records':
 ! records
 end
 
-
 if $ARGS[0]='journalmenu':
 	*clr & cla
 	if $start_type[1] ! 'nomagic':
@@ -46,16 +46,18 @@ if $ARGS[0]='journalmenu':
 	
 	'<center><table width="90%" align="center" width="90%" cellspacing="0" cellpadding="0" valign="top"><tr><<$tablebody>></tr></table></center>'
 	
-	if $jumploc = '': 
+	if $jumploc = '' or jclose = 1: 
 		if $start_type[1] ! 'nomagic': 
 			menutrack = 0
+			jclose = 0
 			gt 'journal', 'magictab'
 		else
 			menutrack = 1
+			jclose = 0
 			gt 'journal', 'housingtab'  
 		end
 	end
-	act 'Put your notebook down': gt $loc, $loc_arg & killvar 'jumploc'	
+	gs 'journal', 'leaveactions'
 
 ! Journal Menu
 end
@@ -63,14 +65,16 @@ end
 if $ARGS[0] = 'magictab':
 	$jumploc = 'magictab'
 	gs 'journal', 'journalmenu'
+	
 	'<center><h2>Spells</h2></center><br>'
 	'<center><h2>Spells to Cast</h2></center><br>'
-	func('spellBook','cast','$nonComSpells')
+	func('spellBook','cast','$nonComSpells') 
 	'<br><center><h2>Spell Learning</h2></center><br>'
 	'<br><center><h3>Combat</h3></center><br>'
-	func('spellBook','learn','$combatSpells')
+	func('spellBook','learn','$combatSpells') 
 	'<br><center><h3>Non-Combat</h3></center><br>'
-	func('spellBook','learn','$nonComSpells')
+	func('spellBook','learn','$nonComSpells') 
+	delact 'Never mind'
 ! magic
 end
 
@@ -80,7 +84,6 @@ if $ARGS[0] = 'housingtab':
 
 	'<center><h2>Housing</h2></center>'
 	*nl
-	constructionstatus = func('homes_properties', 'property_construction_status', 'matryona_mansion')
 	if pavSharedAptEnabled = 1:'You share an apartment with three others in Pavlovsk. Your bills are paid by the other tenants in exchange for your house services'
 	if accessible_property['city_apartment'] = 1:'You rent a two room apartment in the city residential area. Your rent for the apartment is subtracted automatically in sum of <<home_rent[1]>> <b>₽</b> us electric bill on 25th of each month. You are currently paid up for <b><<ArendHouseSL>></b> days'
 	if accessible_property['city_apartment'] = 2:'You own a two room apartment in the city residential area. Your utility bills are due on the 25th of each month.'
@@ -126,7 +129,6 @@ if $ARGS[0] = 'housingtab':
 ! housing
 end
 
-
 if $ARGS[0] = 'relationstab':
     $jumploc = 'relationstab'
 	gs 'journal', 'journalmenu'
@@ -180,7 +182,6 @@ if $ARGS[0] = 'relationstab':
 		end
 		*nl
 		
-
 		'Cool Kids'
 
 		gs 'indik', '4', grupvalue[1]/10, grupvalue[1], 1 & '<<$ind>>'
@@ -196,25 +197,25 @@ if $ARGS[0] = 'relationstab':
 		
 		'<h2>Other Relations</h2>'
 		
-	if npc_QW['A192'] > 0: 'Friendship with Nastya:' & gs 'journal', 'relindex', 'A192' 
-	if npc_rel['A218'] > 0: 'Friendship with Tanya:' & gs 'journal', 'relindex', 'A218'  
-	if npc_rel['A219'] > 0: 'Friendship with Kat:' & gs 'journal', 'relindex', 'A219' 
-	if npc_rel['A220'] > 0: 'Friendship with Vika:' & gs 'journal', 'relindex', 'A220' 
-	if npc_rel['A93'] > 0: 'Friendship with Ira:'  & gs 'journal', 'relindex', 'A93' 
-	if npc_rel['A43'] > 0: 'Friendship with Tamara:' & gs 'journal', 'relindex', 'A43' 
-	if npc_rel['A169']> 0: 'Friendship with Dima:'  & gs 'journal', 'relindex', 'A169' 
-	if npc_rel['A69'] > 0:'Friendship with Mikhail Nikolaevich (Volleyball Coach):' & gs 'journal', 'relindex', 'A69' 
-	
-	! Uncomment if re-introduced into the game ensure you use NPC ID to update them
-	! if alla > 0: 'Friendship with Alla <<alla>>'
-	! if masha > 0: 'Friendship with Masha <<masha>>'
-	! if npc_rel['A41'] > 0: 'Friendship with Givi K. <<npc_rel[''A41'']>>'
-	! if npc_rel['A42'] > 0: 'Friendship with Ashot <<npc_rel[''A42'']>>'
-	
+		if npc_QW['A192'] > 0: 'Friendship with Nastya:' & gs 'journal', 'relindex', 'A192' 
+		if npc_rel['A218'] > 0: 'Friendship with Tanya:' & gs 'journal', 'relindex', 'A218'  
+		if npc_rel['A219'] > 0: 'Friendship with Kat:' & gs 'journal', 'relindex', 'A219' 
+		if npc_rel['A220'] > 0: 'Friendship with Vika:' & gs 'journal', 'relindex', 'A220' 
+		if npc_rel['A93'] > 0: 'Friendship with Ira:'  & gs 'journal', 'relindex', 'A93' 
+		if npc_rel['A43'] > 0: 'Friendship with Tamara:' & gs 'journal', 'relindex', 'A43' 
+		if npc_rel['A169']> 0: 'Friendship with Dima:'  & gs 'journal', 'relindex', 'A169' 
+		if npc_rel['A69'] > 0:'Friendship with Mikhail Nikolaevich (Volleyball Coach):' & gs 'journal', 'relindex', 'A69' 
+		
+		! Uncomment if re-introduced into the game ensure you use NPC ID to update them
+		! if alla > 0: 'Friendship with Alla <<alla>>'
+		! if masha > 0: 'Friendship with Masha <<masha>>'
+		! if npc_rel['A41'] > 0: 'Friendship with Givi K. <<npc_rel[''A41'']>>'
+		! if npc_rel['A42'] > 0: 'Friendship with Ashot <<npc_rel[''A42'']>>'
+		
 
-	!!!WD: Formatting
-	if (npc_rel['A93'] + npc_rel['A41'] + npc_rel['A42'] + npc_rel['A43'] + gosh + npc_rel['A220'] + npc_rel['A219'] + npc_QW['A192'] + npc_rel['A218']) > 0:*nl
-	*nl
+		!!!WD: Formatting
+		if (npc_rel['A93'] + npc_rel['A41'] + npc_rel['A42'] + npc_rel['A43'] + gosh + npc_rel['A220'] + npc_rel['A219'] + npc_QW['A192'] + npc_rel['A218']) > 0:*nl
+		*nl
 		
 	end
 
@@ -273,7 +274,6 @@ if $ARGS[0] = 'relationstab':
 	if haraklover[2] = 2 and loverrelation[2] > 1:'<<$obj_loverpron>>''s short-tempered and strict.'
 	*nl
 
-
 ! relations
 end
 
@@ -294,7 +294,6 @@ if $ARGS[0] = 'generaltab':
 	'<br><center><a href="exec: gs ''journal'', ''clothing''">Clothing information</a></center>'
 end
 
-
 if $ARGS[0] = 'notestab':
 	$jumploc = 'notestab'
 	gs 'journal', 'journalmenu'
@@ -316,10 +315,8 @@ if $ARGS[0] = 'notestab':
 ! notes
 end
 
-
 ! ---- Other Sections ---- 
 
-
 if $ARGS[0] = 'clothing':
 	$jumploc = 'generalsub'
 	gs 'journal', 'journalmenu'
@@ -337,11 +334,9 @@ if $ARGS[0] = 'clothing':
 	'	Good quality outfit'
 	'	Outstanding quality outfit'
 
-	act 'Go back': gt 'journal', 'generaltab'
-	act 'Put your notebook down': gt $loc, $loc_arg & killvar 'jumploc'
+	gs 'journal', 'leaveactions'
 end
 
-
 if $ARGS[0] = 'uni':
 	$jumploc = 'generalsub'
 	gs 'journal', 'journalmenu'
@@ -454,15 +449,15 @@ if $ARGS[0] = 'uni':
 		if ARRSIZE('class_list_institution') >= j: jump 'exam_loop'
 		killvar 'j'
 	end
-
-	act 'Go back': gt 'journal', 'records'
-	act 'Put your notebook down': gt $loc, $loc_arg
+	act 'Go back': gt 'journal', 'generaltab'
+	gs 'journal', 'leaveactions'
 end
 if $ARGS[0] = 'locations':
 	$jumploc = 'generalsub'
 	gs 'journal', 'journalmenu'
 	'<center><h2>Pavlovsk</h2></center>'
 	'Pavlovsk is a small town. It is somewhat of a tourist trap thanks to the Catharina Palace and the former palace grounds, which have been converted into a large park centered around the train station. There is an open air market near the train station that is open year round where many bargains can be found. The cafe where your mother works can also be found near the train station. It caters to the visitors coming in by train. The downtown area contains businesses and some middle class housing, while the residential area is a mixture of houses and old Soviet era apartment blocks.'
+	*nl
 	'The wealthier families live in large houses near the park on the outskirts of town, while the poorest homes are found near the old industrial area where several factories have long since been abandoned. The only factory still open is the G&M clothing factory, which also has a local store front and a tailor that can adjust your clothing. The industrial area is now mostly home to prostitutes and drug dealers and is not considered a safe area to walk around at night. Despite being a tourist destination, the area is seen as fairly poor and without many jobs.'
 
 	'<center><h2>Gadukino</h2></center>'
@@ -472,7 +467,7 @@ if $ARGS[0] = 'locations':
 	'You''ve heard many rumors about the city from both family members and school friends. They all say it''s both a great and bad place. The few memories you have are connected to the big park that you and your family visited once, which had a large amusement park with lots of rides. You also know about the University because you''ve overheard Anya and your mother argue about it. Sometimes, your mother would drag you and Anya along to the city mall while she was visiting the beauty salon. You remember running through the stores asking your mother to buy you clothes.'
 
 	act 'Go back': gt 'journal', 'generaltab'
-	act 'Put your notebook down': gt $loc, $loc_arg & killvar 'jumploc'
+	gs 'journal', 'leaveactions'
 end
 
 if $ARGS[0] = 'friends_family':
@@ -512,12 +507,21 @@ if $ARGS[0] = 'friends_family':
 	'Sergey Shulgin - Sergey lives in the same building as you with his son, your childhood friend Vasily. He has gray hair and a small beer belly, but is still hearty looking. His wife, Vasily''s mother, left when Vasily was young. He has been close friends with your stepfather and mother for as long as you can remember. Oddly enough, he never re-married after being abandoned by his ex-wife.'
 
 	act 'Go back': gt 'journal', 'generaltab'
-	act 'Put your notebook down': gt $loc, $loc_arg & killvar 'jumploc'
+	gs 'journal', 'leaveactions'
 end
 
+! Helper functions
+
 if $ARGS[0] = 'relindex':
 
-    *pl & gs 'indik', '1', npc_rel['<<$ARGS[1]>>'], npc_rel['<<$ARGS[1]>>'], 100 & '<<$ind>>'
+    *pl & gs 'indik', '4', npc_rel['<<$ARGS[1]>>'], npc_rel['<<$ARGS[1]>>'], 100 & '<<$ind>>'
 end
 
---- journal ---------------------------------
+if $ARGS[0] = 'leaveactions':
+	act 'Put your notebook down': 		 
+		killvar 'jumploc'
+		jclose = 1
+		gt $loc, $loc_arg
+	end	
+end
+--- journal ---------------------------------

locations/journal_school.qsrc

@@ -1,4 +1,5 @@
 # journal_school
+
 ! 12-09-22 - Content split and organised to simplify Journal.
 
 if $ARGS[0] = 'coursesinfo':
@@ -71,7 +72,11 @@ if $ARGS[0] = 'coursesinfo':
 		'You are failing all of your classes! You need to do something about this if you want to graduate.'
 	end
 
-	act 'Put your notebook down': gt $loc, $loc_arg & killvar 'jumploc'
+	act 'Put your notebook down': 		 
+		killvar 'jumploc'
+		$jclose = 1
+		gt $loc, $loc_arg
+	end
 	act 'Go back': gt 'journal', 'generaltab'
 ! courses
 end
@@ -113,7 +118,11 @@ if $ARGS[0] = 'school':
 	'<center><h2>Teachers & Facility</h2></center>'
 	gs 'gschool_groups', 'teachers', 'journal'
 
-	act 'Put your notebook down': gt $loc, $loc_arg & killvar 'jumploc'
+	act 'Put your notebook down': 		 
+		killvar 'jumploc'
+		$jclose = 1
+		gt $loc, $loc_arg
+	end
 	act 'Go back': gt 'journal', 'generaltab'
 	
 end
@@ -329,7 +338,11 @@ if $ARGS[0] = 'popular':
 	else
 		'You are acquaintances with him, but he doesn''t seem to care much about you either way.'
 	end
-	act 'Put your notebook down': gt $loc, $loc_arg & killvar 'jumploc'
+	act 'Put your notebook down': 		 
+		killvar 'jumploc'
+		$jclose = 1
+		gt $loc, $loc_arg
+	end
 	act 'Go back': gt 'journal_school', 'school'
 
 end
@@ -534,7 +547,11 @@ if $ARGS[0] = 'jocks':
 		'You are acquaintances with her, but she doesn''t seem to care much about you either way.'
 	end
 
-	act 'Put your notebook down': gt $loc, $loc_arg & killvar 'jumploc'
+	act 'Put your notebook down': 		 
+		killvar 'jumploc'
+		$jclose = 1
+		gt $loc, $loc_arg
+	end
 	act 'Go back': gt 'journal_school', 'school'
 end
 
@@ -690,7 +707,11 @@ if $ARGS[0] = 'nerds':
 	else
 		'You are acquaintances with her, but she doesn''t seem to care much about you either way.'
 	end
-	act 'Put your notebook down': gt $loc, $loc_arg & killvar 'jumploc'
+	act 'Put your notebook down': 		 
+		killvar 'jumploc'
+		$jclose = 1
+		gt $loc, $loc_arg
+	end
 	act 'Go back': gt 'journal_school', 'school'
 end
 
@@ -955,7 +976,11 @@ if $ARGS[0] = 'gopniks':
 		'You are acquaintances with him, but he doesn''t seem to care much about you either way.'
 	end
 
-	act 'Put your notebook down': gt $loc, $loc_arg & killvar 'jumploc'
+	act 'Put your notebook down': 		 
+		killvar 'jumploc'
+		$jclose = 1
+		gt $loc, $loc_arg
+	end
 	act 'Go back': gt 'journal_school', 'school'
 end
 
@@ -1018,7 +1043,11 @@ if $ARGS[0] = 'outcasts':
 		'You are acquaintances with him, but he doesn''t seem to care much about you either way.'
 	end
 
-	act 'Put your notebook down': gt $loc, $loc_arg & killvar 'jumploc'
+	act 'Put your notebook down': 		 
+		killvar 'jumploc'
+		$jclose = 1
+		gt $loc, $loc_arg
+	end
 	act 'Go back': gt 'journal_school', 'school'
 end
 
@@ -1099,9 +1128,12 @@ if $ARGS[0] = 'teachers':
 		'Rolan Matveev is the school''s janitor and handyman. He is quiet and rarely interacts with the students. There is a rumor going around that he got caught rummaging through the girls lockers stealing their panties, while other people say he stalks the girls and photographs them. Regardless if the rumors are true or not, everyone agrees he looks and acts creepy.'
 	end
 
-	act 'Put your notebook down': gt $loc, $loc_arg & killvar 'jumploc'
+	act 'Put your notebook down': 		 
+		killvar 'jumploc'
+		$jclose = 1
+		gt $loc, $loc_arg
+	end
 	act 'Go back': gt 'journal_school', 'school'
 end
 
-
 --- journal_school ---------------------------------