Преглед изворни кода

Text edits and fixing leftover placeholder

Vengeance_11 пре 11 месеци
родитељ
комит
10ca6eb44b

+ 22 - 23
locations/city_experimental_trials.qsrc

@@ -23,11 +23,11 @@ if $ARGS[0] = 'front_desk' or $ARGS[0] = '':
 	minut += 2
 	gs 'stat'
 
-	temp_rand = rand(0, 3)
+	temp_rand = rand(0,3)
 	if temp_rand <= 1 or experimentQW['signed'] = 0:
 		'<center><img <<$set_imgh>> src="images\locations\city\residential\clinic\experiments\desk1.jpg"></center>'
 		*nl
-		'A young woman, dressed in office clothes and wearing glasses is sitting behind a desk.'
+		'A young woman, dressed in office clothes and wearing glasses, is sitting behind a desk.'
 
 	elseif temp_rand <= 2:
 		'<center><img <<$set_imgh>> src="images\locations\city\residential\clinic\experiments\nurse1.jpg"></center>'
@@ -43,14 +43,14 @@ if $ARGS[0] = 'front_desk' or $ARGS[0] = '':
 	killvar 'temp_rand'
 
 	if experimentQW['signed'] ! 0:
-		'She looks up as you walk in and warmely welcomes you in, "Hello miss <<$pcs_lastname>>, how can I help you today?"'
+		'She looks up as you walk in and warmly welcomes you inside. "Hello Miss <<$pcs_lastname>>, how can I help you today?"'
 
 		if $experimentQW['trial_active'] = '':
-			act 'Ask to see which clinical trials are available': gt 'city_experimental_trials_list', 'see_trials'
+			act 'Ask which clinical trials are available': gt 'city_experimental_trials_list', 'see_trials'
 		else
 			if experimentQW['trial_duration'] > 0:
 				*nl
-				'You are currently already taking part in a clinical trial.'
+				'You are already taking part in a clinical trial.'
 			else
 				act 'Report your findings':
 					cla
@@ -60,10 +60,10 @@ if $ARGS[0] = 'front_desk' or $ARGS[0] = '':
 						'"Thank you for your participation, it is invaluable to our research."'
 					else
 						'You report your experience in great detail, noting the various side effects that you''ve noticed.'
-						'"That you so much for your help, you''ve helped us advance our research greatly!"'
-						if rand(0, 2) = 0:
-							temp_tip = 10 * (pcs_intel  * rand(1, 3) / 10)
-							'She adds, "I think your dedication should be rewarded", as she hands you various notes adding up to ₽<<temp_tip>>.'
+						'"Thank you so much for your help! You''ve helped us advance our research greatly!"'
+						if rand(0,2) = 0:
+							temp_tip = 10 * (pcs_intel  * rand(1,3) / 10)
+							'"I think your dedication should be rewarded," she adds and hands you various notes adding up to ₽<<temp_tip>>.'
 							money += temp_tip
 							killvar 'temp_tip'
 						end
@@ -77,25 +77,24 @@ if $ARGS[0] = 'front_desk' or $ARGS[0] = '':
 
 		if experimentQW['times_participated_0'] >= 2 or experimentQW['times_participated_1'] ! 0 or experimentQW['times_participated_2'] ! 0 or experimentQW['times_participated_3'] ! 0:
 			*nl
-			'You also spot a small pharmaceutical stand to the side'
+			'You also spot a small pharmaceutical stand to the side.'
 			act 'Go to the experimental pharmacy': gt 'city_experimental_trials_pharmacy', 'counter'
 		end
 
 		act 'Leave': gt 'city_clinic', 'start'
 
 	else
-		'She looks up as you walk in and warmely welcomes you in, "Hello miss, how can I help you?"'
-		'"I read an advert that you are looking for people to test new treatments... And that you compensate the subjects for it." you reply.'
-		'"Yes, that is true. We are at the forefront of medical research, and you could help push the boundaries of modern medicine. Your contribution will help save countless lives.'
-		'If you want to apply, please read and fill in this form." As she hands over a clipboard.'
+		'She looks up as you walk in and warmely welcomes you inside. "Hello miss, how can I help you?"'
+		'"I read an advert that you''re looking for people to test new treatments? And that you compensate the subjects for it?" you reply.'
+		'"We are at the forefront of medical research, and you could help us push the boundaries of modern medicine. Your contribution will help save countless lives. If you want to apply, please read and fill in this form."'
+		'She hands over a clipboard.'
 		*nl
 
 		if pcs_intel < 10:
-			'The form is filled with legal jargon, but you''re pretty sure that you''ll be paid to be experimented on and those trials won''t harm your health.'
+			'The form is filled with legal jargon, but you''re pretty sure that you''ll be paid to be experimented on and that these trials won''t harm your health.'
 		elseif pcs_intel < 50:
 			'The form is filled with a lot of legal jargon, but you manage to grasp the important parts.'
-			'The clinic will pay you to take an experimental treatment and any consequences are yours to bear.'
-			'They do guarantee your safety.'
+			'The clinic will pay you to take an experimental treatment and any consequences are yours to bear, but they do guarantee your safety.'
 		elseif pcs_intel < 90:
 			'The form explains that you''ll get paid to take part in testing experimental treatments.'
 			'The clinic is not liable for any of the consequences, but they will not jeopardize your general health.'
@@ -103,22 +102,22 @@ if $ARGS[0] = 'front_desk' or $ARGS[0] = '':
 		else
 			'The form is filled with complicated legal jargon intended to confuse the reader, but your sharp mind pierces the veil.'
 			'You will get paid when you take part in testing experimental treatments which can result in permanent changes to your body and mind.'
-			'You are solely responsible in dealing with those consequences and you may not reveal the contents nor results of the treatments, if you do reveal them you can be sued for an exorbitant amount of money.'
-			'Finally, reading between the lines you also manage to grasp that some of these experiments aren''t fully ethical.'
+			'You are solely responsible in dealing with those consequences and you may not reveal the contents nor results of the treatments. If you do so, then you can be sued for an exorbitant amount of money.'
+			'Finally, reading between the lines, you also manage to grasp that some of these experiments aren''t fully ethical.'
 		end
 
 		*nl
 
-		'At the bottom of the document you need to write down your full name, age, and add your signature.'
+		'At the bottom of the document is an area where you need to write down your full name, age and add your signature.'
 		
 		act 'Sign the document':
 			experimentQW['signed'] = 1
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images\locations\city\residential\clinic\experiments\desk1.jpg"></center>'
 			*nl
-			'You hand the signed document back to the woman, who looks it over briefly.'
-			'"Thank you miss <<$pcs_lastname>>, we''ll add you to our database and from now on you can enter our various trials. The contract you signed is legally binding, you are not allowed to discuss your experiences with anybody outside of this clinic."'
-			'She must have noticed the look on your face as she follows this up with "It''s to protect our proprietary technology, so if you talk about what happens here you can leak our discoveries. Everything will be fine if you keep this to yourself."'
+			'You hand the signed document back to the woman.'
+			'"Thank you Miss... <<$pcs_lastname>>," she says as she looks it over. "We''ll add you to our database and you can enter our various trials. The contract you signed is legally binding, so you''re not allowed to discuss your experiences with anybody outside of this clinic."'
+			'"It''s to protect our proprietary technology," she adds, seemingly having noticed the look on your face. "If you talk about what happens here, then you can leak our discoveries. Everything will be fine so long as you keep this to yourself."'
 
 			act 'Return to the front desk': gt 'city_experimental_trials', 'front_desk'
 		end

+ 42 - 42
locations/city_experimental_trials_events.qsrc

@@ -13,7 +13,7 @@
 !! Change tits
 if $experimentQW['trial_active'] = 'pill_cyan':
 	if experimentQW['random_option'] = 0:
-		if rand(0, 9) < 4:
+		if rand(0,9) < 4:
 			experimentQW['random_option'] = 1
 		else
 			experimentQW['random_option'] = 2
@@ -23,10 +23,10 @@ if $experimentQW['trial_active'] = 'pill_cyan':
 
 	if experimentQW['random_option'] = 1:
 		bodyVars['bust_other'] -= 2
-		'You notice that your breast have shrunk! This must have been that experimental pill you took.'
+		'You notice that your breasts have shrunk! This must have been that experimental pill you took.'
 	else
 		bodyVars['bust_other'] += 2
-		'You notice that your breast have grown! This must have been that experimental pill you took.'
+		'You notice that your breasts have grown! This must have been that experimental pill you took.'
 	end
 
 
@@ -34,7 +34,7 @@ if $experimentQW['trial_active'] = 'pill_cyan':
 elseif $experimentQW['trial_active'] = 'pill_red':
 	if experimentQW['random_option'] = 0:
 
-		temp_rand = rand(0, 29)
+		temp_rand = rand(0,29)
 		if temp_rand < 4:
 			experimentQW['random_option'] = 1
 
@@ -61,49 +61,49 @@ elseif $experimentQW['trial_active'] = 'pill_red':
 			stren_exp -= 2 * stren_xpnxt
 		end
 
-		'You feel weaker, you''ve lost a lot of mussle mass! This must have been that experimental pill you took.'
+		'You seem to have lost a lot of mussle mass and feel weaker. This must have been that experimental pill you took.'
 
 	elseif experimentQW['random_option'] = 2:
 		if stren_lvl < 99:
 			stren_exp += 2 * stren_xpnxt
 		end
 
-		'You feel stronger, you''ve gained a lot of mussle mass! This must have been that experimental pill you took.'
+		'You seem to have gained a lot of mussle mass and feel stronger! This must have been that experimental pill you took.'
 
 	elseif experimentQW['random_option'] = 3:
 		if agil_lvl > 11:
 			agil_exp -= 2 * agil_xpnxt
 		end
 
-		'You feel slower, your agility has deminished! This must have been that experimental pill you took.'
+		'Your agility has deminished and you feel slower. This must have been that experimental pill you took.'
 
 	elseif experimentQW['random_option'] = 4:
 		if agil_lvl < 99:
 			agil_exp += 2 * agil_xpnxt
 		end
 
-		'You feel faster, your agility have increased! This must have been that experimental pill you took.'
+		'Your agility has increased and you feel faster! This must have been that experimental pill you took.'
 	
 	elseif experimentQW['random_option'] = 5:
 		if vital_lvl > 11:
 			vital_exp -= 2 * vital_xpnxt
 		end
 
-		'You feel winded, your endurance has decreased! This must have been that experimental pill you took.'
+		'Your endurance has decreased! This must have been that experimental pill you took.'
 	
 	else
 		if vital_lvl < 99:
 			vital_exp += 2 * vital_xpnxt
 		end
 
-		'You feel calm, your endurance has increased! This must have been that experimental pill you took.'
+		'Your endurance has increased! This must have been that experimental pill you took.'
 	end
 
 
 !! Change intel, cha, perception?
 elseif $experimentQW['trial_active'] = 'pill_blue':
 	if experimentQW['random_option'] = 0:
-		temp_rand = rand(0, 39)
+		temp_rand = rand(0,39)
 		if temp_rand < 4:
 			experimentQW['random_option'] = 1
 
@@ -136,35 +136,35 @@ elseif $experimentQW['trial_active'] = 'pill_blue':
 			intel_exp -= 2 * intel_xpnxt
 		end
 
-		'You feel dumber, your intelligence has decreased! This must have been that experimental pill you took.'
+		'Your intelligence has decreased and you feel dumber. This must have been that experimental pill you took.'
 
 	elseif experimentQW['random_option'] = 2:
 		if intel_lvl < 99:
 			intel_exp += 2 * intel_xpnxt
 		end
 
-		'You feel smarter, your intelligence has increased! This must have been that experimental pill you took.'
+		'Your intelligence has increased and you feel smarter! This must have been that experimental pill you took.'
 
 	elseif experimentQW['random_option'] = 3:
 		if react_lvl > 11:
 			react_exp -= 2 * react_xpnxt
 		end
 
-		'You feel slower, your reactions have deminished! This must have been that experimental pill you took.'
+		'Your reaction time has deminished and you feel slower. This must have been that experimental pill you took.'
 
 	elseif experimentQW['random_option'] = 4:
 		if react_lvl < 99:
 			react_exp += 2 * react_xpnxt
 		end
 
-		'You feel faster, your reactions have quickened! This must have been that experimental pill you took.'
+		'Your reaction time has quickened and you feel faster! This must have been that experimental pill you took.'
 
 	elseif experimentQW['random_option'] = 5:
 		if chrsm_lvl > 11:
 			chrsm_exp -= 2 * chrsm_xpnxt
 		end
 
-		'You feel less charismatic! This must have been that experimental pill you took.'
+		'You feel less charismatic. This must have been that experimental pill you took.'
 
 	elseif experimentQW['random_option'] = 6:
 		if chrsm_lvl < 99:
@@ -178,7 +178,7 @@ elseif $experimentQW['trial_active'] = 'pill_blue':
 			prcptn_exp -= 2 * prcptn_xpnxt
 		end
 
-		'You feel less perceptive! This must have been that experimental pill you took.'
+		'You feel less perceptive. This must have been that experimental pill you took.'
 
 	else
 		if prcptn_lvl < 99:
@@ -192,7 +192,7 @@ elseif $experimentQW['trial_active'] = 'pill_blue':
 !! Change skin
 elseif $experimentQW['trial_active'] = 'pill_yellow':
 	if experimentQW['random_option'] = 0:
-		temp_rand = rand(0, 9)
+		temp_rand = rand(0,9)
 		if temp_rand < 3:
 			experimentQW['random_option'] = 1
 
@@ -246,11 +246,11 @@ elseif $experimentQW['trial_active'] = 'pill_yellow':
 			if pcs_tan < 0: pcs_tan = 0
 
 			*nl
-			'Your skin pleasantly tingles, blemishes and your tan have faded, increasing your looks. This must have been that experimental pill you took.'
+			'Your skin pleasantly tingles and your blemishes and tan have faded, increasing your looks. This must have been that experimental pill you took.'
 
 		else
 			*nl
-			'Your skin pleasantly tingles, blemishes have faded, increasing your looks. This must have been that experimental pill you took.'
+			'Your skin pleasantly tingles and your blemishes have faded, increasing your looks. This must have been that experimental pill you took.'
 		end
 
 	else
@@ -259,11 +259,11 @@ elseif $experimentQW['trial_active'] = 'pill_yellow':
 
 		if pcs_tan > 0:
 			*nl
-			'Your skin pleasantly tingles, blemishes have faded and your tanned deepened, increasing your looks. This must have been that experimental pill you took.'
+			'Your skin pleasantly tingles, your blemishes have faded and your tanned deepened, increasing your looks. This must have been that experimental pill you took.'
 
 		else
 			*nl
-			'Your skin pleasantly tingles, blemishes have faded and your skin has become tanned, increasing your looks. This must have been that experimental pill you took.'
+			'Your skin pleasantly tingles, your blemishes have faded and your skin has become tanned, increasing your looks. This must have been that experimental pill you took.'
 		end
 
 		pcs_tan += 2
@@ -275,7 +275,7 @@ elseif $experimentQW['trial_active'] = 'pill_yellow':
 !! Change butt
 elseif $experimentQW['trial_active'] = 'pill_orange':
 	if experimentQW['random_option'] = 0:
-		if rand(0, 9) < 5:
+		if rand(0,9) < 5:
 			experimentQW['random_option'] = 1
 		else
 			experimentQW['random_option'] = 2
@@ -301,7 +301,7 @@ elseif $experimentQW['trial_active'] = 'pill_orange':
 elseif $experimentQW['trial_active'] = 'pill_violet':
 	if experimentQW['random_option'] = 0:
 		!! 40% chance of decreasing your inhib_exp
-		if rand(0, 9) < 4:
+		if rand(0,9) < 4:
 			experimentQW['random_option'] = 1
 
 		!! 60% chance of increasing your tits
@@ -314,20 +314,20 @@ elseif $experimentQW['trial_active'] = 'pill_violet':
 		!! correct amount??
 		inhib_exp -= 50
 		*nl
-		'You feel less outgoing and more ashamed, your inhibition has lowered. This must have been that experimental pill you took.'
+		'Your inhibition has lowered and you feel less outgoing and more ashamed. This must have been that experimental pill you took.'
 
 	else
 		!! correct amount??
 		inhib_exp += 50
 		*nl
-		'You feel more outgoing and less ashamed, your inhibition has increased. This must have been that experimental pill you took.'
+		'Your inhibition has increased and you feel more outgoing and less ashamed. This must have been that experimental pill you took.'
 	end
 
 
 !! Change min_arousal
 elseif $experimentQW['trial_active'] = 'pill_brown':
 	if experimentQW['random_option'] = 0:
-		if rand(0, 9) < 4 and min_arousal > 0:
+		if rand(0,9) < 4 and min_arousal > 0:
 			experimentQW['random_option'] = 1
 		else
 			experimentQW['random_option'] = 2
@@ -353,7 +353,7 @@ elseif $experimentQW['trial_active'] = 'pill_brown':
 elseif $experimentQW['trial_active'] = 'pill_purple':
 	if experimentQW['random_option'] = 0:
 		!! 55% chance.
-		if rand(0, 19) < 11 or clit_size = 0:
+		if rand(0,19) < 11 or clit_size = 0:
 			experimentQW['random_option'] = 1
 		else
 			experimentQW['random_option'] = 2
@@ -361,7 +361,7 @@ elseif $experimentQW['trial_active'] = 'pill_purple':
 	end
 
 	if experimentQW['random_option'] = 1:
-		if rand(0, 1) = 0:
+		if rand(0,1) = 0:
 			*nl
 			'You feel a tingle in your clit that quickly vanishes. This must have been that experimental pill you took.'
 
@@ -372,7 +372,7 @@ elseif $experimentQW['trial_active'] = 'pill_purple':
 		end
 
 	else
-		if rand(0, 1) = 0:
+		if rand(0,1) = 0:
 			*nl
 			'You feel a tingle in your clit that quickly vanishes. This must have been that experimental pill you took.'
 
@@ -416,7 +416,7 @@ elseif $experimentQW['trial_active'] = 'pill_gray':
 		killvar 'temp_will_loss'
 
 		*nl
-		'You feel your mental energy drain, and you permanently lose some willpower.'
+		'You feel your mental energy drain and you permanently lose some willpower.'
 	end
 
 
@@ -427,7 +427,7 @@ elseif $experimentQW['trial_active'] = 'pill_pink':
 		bimbolevel += 1
 
 		*nl
-		'A pink mist fills your mind and clouds your thoughts, you want to giggle and be bubbly. This must have been that experimental pill you took.'
+		'A pink mist fills your mind and clouds your thoughts. You want to giggle and be bubbly. This must have been that experimental pill you took.'
 
 	else
 		temp_will_loss = rand(2, 5)
@@ -436,7 +436,7 @@ elseif $experimentQW['trial_active'] = 'pill_pink':
 		will_counter = 0
 		killvar 'temp_will_loss'
 		*nl
-		'You feel your mental energy drain, and you permanently lose some willpower.'
+		'You feel your mental energy drain and you permanently lose some willpower.'
 	end
 end
 
@@ -453,7 +453,7 @@ if $experimentQW['trial_active'] = 'breast_cream':
 
 	if experimentQW['trial_duration'] > 1:
 		*nl
-		'You notice that your breast have grown! This must have been that experimental breast cream.'
+		'You notice that your breasts have grown! This must have been that experimental breast cream.'
 
 	else
 		if lactation['active'] <= 0:
@@ -482,7 +482,7 @@ if $experimentQW['trial_active'] = 'hair_cream':
 	defcurly = rand(0, 1)
 
 	if experimentQW['trial_duration'] > 1:
-		pcs_haircol = rand(0, 22)
+		pcs_haircol = rand(0,22)
 		*nl
 		'You notice that your hair has lengthened and changed in color! This must have been that experimental hair extension shampoo.'
 
@@ -518,7 +518,7 @@ if $experimentQW['trial_active'] = 'aphrodisiac_pill':
 		if pcs_traits['easy_orgams'] < 2: pcs_traits['easy_orgams'] = 2
 		
 		*nl
-		'You feel a heat spreading from stomach moving towards your pussy. The heat pulses and you find yourself in the grips of an intense orgasm! You feel like it''ll be easier to orgasm from now on. This must have been that experimental aphrodisiac.'
+		'You feel a heat spreading from your stomach and moving towards your pussy. The heat pulses and you find yourself in the grips of an intense orgasm! You feel like it''ll be easier to orgasm from now on. This must have been that experimental aphrodisiac.'
 	end
 end
 
@@ -536,25 +536,25 @@ if $experimentQW['trial_active'] = 'butt_injection':
 
 	if experimentQW['trial_duration'] >= 4:
 		*nl
-		'You feel a warmth pulsing in your ass and you can feel your bottom expanding. This must have been that experimental butt injection.'
+		'You feel a warmth pulsing in your ass and can feel it growing in size. This must have been that experimental butt injection.'
 	else
 		min_arousal += 10
 		pcs_horny += 10
 
-		pcs_ass += rand(5, 10) + (3 - experimentQW['trial_duration'])
+		pcs_ass += rand(5,10) + (3 - experimentQW['trial_duration'])
 		if pcs_ass > 30: pcs_ass = 30
 
-		ashrink -= rand(2, 4)
+		ashrink -= rand(2,4)
 		if ashrink < 0: ashrink = 0
 
-		ashrinkdays += rand(2, 4)
+		ashrinkdays += rand(2,4)
 		if ashrinkdays > 10: ashrinkdays = 10
 
-		agape[4] += rand(5, 10) + (3 - experimentQW['trial_duration'])
+		agape[4] += rand(5,10) + (3 - experimentQW['trial_duration'])
 		if agape[4] > 60: agape[4] = 60
 
 		*nl
-		'You feel a warmth pulsing in your ass, heat radiation from your puckered hole. You can feel your ass expanding and you crave anal. This must have been that experimental butt injection.'
+		'You feel a warmth pulsing in your ass and heat radiates from your puckered hole. You can feel your ass expanding and you crave anal. This must have been that experimental butt injection.'
 	end
 end
 

+ 40 - 40
locations/city_experimental_trials_list.qsrc

@@ -107,11 +107,11 @@ if $ARGS[0] = $trial_sections[0]:
 
 	minut += 2
 	
-	!!Image of the desk, or a experimental trials folder.
+	!!Image of the desk, or an experimental trials folder
 	'<center><img <<$set_imgh>> src="images\system\image_needed.png"></center>'
 
-	'We have developed a range of enhancement pills that are designed to improve body and mood. They''ve just been approved for human trials, so we''re still cataloguing the effects.'
-	'The following are expected: mood swings, aches, itches, rashes, and physical changes.'
+	'We have developed a range of enhancement pills that are designed to improve both body and mood. They''ve just been approved for human trials, so we''re still cataloguing the effects.'
+	'The following are expected: mood swings, aches, itches, rashes and physical changes.'
 	
 	act 'Sign up':
 		$experimentQW['trial_active'] = $trial_names[0]
@@ -121,7 +121,7 @@ if $ARGS[0] = $trial_sections[0]:
 		gs 'stat'
 
 		*clr & cla
-		if rand(0, 1) = 0:
+		if rand(0,1) = 0:
 			$temp_doc = $exp_docs[0]
 			'<center><img <<$set_imgh>> src="images\locations\city\residential\clinic\experiments\doc1.jpg"></center>'
 		else
@@ -129,45 +129,45 @@ if $ARGS[0] = $trial_sections[0]:
 			'<center><img <<$set_imgh>> src="images\locations\city\residential\clinic\experiments\doc2.jpg"></center>'
 		end
 
-		'You are approached by a doctor in a white lab coat, his name neatly sown on the chest tells you it''s <<$temp_doc>>. "Miss <<$pcs_lastname>>? Please follow me."'
+		'You are approached by a doctor in a white lab coat, <<$temp_doc>> neatly sown on the chest. "Miss <<$pcs_lastname>>? Please follow me."'
 		*nl
 		'You are guided through narrow hallways until you end up in <<$temp_doc>>''s private office, where you take a seat in one of the free chairs available.'
 
-		temp_rand = rand(0, 89)
+		temp_rand = rand(0,89)
 		!! Change tits
 		if temp_rand < 10:
 			$temp_pill_color = 'cyan'
 			$experimentQW['trial_active']     = 'pill_cyan'
 			$experimentQW['pill_cyan_taken'] += 1
-			 experimentQW['trial_duration']   = rand(1, 3)
+			 experimentQW['trial_duration']   = rand(1,3)
 
 		!! Change stren, vital, or agil
 		elseif temp_rand < 20:
 			$temp_pill_color = 'red'
 			$experimentQW['trial_active']    = 'pill_red'
 			$experimentQW['pill_red_taken'] += 1
-			 experimentQW['trial_duration']  = rand(2, 4)
+			 experimentQW['trial_duration']  = rand(2,4)
 
 		!! Change intel, cha, perception?
 		elseif temp_rand < 30:
 			$temp_pill_color = 'blue'
 			$experimentQW['trial_active']     = 'pill_blue'
 			$experimentQW['pill_blue_taken'] += 1
-			 experimentQW['trial_duration']   = rand(2, 4)
+			 experimentQW['trial_duration']   = rand(2,4)
 
 		!! Change skin
 		elseif temp_rand < 40:
 			$temp_pill_color = 'yellow'
 			$experimentQW['trial_active']       = 'pill_yellow'
 			$experimentQW['pill_yellow_taken'] += 1
-			 experimentQW['trial_duration']     = rand(2, 5)
+			 experimentQW['trial_duration']     = rand(2,5)
 
 		!! Change butt
 		elseif temp_rand < 50:
 			$temp_pill_color = 'orange'
 			$experimentQW['trial_active']       = 'pill_orange'
 			$experimentQW['pill_orange_taken'] += 1
-			 experimentQW['trial_duration']     = rand(2, 4)
+			 experimentQW['trial_duration']     = rand(2,4)
 
 		!! Change inhib
 		elseif temp_rand < 60:
@@ -181,14 +181,14 @@ if $ARGS[0] = $trial_sections[0]:
 			$temp_pill_color = 'brown'
 			$experimentQW['trial_active']      = 'pill_brown'
 			$experimentQW['pill_brown_taken'] += 1
-			 experimentQW['trial_duration']    = rand(2, 4)
+			 experimentQW['trial_duration']    = rand(2,4)
 		
 		!! Change clit
 		elseif temp_rand < 70:
 			$temp_pill_color = 'purple'
 			$experimentQW['trial_active']     = 'pill_purple'
 			$experimentQW['pill_cyan_taken'] += 1
-			 experimentQW['trial_duration']   = rand(2, 4)
+			 experimentQW['trial_duration']   = rand(2,4)
 
 		!! Change alko_status
 		elseif temp_rand < 80:
@@ -224,7 +224,7 @@ if $ARGS[0] = $trial_sections[0]:
 			minut += 3
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images\locations\city\residential\clinic\experiments\pill<<rand(2, 4)>>.jpg"></center>'
-			'The doctor observes as you swallow the pill and then makes a note on a clipboard. "Thank you for your participation miss <<$pcs_lastname>>, we''ll speak again soon."'
+			'The doctor observes as you swallow the pill and then makes a note on a clipboard. "Thank you for your participation, Miss <<$pcs_lastname>>. We''ll speak again soon."'
 			gs 'city_experimental_trials_list', 'act_return', trial_pays[0]
 		end
 	end
@@ -240,7 +240,7 @@ elseif $ARGS[0] = $trial_sections[1]:
 	$loc_arg = $trial_sections[1]
 
 	minut += 2
-	'We have developed a breast cream, based on natural hormones, which enhances the natural breast growth leading to fuller and natural looking breasts.'
+	'We have developed a cream, based on natural hormones, which enhances the natural growth of breasts, leading to fuller and more natural looking breasts.'
 	'No side effects are listed for this clinical trial.'
 
 	act 'Sign up':
@@ -253,7 +253,7 @@ elseif $ARGS[0] = $trial_sections[1]:
 		gs 'stat'
 
 		*clr & cla
-		if rand(0, 1) = 0:
+		if rand(0,1) = 0:
 			$temp_doc = $exp_docs[0]
 			'<center><img <<$set_imgh>> src="images\locations\city\residential\clinic\experiments\doc1.jpg"></center>'
 		else
@@ -261,7 +261,7 @@ elseif $ARGS[0] = $trial_sections[1]:
 			'<center><img <<$set_imgh>> src="images\locations\city\residential\clinic\experiments\doc2.jpg"></center>'
 		end
 
-		'You are approached by a doctor in a white lab coat, his name neatly sown on the chest tells you it''s <<$temp_doc>>. "Miss <<$pcs_lastname>>? Please follow me."'
+		'You are approached by a doctor in a white lab coat, <<$temp_doc>> neatly sown on the chest. "Miss <<$pcs_lastname>>? Please follow me."'
 		*nl
 		'You are guided through narrow hallways until you end up in <<$temp_doc>>''s private office, where he gestures you lie on the exam table. "Please lie down and expose your chest."'
 
@@ -271,8 +271,8 @@ elseif $ARGS[0] = $trial_sections[1]:
 			gs 'stat'
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images\locations\city\residential\clinic\experiments\bustcream1.jpg"></center>'
-			'<<$temp_doc>> puts on a pair of latex gloves, grabs a generic white tube, squeezes a large amount of white cream in his hands, and starts massaging it into your breasts.'
-			'The massage continues for about a minute, at which point <<$temp_doc>> steps away and takes of his gloves. "Thank you for your participation miss <<$pcs_lastname>>, you can get dressed now and we''ll speak again soon."'
+			'<<$temp_doc>> puts on a pair of latex gloves and grabs a generic white tube. Squeezing a large amount of white cream into his hands, he starts massaging it into your breasts.'
+			'The massage continues for about a minute, at which point <<$temp_doc>> steps away and takes off his gloves. "Thank you for your participation, Miss <<$pcs_lastname>>. We''ll speak again soon."'
 
 			gs 'city_experimental_trials_list', 'act_return', trial_pays[1]
 		end
@@ -290,7 +290,7 @@ elseif $ARGS[0] = $trial_sections[2]:
 	$loc_arg = $trial_sections[2]
 
 	minut += 2
-	'We have developed a hair extension shampoo, which enhances your natural hair growth leading to longer, fuller and glossier hair.'
+	'We have developed a hair extension shampoo which enhances your natural hair growth, leading to longer, fuller and glossier hair.'
 	'No side effects are listed for this clinical trial.'
 
 	act 'Sign up':
@@ -303,7 +303,7 @@ elseif $ARGS[0] = $trial_sections[2]:
 		gs 'stat'
 
 		*clr & cla
-		if rand(0, 1) = 0:
+		if rand(0,1) = 0:
 			$temp_doc = $exp_docs[0]
 			'<center><img <<$set_imgh>> src="images\locations\city\residential\clinic\experiments\doc1.jpg"></center>'
 		else
@@ -311,7 +311,7 @@ elseif $ARGS[0] = $trial_sections[2]:
 			'<center><img <<$set_imgh>> src="images\locations\city\residential\clinic\experiments\doc2.jpg"></center>'
 		end
 
-		'You are approached by a doctor in a white lab coat, his name neatly sown on the chest tells you it''s <<$temp_doc>>. "Miss <<$pcs_lastname>>? Please follow me."'
+		'You are approached by a doctor in a white lab coat, <<$temp_doc>> neatly sown on the chest. "Miss <<$pcs_lastname>>? Please follow me."'
 		*nl
 		'You are guided through narrow hallways until you end up in <<$temp_doc>>''s private office, where he gestures you lie on the exam table. "Please lie down."'
 
@@ -320,8 +320,8 @@ elseif $ARGS[0] = $trial_sections[2]:
 			gs 'stat'
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images\locations\city\residential\clinic\experiments\haircream1.jpg"></center>'
-			'<<$temp_doc>> puts on a pair of latex gloves, grabs a generic chestnut brown tube, squeezes a large amount of beige cream in his hands, and starts massaging it into your hair and scalp.'
-			'The massage continues for about a minute, at which point <<$temp_doc>> steps away and takes of his gloves. "Thank you for your participation miss <<$pcs_lastname>>, you can get dressed now and we''ll speak again soon."'
+			'<<$temp_doc>> puts on a pair of latex gloves and grabs a generic chestnut brown tube. He squeezes a large amount of beige cream into his hands and starts massaging it into your hair and scalp.'
+			'The massage continues for about a minute, at which point <<$temp_doc>> steps away and takes off his gloves. "Thank you for your participation, Miss <<$pcs_lastname>>. We''ll speak again soon."'
 
 			gs 'city_experimental_trials_list', 'act_return', trial_pays[2]
 		end
@@ -342,7 +342,7 @@ elseif $ARGS[0] = $trial_sections[3]:
 	'We have developed a general aphrodisiac to put you and your partner in the mood and ready to go for hours.'
 	'No side effects are listed for this clinical trial.'
 	*nl
-	'<sub><small>Warning! This is a strictly personal enhancer, the clinic is not liable for any criminal allegations if used on other subjects.</small></sub>'
+	'<sub><small>Warning! This is a strictly personal enhancer. The clinic is not liable for any criminal allegations if used on other subjects.</small></sub>'
 
 	act 'Sign up':
 		 experimentQW['times_participated_3'] += 1
@@ -354,7 +354,7 @@ elseif $ARGS[0] = $trial_sections[3]:
 		gs 'stat'
 
 		*clr & cla
-		if rand(0, 1) = 0:
+		if rand(0,1) = 0:
 			$temp_doc = $exp_docs[0]
 			'<center><img <<$set_imgh>> src="images\locations\city\residential\clinic\experiments\doc1.jpg"></center>'
 		else
@@ -363,7 +363,7 @@ elseif $ARGS[0] = $trial_sections[3]:
 		end
 
 
-		'You are approached by a doctor in a white lab coat, his name neatly sown on the chest tells you it''s <<$temp_doc>>. "Miss <<$pcs_lastname>>? Please follow me."'
+		'You are approached by a doctor in a white lab coat, <<$temp_doc>> neatly sown on the chest. "Miss <<$pcs_lastname>>? Please follow me."'
 		*nl
 		'You are guided through narrow hallways until you end up in <<$temp_doc>>''s private office, where you take a seat in one of the free chairs available.'
 
@@ -376,7 +376,7 @@ elseif $ARGS[0] = $trial_sections[3]:
 			minut += 3
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images\locations\city\residential\clinic\experiments\pill1.jpg"></center>'
-			'The doctor observes as you swallow the pill and then makes a note on a clipboard. "Thank you for your participation miss <<$pcs_lastname>>, we''ll speak again soon."'
+			'The doctor observes as you swallow the pill and then makes a note on a clipboard. "Thank you for your participation, Miss <<$pcs_lastname>>. We''ll speak again soon."'
 
 			gs 'city_experimental_trials_list', 'act_return', trial_pays[3]
 		end
@@ -394,10 +394,10 @@ elseif $ARGS[0] = $trial_sections[4]:
 	$loc_arg  = $trial_sections[4]
 
 	minut += 2
-	'Dissapointed by your genetic disposition to a flat behind, but afraid of invasive surgery? We at Kardashian Medics have heard you and developed our patented<sup>*</sup> KBI treatment, get a behind like ours.'
+	'Dissapointed by your genetic disposition to a flat behind, but afraid of invasive surgery? We at Kardashian Medics have heard you and developed our patented<sup>*</sup> KBI treatment! Get a behind like ours!'
 	'No side effects are listed for this clinical trial.'
 	'<br><br><br><br><br><br><br><br><br><br>'
-	'<sub><small>*Patent following. The Kardashian Butt Injection is not affiliated with Kardashian family.</small></sub>'
+	'<sub><small>*Patent following. The Kardashian Butt Injection is not affiliated with the Kardashian family.</small></sub>'
 
 	act 'Sign up':
 		 experimentQW['times_participated_4'] += 1
@@ -409,7 +409,7 @@ elseif $ARGS[0] = $trial_sections[4]:
 		gs 'stat'
 
 		*clr & cla
-		if rand(0, 1) = 0:
+		if rand(0,1) = 0:
 			$temp_doc = $exp_docs[0]
 			'<center><img <<$set_imgh>> src="images\locations\city\residential\clinic\experiments\doc1.jpg"></center>'
 		else
@@ -418,7 +418,7 @@ elseif $ARGS[0] = $trial_sections[4]:
 		end
 
 
-		'You are approached by a doctor in a white lab coat, his name neatly sown on the chest tells you it''s <<$temp_doc>>. "Miss <<$pcs_lastname>>? Please follow me."'
+		'You are approached by a doctor in a white lab coat, <<$temp_doc>> neatly sown on the chest. "Miss <<$pcs_lastname>>? Please follow me."'
 		*nl
 		'You are guided through narrow hallways until you end up in <<$temp_doc>>''s private office, where he gestures you lie on the exam table. "Please expose your buttocks and lie face down on the exam table."'
 
@@ -426,8 +426,8 @@ elseif $ARGS[0] = $trial_sections[4]:
 			minut += 3
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images\locations\city\residential\clinic\experiments\assinjection1.jpg"></center>'
-			'<<$temp_doc>> briefly searches through a drawer, pulls out a syringe filled with a light brownish liquid. A mild sting and a small injection in each bottock, and you are done.'
-			'"Thank you for your participation miss <<$pcs_lastname>>, we''ll speak again soon."'
+			'<<$temp_doc>> briefly searches through a drawer and pulls out a syringe filled with a light brownish liquid. A mild sting and a small injection in each bottock, and you are done.'
+			'"Thank you for your participation, Miss <<$pcs_lastname>>. We''ll speak again soon."'
 
 			gs 'city_experimental_trials_list', 'act_return', trial_pays[4]
 		end
@@ -445,8 +445,8 @@ elseif $ARGS[0] = $trial_sections[5]:
 	$loc_arg  = $trial_sections[5]
 
 	minut += 2
-	'Do you want a baby, but having problems getting pregnant? Fear not, for we have developed a new fertility treatment. One shot and your chances of bringing that sunshine into your life will quadrupple.'
-	'Side effects include: Hormonal imbalance, superovulation, and uncontroled arousal.'
+	'Do you want a baby, but are having problems getting pregnant? Fear not, for we have developed the answer! Just one shot and your chances of bringing that little ray of sunshine into your life will quadruple!'
+	'Side effects include: Hormonal imbalance, superovulation and uncontrolled arousal.'
 
 	act 'Sign up':
 		 experimentQW['times_participated_5'] += 1
@@ -458,7 +458,7 @@ elseif $ARGS[0] = $trial_sections[5]:
 		gs 'stat'
 
 		*clr & cla
-		if rand(0, 1) = 0:
+		if rand(0,1) = 0:
 			$temp_doc = $exp_docs[0]
 			'<center><img <<$set_imgh>> src="images\locations\city\residential\clinic\experiments\doc1.jpg"></center>'
 		else
@@ -467,7 +467,7 @@ elseif $ARGS[0] = $trial_sections[5]:
 		end
 
 
-		'You are approached by a doctor in a white lab coat, his name neatly sown on the chest tells you it''s <<$temp_doc>>. "Miss <<$pcs_lastname>>? Please follow me."'
+		'You are approached by a doctor in a white lab coat, <<$temp_doc>> neatly sown on the chest. "Miss <<$pcs_lastname>>? Please follow me."'
 		*nl
 		'You are guided through narrow hallways until you end up in <<$temp_doc>>''s private office, where he gestures you lie on the exam table. "Please expose your stomach and lie face down on the exam table."'
 
@@ -475,8 +475,8 @@ elseif $ARGS[0] = $trial_sections[5]:
 			minut += 3
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images\locations\city\residential\clinic\experiments\pregshot1.jpg"></center>'
-			'<<$temp_doc>> briefly searches through a drawer, pulls out a syringe filled with a bubbling red liquid. A sharp sting and an injection into your lower stomach, and you are done.'
-			'"Thank you for your participation miss <<$pcs_lastname>>, we''ll speak again soon."'
+			'<<$temp_doc>> briefly searches through a drawer and pulls out a syringe filled with a bubbling red liquid. A sharp sting and an injection into your lower stomach, and you are done.'
+			'"Thank you for your participation, Miss <<$pcs_lastname>>. We''ll speak again soon."'
 
 			gs 'city_experimental_trials_list', 'act_return', trial_pays[5]
 		end

+ 27 - 27
locations/journal.qsrc

@@ -112,18 +112,18 @@ if $ARGS[0] = 'housingtab':
 	'<center><h2>Housing</h2></center>'
 	
 	*nl
-	if accessible_property['shared_apartment'] = 4:'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 <<accessible_property[''city_apartment-rent'']>> <b>₽</b> us electric bill on 25th of each month. You are currently paid up for <b><<accessible_property[''city_apartment-days-left'']>></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.'
-	if accessible_property['city_apartment'] = 3:'You own a two room apartment in the city residential area. It''s currently occupied by your tenants.'
-	if accessible_property['parents_home'] = 4:'You live with your parents and siblings in a two room apartment in Pavlovsk.'
-	if accessible_property['village_cottage']= 2 :'You own a small holiday cottage with an adjacent allotment in the communal village.'
-	if accessible_property['old_town_apartment'] = 1:'You rent a two room apartment in Pushkin. Your rent for the apartment is subtracted automatically in the sum of <<accessible_property[''old_town_apartment-rent'']>> <b>₽</b> us electric bill on the 25th of each month. You are currently paid up for <b><<accessible_property[''old_town_apartment-days-left'']>></b> days'
-	if accessible_property['matryona_mansion'] = 2 and constructionstatus = 0:'You own a vacant block in the city suburbs.'
-	if accessible_property['matryona_mansion'] = 2 and constructionstatus = 1:'You own a plot of land in the city suburbs upon which you are building a house.' + iif(banaMansion = 1, 'Your utility bills are due on the 25th of each month.', '')
-	if accessible_property['matryona_mansion'] = 2 and constructionstatus = 2:'You own an impressive mansion in the city suburbs. ' + iif(banaMansion = 1, 'Your utility bills are due on the 25th of each month.', '')
-	if accessible_property['city_house'] = 2:'You own a nice house on the edge of the city residential district. Your utility bills are due on the 25th of each month.'
-	if accessible_property['meynold_household'] = 4:'You live with Vicky, Katja and Tamara Meynold. You have your own room and get an allowance based on helping out around the house and/or studying with Tamara.'
+	if accessible_property['shared_apartment'] = 4: '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 bedroom apartment in the city residential area. Your rent for the apartment is subtracted automatically in sum of <<accessible_property[''city_apartment-rent'']>> <b>₽</b> us electric bill on 25th of each month. You are currently paid up for <b><<accessible_property[''city_apartment-days-left'']>></b> days.'
+	if accessible_property['city_apartment'] = 2: 'You own a two bedroom apartment in the city residential area. Your utility bills are due on the 25th of each month.'
+	if accessible_property['city_apartment'] = 3: 'You own a two bedroom apartment in the city residential area. It''s currently occupied by your tenants.'
+	if accessible_property['parents_home'] = 4: 'You live with your parents and siblings in a two bedroom apartment in Pavlovsk.'
+	if accessible_property['village_cottage']= 2 : 'You own a small holiday cottage with an adjacent allotment in the communal village.'
+	if accessible_property['old_town_apartment'] = 1: 'You rent a two bedroom apartment in Pushkin. Your rent for the apartment is subtracted automatically in the sum of <<accessible_property[''old_town_apartment-rent'']>> <b>₽</b> us electric bill on the 25th of each month. You are currently paid up for <b><<accessible_property[''old_town_apartment-days-left'']>></b> days.'
+	if accessible_property['matryona_mansion'] = 2 and constructionstatus = 0: 'You own a vacant block in the city suburbs.'
+	if accessible_property['matryona_mansion'] = 2 and constructionstatus = 1: 'You own a plot of land in the city suburbs upon which you are building a house.' + iif(banaMansion = 1, 'Your utility bills are due on the 25th of each month.', '')
+	if accessible_property['matryona_mansion'] = 2 and constructionstatus = 2: 'You own an impressive mansion in the city suburbs. ' + iif(banaMansion = 1, 'Your utility bills are due on the 25th of each month.', '')
+	if accessible_property['city_house'] = 2: 'You own a nice house on the edge of the city residential district. Your utility bills are due on the 25th of each month.'
+	if accessible_property['meynold_household'] = 4: 'You live with Vicky, Katja and Tamara Meynold. You have your own room and get an allowance based on helping out around the house and/or studying with Tamara.'
 	*nl
 	if car > 0:
 		'<center><h2>Car</h2></center>'
@@ -318,7 +318,7 @@ if $ARGS[0] = 'relationstab':
 		*nl
 		
 	end
-			
+
 	'<center><h2>Pavlovsk Relations</h2></center>'
 	if npc_rel['A54']  > 0: 'Friendship with Uncle Misha:'    & gs 'journal', 'relindex', 'A54'
 	if npc_rel['A57']  > 0: 'Friendship with Rex:'            & gs 'journal', 'relindex', 'A57'
@@ -522,31 +522,31 @@ if $ARGS[0] = 'ballet':
 	
 	'Пан или пропал (You become the master or, leave).'
 	
-	'A narrative based mod and activities for the Dancer start. The MC has been given a grant to attend a intensive 6 day summer class with an assessment, that if, she passes can lead to a weekly rehearsal and a Winter dance show in December.'
+	'A narrative based mod and activities for the Dancer start. The MC has been given a grant to attend an intensive 6 day summer class with an assessment that, if passed, can lead to a weekly rehearsal and a Winter dance show in December.'
 	
-	'Note: this storyline will play out over a long time span and your actions will have consequences that won''t be obvious initially. Some of this is dependent on the development of main Girl Life codebase.'
+	'Note: This storyline will play out over a long time span and your actions will have consequences that won''t initially be obvious. Some of this is dependent on the development of the main Girl Life codebase.'
 	
 	 'Current and planned features:'
 	
-		'• New dancer start option, with other starts being granted access later or uni/city years pay to join.'
-		'• 6 day intensive course during the school summer break - look for the letter at your parents kitchen to notify you.'
+		'• A new dancer start option, with other starts being granted access later or uni/city years paying to join.'
+		'• A 6 day intensive course during the school summer break - look for the letter in your parents kitchen to notify you.'
 		'• New pen friend(s), with meet ups and theatre or ballet nights with family or partner.'
-		'• Dance instructor, who''s intentions may prevent MC from joining the Pushkin Ballet Company or could have far ranging consequences on both on herself and NPC characters.'
-		'• New dance gigs, at each rehearsal there''s a chance that you may get dance job for the local theatre or the city if you passed with merit.'
+		'• A new dance instructor, whose intentions may prevent MC from joining the Pushkin Ballet Company or could have far ranging consequences on both herself and NPC characters.'
+		'• New dance gigs. At each rehearsal, there''s a chance that you may get a dance job for the local theatre or the city if you pass with merit.'
 	
-	'NB: There is no sex acts in this mod at present, if you wish to write scenes based on the content contact me at the Girl Life Discord Server.'
+	'NB: There is no sex acts in this mod at present. If you wish to write such scenes based on the content, then contact me on the Girl Life Discord.'
 	
 	'<center><h2>In Memoriam — Hooded Silence.</h2></center>'
 	*nl
-	'This content is being maintained as part of Hooded Silence''s legacy, I have approximately 1-2 years of original content to add but if you wish to contribute then note there is no sexual content in this mod until at least year 3 as per his notes. '
+	'This content is being maintained as part of Hooded Silence''s legacy. I have approximately 1-2 years of original content to add but if you wish to contribute, then note that there is no sexual content in this mod until at least year 3 as per his notes.'
 	'This is a narrative driven addition to the game and your actions do and will count towards what happens both for yourself and others. These moments are easily missable but they will represent consquences of your decisions such as:'
 	*nl
-	'   • Failure to adhere to the residential schools rules or live up to the high standards of the school.'
+	'   • Failure to adhere to the residential school''s rules or live up to the high standards of the school.'
 	'   • Get drunk too often or fall pregnant  - kicked off the Corp De Ballet.'
 	'   • Fail to maintain your appearance - reprimands or loss of income, leading to expulsion.'
-		
+
 	*nl
-	'These are the obvious repercussions, but there will be subtle consequences for your interactions with NPCs. This mod is meant to be played blind for your initial playthrough and the only feedback will be the varying conversations'
+	'These are the obvious repercussions, but there will be subtle consequences for your interactions with NPCs. This mod is meant to be played blind for your initial playthrough and the only feedback will be the varying conversations.'
 	
 end
 
@@ -592,7 +592,7 @@ if $ARGS[0] = 'uni':
 
 	if $university['elective1'] ! '' or $university['elective2'] ! '' or $university['elective3'] ! '':
 		*nl
-		'This semester, you are taking the following elective classes: <<$university[''elective1'']>>, <<$university[''elective2'']>>, <<$university[''elective1'']>>.'
+		'You are taking the following elective classes this semester: <<$university[''elective1'']>>, <<$university[''elective2'']>>, <<$university[''elective1'']>>.'
 	end
 
 	j = 1
@@ -616,13 +616,13 @@ if $ARGS[0] = 'uni':
 	
 	if university['semester_passed'] = university['enrolled_in_semester'] and university['diploma'] = 0:
 		*nl
-		'You need to register for your next semester at the university administration'
+		'You need to register for your next semester at the university administration building.'
 
 	elseif university['break'] = 1:
 		*nl
 		'You currently have a break between semesters.'
 		if university['semester_week'] = -1:
-			'The next semester will start next week'
+			'The next semester will start next week.'
 		end
 
 		'<center><h2>Class schedule for Next Semester</h2></center>'

+ 28 - 28
locations/journal_work.qsrc

@@ -27,32 +27,32 @@ if $ARGS[0] = 'start':
 	
 	if arrsize('evt_event') ! 0: gs 'emp_functions', 'disp_evt', 2
 	
-	if workPTU > 2:'You work as a teacher at the Lycée and your schedule is Monday to Saturday, teaching between 14:00 and 16:00. Your salary is 300 <b>₽</b> per day.'
-	if (work = 1 or cheatWork = 1) and workKafe['job'] > 0:'You are working as a waitress at The Roadhouse cafe. You need to come to work between 11:00-12:00 while your working days are: Tuesday, Wednesday, and Thursday. At work, you can receive tips from customers and your wages are received on 25th of each month.'
-	if (work = 1 or cheatWork = 1) and workhosp > 0:'You work as a nurse in the city residential area clinic. You need to come to work between 08:00-09:00 during the week. Salary is automatically transferred on the 25th of each month.'
-	if (work = 1 or cheatWork = 1) and worksalon > 0:'You work as a masseuse in the city at the Beauty Bar. You need to come to work between 09:00-10:00 while your working days are: Monday, Wednesday, and Friday. Salary is automatically transferred on 25th of each month.'
-	if (work = 1 or cheatWork = 1) and workSec > 0:'You work as a secretary at Titran Express. You need to come to work by 09:00 during the week Monday-Friday. Salary is automatically transferred on the 25th of each month.'
-	if (work = 1 or cheatWork = 1) and tanwork > 0:'You work as a governess for Tanya at Nicholas'' luxury city apartment. Salary is automatically transferred on the 25th of each month.'
-	if (work = 1 or cheatWork = 1) and young_shop_work = 1:'You work in the city as a store clerk at the Pussy Cats clothing store. Work starts at 16:00 Monday to Friday. The salary shall be issued once a week, on Fridays.'
-	if (work = 1 or cheatWork = 1) and young_shop_work1 = 1:'You work in the city as a store clerk at the Pussy Cats clothing store. Work starts at 09:00 Saturday and Sunday. The salary shall be issued once a week, on Fridays.'
-	if (work = 1 or cheatWork = 1) and young_shop_work2 = 1:'You work in the city as a store clerk at the Pussy Cats clothing store. Work starts at 09:00 Monday through Friday. The salary shall be issued once a week, on Fridays.'
-	if (work = 1 or cheatWork = 1) and workFabrika = 1:'You work as a seamstress in the factory in Pavlovsk. Work is every weekday, with weekends off. Salary is automatically transferred on the 25th of each month.'
-	!!if (work = 1 or cheatWork = 1) and TourGuide = 1:'You work as a tour guide in the Pavlovsk park. Work is any day during the summer holidays for 8 hours, starting between 08:00 and 12:00. Salary is 1,000 <b>₽</b> .'
-	if workrin = 1:'You are working at the market in Arthur''s tent as a clothing saleswoman. You work on Tuesday, Thursday and Saturday with a start time of 08:00. Salary depends on sales.'
+	if workPTU > 2: 'You work as a teacher at the Lycée and your schedule is Monday to Saturday, teaching between 14:00 and 16:00. Your salary is 300 <b>₽</b> per day.'
+	if (work = 1 or cheatWork = 1) and workKafe['job'] > 0: 'You are working as a waitress at The Roadhouse cafe. Your working days are Tuesday, Wednesday and Thursday, and you should come to work between 11:00 and 12:00. Your wages are received on the 25th of each month, but you can earn tips from customers.'
+	if (work = 1 or cheatWork = 1) and workhosp > 0: 'You work as a nurse in the city residential area clinic. You need to come to work between 08:00-09:00 during the week. Salary is automatically transferred on the 25th of each month.'
+	if (work = 1 or cheatWork = 1) and worksalon > 0: 'You work as a masseuse at the Beauty Bar in the city. Your working days are: Monday, Wednesday and Friday, and you should come to work between 09:00 and 10:00. Salary is automatically transferred on the 25th of each month.'
+	if (work = 1 or cheatWork = 1) and workSec > 0: 'You work as a secretary at Titran Express, Monday to Friday. You need to come to work by 09:00. Salary is automatically transferred on the 25th of each month.'
+	if (work = 1 or cheatWork = 1) and tanwork > 0: 'You work as a governess for Tanya at Nicholas'' luxury city apartment. Salary is automatically transferred on the 25th of each month.'
+	if (work = 1 or cheatWork = 1) and young_shop_work = 1: 'You work in the city as a store clerk at the Pussy Cats clothing store. Work starts at 16:00 Monday to Friday. Your salary is paid once a week on Fridays.'
+	if (work = 1 or cheatWork = 1) and young_shop_work1 = 1: 'You work in the city as a store clerk at the Pussy Cats clothing store. Work starts at 09:00 Saturday and Sunday. Your salary is paid once a week on Fridays.'
+	if (work = 1 or cheatWork = 1) and young_shop_work2 = 1: 'You work in the city as a store clerk at the Pussy Cats clothing store. Work starts at 09:00 Monday through Friday. Your salary is paid once a week on Fridays.'
+	if (work = 1 or cheatWork = 1) and workFabrika = 1: 'You work as a seamstress in the factory in Pavlovsk. You work every week day and your salary is automatically transferred on the 25th of each month.'
+	!!if (work = 1 or cheatWork = 1) and TourGuide = 1: 'You work as a tour guide in the Pavlovsk park. Work is any day during the summer holidays for 8 hours, starting between 08:00 and 12:00. Salary is 1,000 <b>₽</b>.'
+	if workrin = 1: 'You are working in Arthur''s tent at the market as a clothing saleswoman. You work on Tuesday, Thursday and Saturday with a start time of 08:00. Salary depends on sales.'
 	if maidqw = 1:
 		'You work in the Pavlovsk hotel as a maid. Your work schedule is every day from 16:00 to 19:00 and your salary is 250 <b>₽</b> plus tips.'
 	elseif GermanQW = 1:
 		'You can find out more about becoming a maid at the Pavlovsk hotel if you visit the manager between 12:00 and 14:00.'
 	end
-	if postjobQW = 2 or postjobQW = 4:'You deliver mail for the postmaster. The work day starts each Saturday between 11:00 and 12:00. Salary is 450 <b>₽</b> .'
-	if (work = 1 or cheatWork = 1) and gpoliuborka > 1:'You work part-time as a cleaner in the Pavlovsk clinic. Your schedule is from 14:00 to 21:00.'
-	if stripwork >= 1:'You work as a stripper at the Fuzzy Dice strip club every Wednesday and Thursday from 18:00 to 03:00. No salary as you earn tips.'
-	if stripwork1 >= 1:'You work as a stripper at the Fuzzy Dice strip club every Friday and Saturday from 18:00 to 03:00. No salary as you earn tips.'
+	if postjobQW = 2 or postjobQW = 4: 'You deliver mail for the postmaster. The work day starts each Saturday between 11:00 and 12:00. Salary is 450 <b>₽</b>.'
+	if (work = 1 or cheatWork = 1) and gpoliuborka > 1: 'You work part-time as a cleaner in the Pavlovsk clinic. Your schedule is from 14:00 to 21:00.'
+	if stripwork >= 1: 'You work as a stripper at the Fuzzy Dice strip club every Wednesday and Thursday from 18:00 to 03:00. No salary as you earn tips.'
+	if stripwork1 >= 1: 'You work as a stripper at the Fuzzy Dice strip club every Friday and Saturday from 18:00 to 03:00. No salary as you earn tips.'
 	!!if stripbarwork >= 1: 'You work as a bargirl at the Fuzzy Dice strip club every Wednesday and Thursday from 18:00 to 03:00. Salary is automatically transferred on the 25th of each month.'
 	!!if stripbarwork1 >= 1: 'You work as a bargirl at the Fuzzy Dice strip club every Friday and Saturday from 18:00 to 03:00. Salary is automatically transferred on the 25th of each month.'
-	if film > 0:'You are working as a pornographic actress under the name <<$pfname>>.'
-	if bumtolik = 4:'You have been asked to help the homeless at the Mercy Clinic in the city industrial region.'
-	if bumtolik >= 5:'You volunteer at the Mercy Clinic in the city industrial region and work with the homeless. Working hours are from 09:00 to 17:00 on Saturday and Sunday.'
+	if film > 0: 'You are working as a pornographic actress under the name <<$pfname>>.'
+	if bumtolik = 4: 'You have been asked to help the homeless at the Mercy Clinic in the city industrial region.'
+	if bumtolik >= 5: 'You volunteer at the Mercy Clinic in the city industrial region and work with the homeless. Working hours are from 09:00 to 17:00 on Saturday and Sunday.'
 
 	*nl
 
@@ -78,19 +78,19 @@ if $ARGS[0] = 'start':
 	if modelfoto['shoots'] > 0:
 		*nl
 		if modelfoto['erotic'] > modelfoto['nude'] and modelfoto['erotic'] > modelfoto['fashion'] and modelfoto['erotic'] > modelfoto['fitness'] and modelfoto['erotic'] > modelfoto['glamour'] and modelfoto['erotic'] > modelfoto['lingerie'] and modelfoto['erotic'] > modelfoto['catalog']:
-			'You are an erotic model working at Aphrodite Photography in St. Petersburg.'
+			'You are working as an erotic model at Aphrodite Photography.'
 		elseif modelfoto['nude'] > modelfoto['fashion'] and modelfoto['nude'] > modelfoto['fitness'] and modelfoto['nude'] > modelfoto['glamour'] and modelfoto['nude'] > modelfoto['lingerie'] and modelfoto['nude'] > modelfoto['catalog'] and modelfoto['nude'] > modelfoto['erotic']:
-			'You are an artistic nude model working at Aphrodite Photography in St. Petersburg.'
+			'You are working as an artistic nude model at Aphrodite Photography.'
 		elseif modelfoto['fitness'] > modelfoto['fashion'] and modelfoto['fitness'] > modelfoto['nude'] and modelfoto['fitness'] > modelfoto['glamour'] and modelfoto['fitness'] > modelfoto['lingerie'] and modelfoto['fitness'] > modelfoto['catalog'] and modelfoto['fitness'] > modelfoto['erotic']:
-			'You are a fitness model working at Aphrodite Photography in St. Petersburg.'
+			'You are working as a fitness model at Aphrodite Photography.'
 		elseif modelfoto['glamour'] > modelfoto['fashion'] and modelfoto['glamour'] > modelfoto['nude'] and modelfoto['glamour'] > modelfoto['fitness'] and modelfoto['glamour'] > modelfoto['lingerie'] and modelfoto['glamour'] > modelfoto['catalog'] and modelfoto['glamour'] > modelfoto['erotic']:
-			'You are a glamour model working at Aphrodite Photography in St. Petersburg.'
+			'You are working as a glamour model at Aphrodite Photography.'
 		elseif modelfoto['lingerie'] > modelfoto['fashion'] and modelfoto['lingerie'] > modelfoto['nude'] and modelfoto['lingerie'] > modelfoto['fitness'] and modelfoto['lingerie'] > modelfoto['glamour'] and modelfoto['lingerie'] > modelfoto['catalog'] and modelfoto['lingerie'] > modelfoto['erotic']:
-			'You are a lingerie model working at Aphrodite Photography in St. Petersburg.'
+			'You are working as a lingerie model at Aphrodite Photography.'
 		elseif modelfoto['fashion'] > modelfoto['lingerie'] and modelfoto['fashion'] > modelfoto['nude'] and modelfoto['fashion'] > modelfoto['fitness'] and modelfoto['fashion'] > modelfoto['glamour'] and modelfoto['fashion'] > modelfoto['catalog'] and modelfoto['fashion'] > modelfoto['erotic']:
-			'You are a fashion model working at Aphrodite Photography in St. Petersburg.'
+			'You are working as a fashion model at Aphrodite Photography.'
 		elseif modelfoto['catalog'] > 0:
-			'You are a catalog model working at Aphrodite Photography in St. Petersburg.'
+			'You are working as a catalog model at Aphrodite Photography.'
 		end
 		*nl
 		if model_week = (daystart - week) / 7 and model_job_week >= 2:
@@ -105,9 +105,9 @@ if $ARGS[0] = 'start':
 		*nl
 		'You have worked <<masseuse[''shifts_worked'']>> shifts at the salon this week.'
 		if masseuse['<<week>>_shift_1'] = 1 and hour < 9:
-			'<BR><b><font color="blue">You have a shift at the salon today at 9:00.</font></b>'
+			'<BR><b><font color="blue">You have a shift at the salon today at 09:00.</font></b>'
 		elseif masseuse['<<week>>_shift_1'] = 1 and hour <= 9:
-			'<BR><b><font color="red">You''re late for your 9:00 shift at the salon!</font></b>'
+			'<BR><b><font color="red">You''re late for your 09:00 shift at the salon!</font></b>'
 		elseif masseuse['<<week>>_shift_2'] = 1 and hour < 13:
 			'<BR><b><font color="blue">You have a shift at the salon today at 13:00.</font></b>'
 		elseif masseuse['<<week>>_shift_2'] = 1 and hour <= 13:

+ 1 - 1
locations/uni_lessons1.qsrc

@@ -1301,7 +1301,7 @@ if $ARGS[0] = 'examination_and_treatment_101':
 				if npc_rel['A267'] >= 60 and npc_rel['A268'] >= 60:
 					'You sit next to Mia and Yana and spend most of the class quietly talking with them. You often get shushed by your fellow students when you get a bit too loud.'
 				elseif npc_rel['A267'] <= 20 and npc_rel['A268'] <= 20:
-					'You sit next to Mia and Yana and try to talk to them, but they just ignore you and chat and giggle amongst themselves, trying to think of a prank they can pull on xxx.'
+					'You sit next to Mia and Yana and try to talk to them, but they just ignore you and chat and giggle amongst themselves, trying to think of a prank they can pull on Mr. Borisov instead.'
 				elseif (npc_rel['A267'] > 20 and npc_rel['A267'] < 60) and (npc_rel['A268'] > 20 and npc_rel['A268'] < 60): 
 					'You sit next to Mia and Yana. They''re a little surprised that you chose to do so, but you''re able to strike up a brief conversation with them before a fellow student asks you to be quiet.'
 				end