Merge remote-tracking branch 'DeusExLibis/master'

# Conflicts:
#	locations/gdkin.qsrc
#	locations/pavtrain.qsrc

locations/begin.qsrc

@@ -10,14 +10,14 @@ if $ARGS[0] = 'start':
 	'<b>Transformation Start:</b>'
 	'You are Mikhail Kuznetsov, a fairly average, 35 year old businessman who finds an artefact that changes everything about him and his life. Features magic.'
 	*nl
-	'<b>School Girl Start:</b>'
-	'You are a school girl in the most lustful town in Russia. Will you study hard and keep your purity for that special someone or become a sex addicted whore? Or anything in between, the possibilities are endless. No magic.'
+	'<b>Schoolgirl Start:</b>'
+	'You are a schoolgirl in the most lustful town in Russia. Will you study hard and keep your purity for that special someone or become a sex addicted whore? Or anything in between, the possibilities are endless. No magic.'
 	*nl
 	'<b>Cursed Schoolgirl Start:</b>'
-	'Marvel as we recklessly squish both of the above into one start. You are a school girl who finds the amulet and not much changes, except the magic, actually that''s quite a big change.'
+	'Marvel as we recklessly squish both of the above into one start. You are a schoolgirl who finds the amulet and not much changes, except the magic, actually that''s quite a big change.'
 	*nl
 	'<b>Cursed Schoolboy Start:</b>'
-	'You are Peter Ivanov, a fairly average teenage boy who, while trying to escape a bad situation, ends up in the body of a school girl. Now you have to deal with a new body, new desires, and your new life in the most lustful town in Russia. Features magic.'
+	'You are Peter Ivanov, a fairly average teenage boy who, while trying to escape a bad situation, ends up in the body of a schoolgirl. Now you have to deal with a new body, new desires, and your new life in the most lustful town in Russia. Features magic.'
 	*nl
 	'<b>New in Town Start:</b>'
 	'You''re controlled by your overbearing mother and can''t take it any more. It is time to find a new life in the city away from her influence. For the first time you can make your own decisions and mistakes. No magic.'
@@ -35,7 +35,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	act '<center><b>School Girl Start</b></center>':
+	act '<center><b>Schoolgirl Start</b></center>':
 		cla
 		settingmode = 0
 		showstat 0

locations/downlibrary.qsrc

@@ -49,13 +49,7 @@ act 'Leave the library': minut += 5 & gt 'down'
 
 if hour >= 8 and hour <= 18:
 	act 'Read a science book (1:00)':
-		if pcs_intel >= 50:
-			intel_exp += RAND(0,1) + (mentats_dose - rand(0,mentats_dose))
-		elseif pcs_intel >= 25:
-			intel_exp += RAND(1,2) + (mentats_dose - rand(0,mentats_dose))
-		else
-			intel_exp += RAND(1,3) + (mentats_dose - rand(0,mentats_dose))
-		end
+		intel_exp += 4 + (mentats_dose - rand(0,mentats_dose))
 
 		dynamic $downlibrary['BookStudy'], ''
 

locations/foto_albums.qsrc

@@ -490,7 +490,7 @@ if $ARGS[0] = 'sveta_8':
 	*clr & cla
 
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/albums.jpg"></center>'
-	'Here is the shelf that has the albums of the top 10 models. You''ve taken Mari''s spot in the rankings. Your name now marks the eighth spot, Mari''s in the ninth. You don''t think she''ll be upset or anything like that, she''ll probably want to congradulate you if nothing else. She was never one to care about the rankings. You take a moment to be amazed with the two of you, how far a farm girl from Gadukino and a school girl from Pavlovsky have come... '
+	'Here is the shelf that has the albums of the top 10 models. You''ve taken Mari''s spot in the rankings. Your name now marks the eighth spot, Mari''s in the ninth. You don''t think she''ll be upset or anything like that, she''ll probably want to congradulate you if nothing else. She was never one to care about the rankings. You take a moment to be amazed with the two of you, how far a farm girl from Gadukino and a schoolgirl from Pavlovsky have come... '
 	'<a href="exec:gt ''foto_albums'',''anastasia''">1. Anastasia P.</a>'
 	'<a href="exec:gt ''foto_albums'',''katherine''">2. Katherine A.</a>'
 	'<a href="exec:gt ''foto_albums'',''emily''">3. Emily R.</a>'

locations/gdkin.qsrc

@@ -665,7 +665,7 @@ if $ARGS[0] = 'classmates':
 	gs 'gschool_groups', 'gopniks'
 	act 'Move away':gt $loc, $metka
 
-	'<center>Most the cool kids are dancing, while the gopnics are standing in the corner of the room, keeping to themselves.</center>'
+	'<center>Most the cool kids are dancing, while the gopniks are standing in the corner of the room, keeping to themselves.</center>'
 	if hour >= 21 and hour < 23 and week=5: '<center>At the entrance of the disco hall stands <a href="exec:gt ''VolleyTrenerSpeak''">Coach Mikhail Nikolayevich</a></center>'
 	'</table><center>'
 end

locations/gschool_detention.qsrc

@@ -460,7 +460,7 @@ if $ARGS[0] = 'strange':
 		*clr & cla
 		'<center><b><font color="maroon">Detention</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/feofan/sex/school/det1.jpg"></center>'
-		'You can''t take it any longer, your curiosity is killing you! You get up and walk over quietly, circle behind him and look over his shoulder. You see that he is engrossed in an adult magazine, looking at the picture of a guy fucking a school girl up her ass. While you stare at the porn picture yourself, he notices your presence, turning to look over his shoulder at you and when your eyes meet he blushes bright red. He covers the image up with his hands moments afterwards and says. "Don''t tell anyone, please."'
+		'You can''t take it any longer, your curiosity is killing you! You get up and walk over quietly, circle behind him and look over his shoulder. You see that he is engrossed in an adult magazine, looking at the picture of a guy fucking a schoolgirl up her ass. While you stare at the porn picture yourself, he notices your presence, turning to look over his shoulder at you and when your eyes meet he blushes bright red. He covers the image up with his hands moments afterwards and says. "Don''t tell anyone, please."'
 		act 'Ignore it':
 			*clr & cla
 			npc_rel['A152'] += 1

locations/gschool_girls_bathroom.qsrc

@@ -124,7 +124,7 @@ if $ARGS[0] = 'girl2':
 			'Now that the spell is broken, you can''t help but feel sorry for her. She made a stupid mistake, some guys took advantage of her drunken, horny mood, and now she was a pariah, the school slut that practically nobody wanted to be seen with... including *you*, you realize.'
 			*nl
 			'She glances at you, and smiles - not seductively like before but in a way you''ve rarely seen her smile since her fall from grace: Genuine, glad, happy even. "Sure. Yeah, I think I''d like that."' 
-			'The two of you spend the next hour talking about a variety of things, like you used to before. She gives you more than a few tips about how to use makeup, and you help her finish her own, putting into practice what she taught you. You talk about school and what you wanna do after, about family, about life... about anything and everything, except one thing: Sex. For one short period, Sonia and you pretend that you''re both innocent school girls again.' 
+			'The two of you spend the next hour talking about a variety of things, like you used to before. She gives you more than a few tips about how to use makeup, and you help her finish her own, putting into practice what she taught you. You talk about school and what you wanna do after, about family, about life... about anything and everything, except one thing: Sex. For one short period, Sonia and you pretend that you''re both innocent schoolgirls again.' 
 			'And before you know it, the bell rings. Sonia gives you lingering hug and a final, dazzling smile before both of you head to class.'
 			act 'Go to class':gt 'gschool_lessons', 'short_break'
 		end
@@ -770,7 +770,7 @@ if $ARGS[0] = 'caught1':
 							*nl
 							'It''s not exactly pleasant, and she seems to have no intention of stopping until at least a good part of it is inside you, but the pain is bearable. After a few seconds, she seems content with how much of your ass she has claimed and pulls out again, commencing the assfuck proper. However, that too proves much gentler than you''d expect, going neither very fast nor hard. In fact, now that your backdoor has had some time to adjust to the intrusion, it''s slowly starting to feel good. You remember that your hand is still resting on your pussy and tentatively brush against your clit. Yes, you realize, with a little extra stimulation, this might not be too bad. As you play with the cunt you so willingly offered your teacher, pleasure defeats pain as main sensation and a first sigh of desire escapes you. You hear a buzz coming from the harness now - sounds like that strapon came with gadgets.'
 							*nl
-							'Her rhythm is steadily increasing, Ms Braakman''s pounding your ass harder and deeper and, in turn, causing you to cry out louder. She''s starting to pant, the vibrating harness and sight of the school girl whose ass she''s violating stoking the flames in pelvis. Whatever regard she displayed for your comfort is evidently gone now as she mercilessly hammers the strapon into you, going tip to root almost every time. But the truth is that you don''t need and, in fact, don''t *want* her to be gentle anymore, now that the eroticism of the situation has caught up with you: You''re a student, naked and bent over a school bathroom sink, and your female teacher is fucking your ass hard with a large strapon - it sounds like something out of a cheap porno, and you''re loving it. Your moans are loud, almost matching hers, as you feel warmth pool in your belly.'
+							'Her rhythm is steadily increasing, Ms Braakman''s pounding your ass harder and deeper and, in turn, causing you to cry out louder. She''s starting to pant, the vibrating harness and sight of the schoolgirl whose ass she''s violating stoking the flames in pelvis. Whatever regard she displayed for your comfort is evidently gone now as she mercilessly hammers the strapon into you, going tip to root almost every time. But the truth is that you don''t need and, in fact, don''t *want* her to be gentle anymore, now that the eroticism of the situation has caught up with you: You''re a student, naked and bent over a school bathroom sink, and your female teacher is fucking your ass hard with a large strapon - it sounds like something out of a cheap porno, and you''re loving it. Your moans are loud, almost matching hers, as you feel warmth pool in your belly.'
 							gs 'arousal', 'anal_strap', 10, 'lesbian', 'sub'
 							gs 'arousal', 'end'
 							gs 'stat'

locations/gskver.qsrc

@@ -97,7 +97,7 @@ if $ARGS[0] = 'start':
 	act 'Walk to the Old Town':minut += 10 & gt 'liam'
 
 	if hour > 8 and hour < 19:'There''s a small <a href="exec:minut += 5 & gt ''gskino''">movie theater</a> in the park. It only has a single screen.'
-	'The newly opened cafe <a href="exec:gt''cafe_parco'',''start''">"Del Parco"</a>, with eye-catching facade, lots of tables and a summer terrace. Two paths lead out of the park. One brings you to the <a href="exec:minut += 5 & gt ''pavcommercial''">commerical</a> the other to the <a href="exec:minut += 5 & gt ''pavresidential''">residential</a> area.'
+	'The newly opened cafe <a href="exec:gt''cafe_parco'',''start''">"Del Parco"</a>, with eye-catching facade, lots of tables and a summer terrace. Two paths lead out of the park. One brings you to the <a href="exec:minut += 5 & gt ''pavcommercial''">commercial</a> the other to the <a href="exec:minut += 5 & gt ''pavresidential''">residential</a> area.'
 
 	*nl
 	if $clothingworntype = 'nude':pcs_willpwr -= 15 & pcs_mood -= 15 & 'You notice passers-by in the park pointing at you as you walk, and overhear one older lady telling her friend: "Look at her... it''s that <<$pcs_lastname>> girl. Youth these days, they have no shame at all!"'

locations/park.qsrc

@@ -365,8 +365,7 @@ if $ARGS[0] = 'luna':
 				minut += 30
 				money -= 50
 
-				if pcs_sprt < 30:sprt_exp += 1
-				if pcs_sprt >= 30:sprt_exp += rand(0, 1)
+				sprt_exp += 2
 
 				pcs_willpwr += 10
 				pcs_mood += 10
@@ -440,9 +439,8 @@ if $ARGS[0] = 'luna':
 					stKo = pcs_stren * 20/100
 					damage = rand(pcs_stren - stKo, pcs_stren + stKo)
 
-					if pcs_stren < 30: gs 'exercise', 'tier2', 1, 'stren_exp'
-					if pcs_stren >= 30: gs 'exercise', 'tier1', 1, 'stren_exp'
-
+					gs 'exercise', 'tier2', 1, 'stren_exp'
+					
 					'A LED screen lights up and shows you your score:<<damage>>'
 					if damage > maxdamage:
 						maxdamage = damage & 'Congratulations! A new personal best!'

locations/pavCommercial.qsrc

@@ -49,7 +49,7 @@ end
 *nl
 'Pavlovsk can be split into four regions, the commercial hub here, the residential suburbs, the industrial region and the Five Eight estate of Soviet era apartment blocks.'
 *nl
-'While the commerical hub of Pavlovsk is better maintained and a bit cleaner looking than other areas, it is still very much rural like the rest of the town, and even from here, you can still easily access the old <a href="exec:view''images/locations/pavlovsk/palace/pav_palace.jpg''">Imperial Palace</a> built by Catherine the Great, and the remodeled <a href="exec:view''images/locations/pavlovsk/fortress/bip_hotel.png''">Bip fortress</a> which now operates as a luxury hotel and restaurant.'
+'While the commercial hub of Pavlovsk is better maintained and a bit cleaner looking than other areas, it is still very much rural like the rest of the town, and even from here, you can still easily access the old <a href="exec:view''images/locations/pavlovsk/palace/pav_palace.jpg''">Imperial Palace</a> built by Catherine the Great, and the remodeled <a href="exec:view''images/locations/pavlovsk/fortress/bip_hotel.png''">Bip fortress</a> which now operates as a luxury hotel and restaurant.'
 *nl
 'A short distance away you can clearly see the golden domes of the <a href="exec:minut += 10 & gt ''ParChurch'',''start''">Church of St Nikolas</a>. It''s only a 10 minute walk to get there from here.'
 *nl

locations/pavtrain.qsrc

@@ -177,9 +177,9 @@ end
 
 gs 'family'
 
-act 'Walk to the commerical area':minut += 10 & gt 'pavCommercial'
-act 'Walk to the city highway':minut += 15 & nroad = 20 & gt 'road'
-act 'Walk to the old town':minut += 15 & nroad = 19 & gt 'liam'
+act 'Walk to the Commercial area':minut += 10 & gt 'pavCommercial'
+act 'Walk to the City Highway':minut += 15 & nroad = 20 & gt 'road'
+act 'Walk to the Old Town':minut += 15 & nroad = 19 & gt 'liam'
 
 act 'Enter the station building': gt 'pavtrainhall'
 

locations/swamphouse.qsrc

@@ -498,8 +498,7 @@ if $ARGS[0] = 'stackmagazines':
 			lastreadday = daystart
 			pcs_nerd += 10
 		end
-		if pcs_intel >= 50:intel_exp += RAND(0,1)
-		if pcs_intel < 50:intel_exp += RAND(0,2)
+		intel_exp += 4
 		blizoruk+=1
 		pcs_mood += 10
 		minut += 60
@@ -518,8 +517,7 @@ if $ARGS[0] = 'stackmagazines':
 			lastreadday = daystart
 			pcs_nerd += 10
 		end
-		if pcs_sprt >= 50:sprt_exp += RAND(0,1)
-		if pcs_sprt < 50:sprt_exp += RAND(0,2)
+		sprt_exp += 4
 		blizoruk+=1
 		pcs_mood += 10
 		minut += 60
@@ -539,8 +537,7 @@ if $ARGS[0] = 'stackmagazines':
 			lastreadday = daystart
 			pcs_nerd += 10
 		end
-		if pcs_sprt >= 50:sprt_exp += RAND(0,1)
-		if pcs_sprt < 50:sprt_exp += RAND(0,2)
+		sprt_exp += 4
 		blizoruk+=1
 		pcs_mood += 10
 		pcs_willpwr += 100

locations/tobiQW.qsrc

@@ -46,7 +46,7 @@ if $ARGS[0] = '3':
 	'Gustav puts his arm around you and makes sure your OK while Tatiana and Reinhold bicker like an old married couple.'
 	'Eventually they stop long enough to see you and remember what they are here for.'
 	'Reinhold addresses you, "Firstly I have to ask how much you know about the world of magic."'
-	'You start telling him what Tatiana told you about the Sidhe and the Succubae. Tatiana starts giggling like a school girl.'
+	'You start telling him what Tatiana told you about the Sidhe and the Succubae. Tatiana starts giggling like a schoolgirl.'
 	'"I''ll stop you there. All magicians train in one main school of magic and one main personality type. Tatiana as well as being a specialist in body magics is also a prankster in training. I specialize in space/time magic and tutoring."'
 	'"The council of the elders has representatives from all of the Fae touched races, the identities of members are kept secret to protect them from external influence or corruption. I''m an officer of the council and help maintain the day to day problems and act on their behalf."'